boehm-gc: revert all CACAO-specific modifications; this is now an exact copy of the...

[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 57207d792593e2d3a5488196a9958376e7e62fe5..fb658e27aed1fbe481fce88d9b4d8ed9a3297c67 100644 (file)
--- a/src/mm/boehm-gc/Makefile.am
+++ b/src/mm/boehm-gc/Makefile.am
@@ -34,7 +34,7 @@ SUBDIRS =
 
 # Initialize variables so that we can declare files locally.
 EXTRA_DIST = 
-noinst_LTLIBRARIES =
+lib_LTLIBRARIES =
 include_HEADERS =
 pkginclude_HEADERS =
 dist_noinst_HEADERS =
@@ -47,7 +47,7 @@ dist_pkgconfig_DATA = bdw-gc.pc
 # C Library
 # ---------
 
-noinst_LTLIBRARIES += libgc.la
+lib_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 \
@@ -95,7 +95,7 @@ EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \
 # -------------
 
 if CPLUSPLUS
-noinst_LTLIBRARIES += libgccpp.la
+lib_LTLIBRARIES += libgccpp.la
 pkginclude_HEADERS += include/gc_cpp.h include/gc_allocator.h
 libgccpp_la_SOURCES = gc_cpp.cc
 libgccpp_la_LIBADD = ./libgc.la
@@ -111,9 +111,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/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 
@@ -165,7 +164,7 @@ 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 \
+    WCC_MAKEFILE build_atomic_ops.sh build_atomic_ops.sh.cygwin \
     NT_STATIC_THREADS_MAKEFILE NT_X64_STATIC_THREADS_MAKEFILE \
     NT_X64_THREADS_MAKEFILE