[Emacs-diffs] Changes to emacs/src/Makefile.in [Boehm-GC]

[Dave Love]

Index: emacs/src/Makefile.in
diff -c emacs/src/Makefile.in:1.276.2.1 emacs/src/Makefile.in:1.276.2.2
*** emacs/src/Makefile.in:1.276.2.1     Wed Jun 11 07:37:48 2003
--- emacs/src/Makefile.in       Mon Jun 16 14:31:00 2003
***************
*** 75,83 ****
  #include "config.h"
  
  #ifdef BOEHM_GC
! address@hidden@ -I$(top_srcdir)/gc/include
! #else
! address@hidden@
  #endif
  
  /* We won't really call alloca;
--- 75,81 ----
  #include "config.h"
  
  #ifdef BOEHM_GC
! GCINCLUDE=-I$(top_srcdir)/gc/include
  #endif
  
  /* We won't really call alloca;
***************
*** 286,292 ****
  
  /* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM
     since it may have -I options that should override those two.  */
! ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(TOOLKIT_DEFINES) $(MYCPPFLAGS) -I. 
-I${srcdir} C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_SITE C_SWITCH_X_SITE 
C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM C_SWITCH_SYSTEM_TEMACS ${CFLAGS}
  .c.o:
        $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $<
  
--- 284,290 ----
  
  /* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM
     since it may have -I options that should override those two.  */
! ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(TOOLKIT_DEFINES) $(MYCPPFLAGS) -I. 
-I${srcdir} C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_SITE C_SWITCH_X_SITE 
C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM C_SWITCH_SYSTEM_TEMACS ${CFLAGS} 
$(GCINCLUDE)
  .c.o:
        $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $<
  
***************
*** 628,634 ****
  #endif
  
  #ifdef BOEHM_GC
! gclib = $(top_srcdir)/gc/.libs/libgc.a
  #endif
  
  mallocobj = $(gmallocobj) $(rallocobj) $(gclib) vm-limit.o
--- 626,632 ----
  #endif
  
  #ifdef BOEHM_GC
! gclib = ../gc/.libs/libgc.a
  #endif
  
  mallocobj = $(gmallocobj) $(rallocobj) $(gclib) vm-limit.o