(top_srcdir): Define.

(CPPFLAGS) [BOEHM_GC]: Add include path.
(gclib) [BOEHM_GC]: Define.
(mallocobj): Add gclib.

diff --git a/src/Makefile.in b/src/Makefile.in
index 830850d7712ba2ea97007d76cc415245acab1905..ab56b4405c16c6c902d6b7951793b20acbb3e95d 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -30,11 +30,11 @@
 # Here are the things that we expect ../configure to edit.
 # We use $(srcdir) explicitly in dependencies so as not to depend on VPATH.
 srcdir=@srcdir@
+top_srcdir=@top_srcdir@
 VPATH=@srcdir@
 CC=@CC@
 CPP=@CPP@
 CFLAGS=@CFLAGS@
-CPPFLAGS=@CPPFLAGS@
 LDFLAGS=@LDFLAGS@
 LN_S=@LN_S@
 EXEEXT=@EXEEXT@
@@ -74,6 +74,12 @@ SHELL=/bin/sh
 #define NOT_C_CODE
 #include "config.h"
 
+#ifdef BOEHM_GC
+CPPFLAGS=@CPPFLAGS@ -I$(top_srcdir)/gc/include
+#else
+CPPFLAGS=@CPPFLAGS@
+#endif
+
 /* We won't really call alloca;
    don't let the file name alloca.c get messed up.  */
 #ifdef alloca
@@ -621,7 +627,11 @@ gmallocobj = gmalloc.o
 rallocobj = ralloc.o
 #endif
 
-mallocobj = $(gmallocobj) $(rallocobj) vm-limit.o
+#ifdef BOEHM_GC
+gclib = $(top_srcdir)/gc/.libs/libgc.a
+#endif
+
+mallocobj = $(gmallocobj) $(rallocobj) $(gclib) vm-limit.o
 
 #endif /* SYSTEM_MALLOC */
 
@@ -1315,7 +1325,7 @@ ctagsfiles2 = [a-wA-W]*.[hc]
 TAGS: $(srcdir)/$(ctagsfiles1) $(srcdir)/$(ctagsfiles2)
        ../lib-src/etags --include=TAGS-LISP --include=${lwlibdir}/TAGS \
          --regex='/[   ]*DEFVAR_[A-Z_  (]+"\([^"]+\)"/' \
-         $(srcdir)/$(ctagsfiles1) $(srcdir)/$(ctagsfiles2)
+          $(srcdir)/$(ctagsfiles1) $(srcdir)/$(ctagsfiles2)
 frc:
 TAGS-LISP: frc
        $(MAKE) -f ${lispdir}Makefile TAGS-LISP ETAGS=../lib-src/etags