+ Tell libtool that we depend on libX11
+ Don't include extension.c in the libscx as it is not transformed yet + Use absolute path to load scheme files in load-scx.scm + Use batch command to suppress user interaction
This commit is contained in:
parent
425060a1b2
commit
b6eeae0dcc
|
@ -2,6 +2,7 @@ SUBDIRS = c
|
||||||
|
|
||||||
scheme/load-scx.scm:
|
scheme/load-scx.scm:
|
||||||
(echo '(user)'; \
|
(echo '(user)'; \
|
||||||
|
echo "(batch)"; \
|
||||||
echo "(open 'dynamic-externals)"; \
|
echo "(open 'dynamic-externals)"; \
|
||||||
echo "(open 'external-calls)"; \
|
echo "(open 'external-calls)"; \
|
||||||
echo '(run '; \
|
echo '(run '; \
|
||||||
|
@ -10,7 +11,8 @@ scheme/load-scx.scm:
|
||||||
echo ' (dynamic-load module-file)'; \
|
echo ' (dynamic-load module-file)'; \
|
||||||
echo ' (call-external (get-external initializer-name))))'; \
|
echo ' (call-external (get-external initializer-name))))'; \
|
||||||
echo '(config)'; \
|
echo '(config)'; \
|
||||||
echo '(load "xlib/xlib-interfaces.scm")'; \
|
echo '(load "$(prefix)/scheme/xlib/xlib-interfaces.scm")'; \
|
||||||
echo '(load "xlib/xlib-packages.scm")'; \
|
echo '(load "$(prefix)/scheme/xlib/xlib-packages.scm")'; \
|
||||||
|
echo '(batch)'; \
|
||||||
) > $@
|
) > $@
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,13 @@
|
||||||
INCLUDES = -I@top_srcdir@/c/xlib -I@top_srcdir@/c/libs -I@x_includes@ \
|
INCLUDES = -I@top_srcdir@/c/xlib -I@top_srcdir@/c/libs -I@x_includes@ \
|
||||||
-I@top_srcdir@/c -I@scsh_includes@
|
-I@top_srcdir@/c -I@scsh_includes@
|
||||||
|
|
||||||
|
|
||||||
lib_LTLIBRARIES = libscx.la
|
lib_LTLIBRARIES = libscx.la
|
||||||
|
|
||||||
libscx_la_SOURCES = \
|
libscx_la_SOURCES = \
|
||||||
client.c colormap.c cursor.c display.c error.c event-types.c \
|
client.c colormap.c cursor.c display.c error.c event-types.c \
|
||||||
event.c extension.c font.c gcontext.c grab.c graphics.c init.c key.c \
|
event.c font.c gcontext.c grab.c graphics.c init.c key.c \
|
||||||
pixmap.c property.c region.c text.c types.c util.c visual.c window.c \
|
pixmap.c property.c region.c text.c types.c util.c visual.c window.c \
|
||||||
wm.c xlib.h
|
wm.c xlib.h
|
||||||
#libscx_a_LDFLAGS = -export-dynamic
|
|
||||||
|
libscx_la_LIBADD = $(X_PRE_LIBS) $(X_LIBS) $(X_EXTRA_LIBS) -lX11
|
||||||
|
|
||||||
|
|
|
@ -14,8 +14,8 @@
|
||||||
|
|
||||||
AC_PROG_CC
|
AC_PROG_CC
|
||||||
|
|
||||||
AC_PATH_X
|
AC_PATH_XTRA
|
||||||
|
|
||||||
AC_ARG_WITH(scsh-includes,
|
AC_ARG_WITH(scsh-includes,
|
||||||
AC_HELP_STRING([--with-scsh-includes=DIR],
|
AC_HELP_STRING([--with-scsh-includes=DIR],
|
||||||
[scsh include files are in DIR [/usr/local/include]]),
|
[scsh include files are in DIR [/usr/local/include]]),
|
||||||
|
|
Loading…
Reference in New Issue