diff --git a/Makefile b/Makefile index d9f42e8..c7b23d9 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ SCX_IMAGE = scx.image SCX = scx ### The first=default target -enough: $(SCX_VM) #$(SCX_IMAGE) #doesn't work yet +enough: $(SCX) ### Making the VM ### ### The VM is scsh plus all new primitives from the c files ### @@ -30,6 +30,26 @@ OBJECTS = \ c/xlib/extension.o c/xlib/init.o c/xlib/util.o c/xlib/grab.o \ c/xlib/visual.o c/xlib/region.o +SCM_FILES = scheme/xlib/atom-type.scm scheme/xlib/client.scm \ + scheme/xlib/color-type.scm scheme/xlib/color.scm \ + scheme/xlib/colormap-type.scm scheme/xlib/colormap.scm \ + scheme/xlib/cursor-type.scm scheme/xlib/cursor.scm \ + scheme/xlib/display-type.scm \ + scheme/xlib/display.scm scheme/xlib/drawable-type.scm \ + scheme/xlib/drawable.scm scheme/xlib/error.scm \ + scheme/xlib/event-type.scm scheme/xlib/event.scm \ + scheme/xlib/extension.scm scheme/xlib/font-type.scm \ + scheme/xlib/font.scm scheme/xlib/gcontext-type.scm \ + scheme/xlib/gcontext.scm scheme/xlib/grab.scm scheme/xlib/graphics.scm \ + scheme/xlib/helper.scm scheme/xlib/key.scm scheme/xlib/pixel-type.scm \ + scheme/xlib/pixel.scm scheme/xlib/pixmap-type.scm \ + scheme/xlib/pixmap.scm scheme/xlib/property.scm \ + scheme/xlib/region-type.scm scheme/xlib/region.scm \ + scheme/xlib/text.scm scheme/xlib/utility.scm \ + scheme/xlib/visual-type.scm scheme/xlib/visual.scm \ + scheme/xlib/window-type.scm scheme/xlib/window.scm \ + scheme/xlib/wm.scm + $(SCX_VM): tmpmain.o $(OBJECTS) $(CC) -g -o $(SCX_VM) -L $(SCSH_LIB) -L $(X11_LIB) \ tmpmain.o $(OBJECTS) -lscsh -lm -lX11 -lcrypt && @@ -51,7 +71,7 @@ main.o: c/main.c STARTUP_MSG = "with SCX $(SCX_VERSION), the X11 support." -$(SCX_IMAGE): $(SCX_VM) +$(SCX_IMAGE): $(SCX_VM) $(SCM_FILES) ( \ echo ",batch on"; \ echo ",config ,load scheme/xlib/xlib-type-interfaces.scm"; \