X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2FGNUmakefile;h=3d75800b06431eeb18fdf8e694d47c9c1518ac62;hb=eac461c1f1ca91cfe282c779291d582ed6b336cb;hp=a426e2fff67f7076b5f6a1fd9251ef13aaeb7985;hpb=40e3ba03d0e1b824e4d1ae75d74246b975b70964;p=sbcl.git

diff --git a/src/runtime/GNUmakefile b/src/runtime/GNUmakefile
index a426e2f..3d75800 100644
--- a/src/runtime/GNUmakefile
+++ b/src/runtime/GNUmakefile
@@ -9,9 +9,10 @@
 # provided with absolutely no warranty. See the COPYING and CREDITS
 # files for more information.
 
-.PHONY: all clean TAGS tags
+.PHONY: all clean TAGS tags targets
 
-all: sbcl sbcl.nm
+all: targets tags
+TARGET=sbcl
 
 # Defaults which might be overridden or modified by values in the
 # Config file. Most of them are same on most systems right now.
@@ -22,9 +23,14 @@ NM = nm -gp
 DEPEND_FLAGS = -MM
 GREP = grep
 
-CFLAGS = -g -Wall -O3
+include ../../output/prefix.def
+
+CFLAGS = -g -Wall -Wsign-compare -O3
 ASFLAGS = $(CFLAGS)
-CPPFLAGS = -I.
+CPPFLAGS = -I. -DSBCL_PREFIX=\"$(SBCL_PREFIX)\"
+
+# Give make access to the target Lisp features.
+include genesis/Makefile.features
 
 # The Config file is the preferred place for tweaking options which
 # are appropriate for particular setups (OS, ARCH, whatever). Make a
@@ -34,11 +40,11 @@ CPPFLAGS = -I.
 # OS_SRC, OS_LIBS, OS_OBJS, OS_CLEAN_FILES
 include Config
 
-
 COMMON_SRC = alloc.c backtrace.c breakpoint.c coreparse.c \
-	dynbind.c gc-common.c globals.c interr.c interrupt.c \
-	monitor.c os-common.c parse.c print.c purify.c \
-	regnames.c run-program.c runtime.c save.c search.c \
+	dynbind.c funcall.c gc-common.c globals.c interr.c interrupt.c \
+	largefile.c monitor.c os-common.c parse.c print.c purify.c \
+	pthread-futex.c \
+	regnames.c run-program.c runtime.c safepoint.c save.c search.c \
 	thread.c time.c util.c validate.c vars.c wrap.c
 
 C_SRC = $(COMMON_SRC) ${ARCH_SRC} ${OS_SRC} ${GC_SRC}
@@ -49,28 +55,26 @@ OBJS = $(C_SRC:.c=.o) $(ASSEM_SRC:.S=.o) ${OS_OBJS}
 
 LIBS = ${OS_LIBS} -lm
 
-sbcl: $(OBJS)
+targets: $(TARGET) sbcl.nm
+
+$(TARGET): $(OBJS)
 	$(CC) ${LINKFLAGS} -o $@ $^ $(LIBS)
 
-sbcl.nm: sbcl
-	$(NM) sbcl | $(GREP) -v " F \| U " > ,$@
+sbcl.nm: $(TARGET)
+	$(NM) $(TARGET) | $(GREP) -v " [FUw] " > ,$@
 	mv -f ,$@ $@
 
 sbcl.h: $(wildcard genesis/*.h)
 	echo '#include "genesis/config.h"' >sbcl.h
 	echo '#include "genesis/constants.h"' >>sbcl.h
 
+# || true because we don't want the build to break if etags isn't there.
+# ...but it's still nice to have it done by default.
 TAGS tags: $(SRCS)
-	etags $(SRCS)
+	etags $(SRCS) || true
 
 clean:
-	-rm -f *.[do] sbcl sbcl.nm sbcl.h core *.tmp $(OS_CLEAN_FILES)
-	# the depend file is obsolete
-	-rm -f depend
-
-# depend target for backward compatibility
-.PHONY: depend
-depend:
+	-rm -f *.[do] $(TARGET) sbcl.nm sbcl.h core *.tmp $(OS_CLEAN_FILES)
 
 %.d: %.c sbcl.h
 	@$(CC) $(DEPEND_FLAGS) $(CPPFLAGS) $< > $@.tmp; \