[Emacs-diffs] Changes to emacs/gc/Makefile.am [Boehm-GC]

[Dave Love]

Index: emacs/gc/Makefile.am
diff -c emacs/gc/Makefile.am:1.2.2.1 emacs/gc/Makefile.am:1.2.2.2
*** emacs/gc/Makefile.am:1.2.2.1        Thu Jun  5 14:23:03 2003
--- emacs/gc/Makefile.am        Mon Jun 16 11:41:50 2003
***************
*** 25,31 ****
  EXTRA_DIST = 
      ## more items will be succesively added below
  
! lib_LTLIBRARIES = libgc.la
  
  include_HEADERS = include/gc.h include/gc_local_alloc.h \
  include/gc_pthread_redirects.h include/gc_config_macros.h \
--- 25,36 ----
  EXTRA_DIST = 
      ## more items will be succesively added below
  
! if CPLUSPLUS
! extra = libgccpp.la
! else
! extra = 
! endif
! lib_LTLIBRARIES = libgc.la $(extra) 
  
  include_HEADERS = include/gc.h include/gc_local_alloc.h \
  include/gc_pthread_redirects.h include/gc_config_macros.h \
***************
*** 33,44 ****
  
  EXTRA_HEADERS = include/gc_cpp.h include/gc_allocator.h
  
  libgc_la_SOURCES = allchblk.c alloc.c blacklst.c checksums.c dbg_mlc.c \
! dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c headers.c irix_threads.c \
! linux_threads.c malloc.c mallocx.c mark.c mark_rts.c misc.c new_hblk.c \
  obj_map.c os_dep.c pcr_interface.c ptr_chck.c real_malloc.c reclaim.c \
  solaris_pthreads.c solaris_threads.c specific.c stubborn.c typd_mlc.c \
! backgraph.c win32_threads.c
  
  # Include THREADLIBS here to ensure that the correct versions of
  # linuxthread semaphore functions get linked:
--- 38,57 ----
  
  EXTRA_HEADERS = include/gc_cpp.h include/gc_allocator.h
  
+ if POWERPC_DARWIN
+ asm_libgc_sources = powerpc_darwin_mach_dep.s
+ else
+ asm_libgc_sources = 
+ endif
+ 
  libgc_la_SOURCES = allchblk.c alloc.c blacklst.c checksums.c dbg_mlc.c \
! dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c headers.c aix_irix_threads.c \
! malloc.c mallocx.c mark.c mark_rts.c misc.c new_hblk.c \
  obj_map.c os_dep.c pcr_interface.c ptr_chck.c real_malloc.c reclaim.c \
  solaris_pthreads.c solaris_threads.c specific.c stubborn.c typd_mlc.c \
! backgraph.c win32_threads.c \
! pthread_support.c pthread_stop_world.c darwin_stop_world.c \
! $(asm_libgc_sources)
  
  # Include THREADLIBS here to ensure that the correct versions of
  # linuxthread semaphore functions get linked:
***************
*** 47,63 ****
  libgc_la_LDFLAGS = -version-info 1:2:0
  
  EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \
!     mips_sgi_mach_dep.S mips_ultrix_mach_dep.s powerpc_macosx_mach_dep.s \
      rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \
!     sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s gc_cpp.cc
  
  EXTRA_DIST += alpha_mach_dep.S mips_sgi_mach_dep.S sparc_mach_dep.S
  
  AM_CXXFLAGS = @GC_CFLAGS@
  AM_CFLAGS = @GC_CFLAGS@
  
! check_PROGRAMS = gctest @addtests@
! EXTRA_PROGRAMS = test_cpp
  
  test.o:       $(srcdir)/tests/test.c
        $(COMPILE) -c $(srcdir)/tests/test.c
--- 60,85 ----
  libgc_la_LDFLAGS = -version-info 1:2:0
  
  EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \
!     mips_sgi_mach_dep.S mips_ultrix_mach_dep.s powerpc_darwin_mach_dep.s \
      rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \
!     sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
! 
! libgccpp_la_SOURCES = gc_cpp.cc
! libgccpp_la_LIBADD = $(THREADLIBS)
! libgccpp_la_LDFLAGS = -version-info 1:2:0
  
  EXTRA_DIST += alpha_mach_dep.S mips_sgi_mach_dep.S sparc_mach_dep.S
  
  AM_CXXFLAGS = @GC_CFLAGS@
  AM_CFLAGS = @GC_CFLAGS@
  
! if CPLUSPLUS
! extra_checks = test_cpp
! else
! extra_checks = 
! endif
! 
! check_PROGRAMS = gctest $(extra_checks)
  
  test.o:       $(srcdir)/tests/test.c
        $(COMPILE) -c $(srcdir)/tests/test.c
***************
*** 71,79 ****
  gctest_SOURCES = tests/test.c
  gctest_LDADD = ./libgc.la $(THREADLIBS) $(EXTRA_TEST_LIBS)
  test_cpp_SOURCES = tests/test_cpp.cc
! test_cpp_LDADD = ./libgc.la $(THREADLIBS) $(EXTRA_TEST_LIBS)
! TESTS_ENVIRONMENT = LD_LIBRARY_PATH=../../gcc
! TESTS = gctest @addtests@
  
  ## FIXME: relies on internal code generated by automake.
  all_objs = @addobjs@ $(libgc_la_OBJECTS)
--- 93,101 ----
  gctest_SOURCES = tests/test.c
  gctest_LDADD = ./libgc.la $(THREADLIBS) $(EXTRA_TEST_LIBS)
  test_cpp_SOURCES = tests/test_cpp.cc
! test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADLIBS) $(EXTRA_TEST_LIBS)
! 
! TESTS = gctest $(extra_checks)
  
  ## FIXME: relies on internal code generated by automake.
  all_objs = @addobjs@ $(libgc_la_OBJECTS)