+ Let the image depend on the config files.

+ Minor clean-up.
This commit is contained in:
mainzelm 2001-12-04 14:20:18 +00:00
parent ac61d5fcef
commit eb193c9fed
1 changed files with 7 additions and 8 deletions

View File

@ -50,6 +50,11 @@ SCM_FILES = scheme/xlib/atom-type.scm scheme/xlib/client.scm \
scheme/xlib/window-type.scm scheme/xlib/window.scm \
scheme/xlib/wm.scm
SCM_CONFIG_FILES = scheme/xlib/xlib-type-interfaces.scm \
scheme/xlib/xlib-type-package.scm \
scheme/xlib/xlib-interfaces.scm \
scheme/xlib/xlib-packages.scm
$(SCX_VM): tmpmain.o $(OBJECTS)
$(CC) -g -o $(SCX_VM) -L $(SCSH_LIB) -L $(X11_LIB) \
tmpmain.o $(OBJECTS) -lscsh -lm -lX11 -lcrypt &&
@ -71,13 +76,10 @@ main.o: c/main.c
STARTUP_MSG = "with SCX $(SCX_VERSION), the X11 support."
$(SCX_IMAGE): $(SCX_VM) $(SCM_FILES)
$(SCX_IMAGE): $(SCX_VM) $(SCM_FILES) $(SCM_CONFIG_FILES)
( \
echo ",batch on"; \
echo ",config ,load scheme/xlib/xlib-type-interfaces.scm"; \
echo ",config ,load scheme/xlib/xlib-type-package.scm"; \
echo ",config ,load scheme/xlib/xlib-interfaces.scm"; \
echo ",config ,load scheme/xlib/xlib-packages.scm"; \
echo ",config ,load $(SCM_CONFIG_FILES)"; \
echo ",load-package xlib"; \
echo ",load-package xlib-types"; \
echo ",dump $(SCX_IMAGE) \"$(STARTUP_MSG)\"" \
@ -87,8 +89,5 @@ $(SCX): $(SCX_IMAGE) main.o $(OBJECTS)
$(CC) -g -o $@ -L $(SCSH_LIB) -L $(X11_LIB) \
main.o $(OBJECTS) -lscsh -lm -lX11 -lcrypt &&
#SCSH_IMAGE = "/afs/wsi/home/dfreese/i386_fbsd43/lib/scheme48/scsh.image"
#main.c:
clean:
rm -f $(SCX_VM) $(SCX) $(SCX_IMAGE) *.o c/*.o c/xlib/*.o