Update of /cvsroot/scsh/scx
In directory usw-pr-cvs1:/tmp/cvs-serv32001
Modified Files:
Makefile
Log Message:
Build scx.image and scx.
Index: Makefile
===================================================================
RCS file: /cvsroot/scsh/scx/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Makefile 2001/12/04 10:23:50 1.1
--- Makefile 2001/12/04 11:07:15 1.2
***************
*** 1,5 ****
### update this to fit your system
! SCSH_SRC = /afs/wsi/home/dfreese/scsh-0.6
! SCSH_LIB = /afs/wsi/home/dfreese/i386_fbsd40/lib/scsh
X11_PATH = /usr/X11R6
--- 1,5 ----
### update this to fit your system
! SCSH_SRC = /afs/wsi/home/gasbichl/sw/scsh-0.6
! SCSH_LIB = /afs/wsi/home/gasbichl/i386_fbsd40/scsh-0.6/lib/scsh
X11_PATH = /usr/X11R6
***************
*** 12,17 ****
SCX_VERSION = "0.1"
! SCX_VM = "scxvm"
! SCX_IMAGE = "scx.image"
### The first=default target
--- 12,18 ----
SCX_VERSION = "0.1"
! SCX_VM = scxvm
! SCX_IMAGE = scx.image
! SCX = scx
### The first=default target
***************
*** 21,25 ****
### The VM is scsh plus all new primitives from the c files ###
! OBJECTS = c/main.o \
c/xlib/display.o c/xlib/window.o c/xlib/type.o c/xlib/color.o \
c/xlib/colormap.o c/xlib/pixel.o c/xlib/gcontext.o c/xlib/event.o \
--- 22,26 ----
### The VM is scsh plus all new primitives from the c files ###
! OBJECTS = \
c/xlib/display.o c/xlib/window.o c/xlib/type.o c/xlib/color.o \
c/xlib/colormap.o c/xlib/pixel.o c/xlib/gcontext.o c/xlib/event.o \
***************
*** 30,36 ****
c/xlib/visual.o c/xlib/region.o
! $(SCX_VM): c/main.o $(OBJECTS)
$(CC) -g -o $(SCX_VM) -L $(SCSH_LIB) -L $(X11_LIB) \
! $(OBJECTS) -lscsh -lm -lX11 -lcrypt &&
$(OBJECTS): c/xlib/xlib.h
--- 31,37 ----
c/xlib/visual.o c/xlib/region.o
! $(SCX_VM): tmpmain.o $(OBJECTS)
$(CC) -g -o $(SCX_VM) -L $(SCSH_LIB) -L $(X11_LIB) \
! tmpmain.o $(OBJECTS) -lscsh -lm -lX11 -lcrypt &&
$(OBJECTS): c/xlib/xlib.h
***************
*** 38,49 ****
$(CC) -g -c -I $(X11_INCLUDE) -I $(SCHEME_INCLUDE) -o $@ $<
### Making the Image ###
### The Image is a dump of the VM with all new packages loaded, and
### xlib opened.
! STARTUP_MSG = "with SCX $(SCX_VERSION), the X11 support.";
! $(SCX_IMAGE):
( \
echo ",batch on"; \
--- 39,56 ----
$(CC) -g -c -I $(X11_INCLUDE) -I $(SCHEME_INCLUDE) -o $@ $<
+ tmpmain.o: c/main.c
+ $(CC) -g -c -DSCSHIMAGE=\"$(SCSH_LIB)/scsh.image\" -I $(X11_INCLUDE) -I
$(SCHEME_INCLUDE) -o $@ $<
+ main.o: c/main.c
+ $(CC) -g -c -DSCSHIMAGE=\"`pwd`/scx.image\" -I $(X11_INCLUDE) -I
$(SCHEME_INCLUDE) -o $@ $<
+
+
### Making the Image ###
### The Image is a dump of the VM with all new packages loaded, and
### xlib opened.
! STARTUP_MSG = "with SCX $(SCX_VERSION), the X11 support."
! $(SCX_IMAGE): $(SCX_VM)
( \
echo ",batch on"; \
***************
*** 52,59 ****
echo ",config ,load scheme/xlib/xlib-interfaces.scm"; \
echo ",config ,load scheme/xlib/xlib-packages.scm"; \
! echo ",open xlib"; \
echo ",dump $(SCX_IMAGE) \"$(STARTUP_MSG)\"" \
) | $(SCX_VM)
#SCSH_IMAGE = "/afs/wsi/home/dfreese/i386_fbsd43/lib/scheme48/scsh.image"
--- 59,70 ----
echo ",config ,load scheme/xlib/xlib-interfaces.scm"; \
echo ",config ,load scheme/xlib/xlib-packages.scm"; \
! echo ",load-package xlib"; \
! echo ",load-package xlib-types"; \
echo ",dump $(SCX_IMAGE) \"$(STARTUP_MSG)\"" \
) | $(SCX_VM)
+ $(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"
***************
*** 61,63 ****
clean:
! rm -f $(SCX_VM) c/*.o c/xlib/*.o
--- 72,74 ----
clean:
! rm -f $(SCX_VM) $(SCX) $(SCX_IMAGE) *.o c/*.o c/xlib/*.o
|