* src/mm/boehm-gc/autogen.sh: Adapted for inclusion in CACAO repository.

[cacao.git] / src / mm / boehm-gc / Makefile.am

diff --git a/src/mm/boehm-gc/Makefile.am b/src/mm/boehm-gc/Makefile.am
index 94fa27f8948fa9757bd659b2cbb6c6c6f6463c57..3183ae57f69ef8e37336aae14248e18094c87883 100644 (file)
--- a/src/mm/boehm-gc/Makefile.am
+++ b/src/mm/boehm-gc/Makefile.am
@@ -35,6 +35,7 @@ SUBDIRS =
 # Initialize variables so that we can declare files locally.
 EXTRA_DIST = 
 lib_LTLIBRARIES =
+noinst_LTLIBRARIES =
 include_HEADERS =
 pkginclude_HEADERS =
 dist_noinst_HEADERS =
@@ -47,7 +48,7 @@ dist_pkgconfig_DATA = bdw-gc.pc
 # C Library
 # ---------
 
-lib_LTLIBRARIES += libgc.la
+noinst_LTLIBRARIES += libgc.la
 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 \
@@ -71,12 +72,12 @@ if WIN32_THREADS
 libgc_la_SOURCES += win32_threads.c
 endif
 
-if USE_INTERNAL_LIBATOMIC_OPS
-nodist_libgc_la_SOURCES = atomic_ops.c
-endif
-
-if NEED_ATOMIC_OPS_ASM
-nodist_libgc_la_SOURCES = atomic_ops_sysdeps.S
+if USE_INTERNAL_LIBATOMIC_OPS   
+nodist_libgc_la_SOURCES = ./atomic_ops.c        
+endif   
+        
+if NEED_ATOMIC_OPS_ASM          
+nodist_libgc_la_SOURCES = ./atomic_ops_sysdeps.S        
 endif
 
 # Include THREADDLLIBS here to ensure that the correct versions of
@@ -98,7 +99,7 @@ if CPLUSPLUS
 lib_LTLIBRARIES += libgccpp.la
 pkginclude_HEADERS += include/gc_cpp.h include/gc_allocator.h
 libgccpp_la_SOURCES = gc_cpp.cc
-libgccpp_la_LIBADD = $(top_builddir)/libgc.la
+libgccpp_la_LIBADD = ./libgc.la
 libgccpp_la_LDFLAGS = -version-info 1:3:0 -no-undefined
 endif
 
@@ -111,9 +112,8 @@ EXTRA_DIST += gc_cpp.cpp
 # Misc
 # ----
 
-#AM_CXXFLAGS = @GC_CFLAGS@
-#AM_CFLAGS = @GC_CFLAGS@
-AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/libatomic_ops-1.2/src
+AM_CXXFLAGS = @GC_CFLAGS@
+AM_CFLAGS = @GC_CFLAGS@
 
 ## FIXME: relies on internal code generated by automake.
 ## FIXME: ./configure --enable-dependency-tracking should be used 
@@ -155,7 +155,6 @@ dist_noinst_SCRIPTS = callprocs configure.host
 # headers which are not installed
 # (see include/include.am for more)
 #
-dist_noinst_HEADERS += version.h
 
 # documentation which is not installed
 #
@@ -166,8 +165,9 @@ EXTRA_DIST += README.QUICK
 EXTRA_DIST += BCC_MAKEFILE NT_MAKEFILE NT_THREADS_MAKEFILE \
     OS2_MAKEFILE PCR-Makefile digimars.mak EMX_MAKEFILE        \
     Makefile.direct Makefile.dj        Makefile.DLLs SMakefile.amiga \
-    WCC_MAKEFILE configure_atomic_ops.sh \
-    NT_STATIC_THREADS_MAKEFILE NT_X64_STATIC_THREADS_MAKEFILE
+    WCC_MAKEFILE build_atomic_ops.sh build_atomic_ops.sh.cygwin \
+    NT_STATIC_THREADS_MAKEFILE NT_X64_STATIC_THREADS_MAKEFILE \
+    NT_X64_THREADS_MAKEFILE
 
 # files used by makefiles other than Makefile.am
 #