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 cf83b26147f3d9bd6d6adaefbd4f0098221b3566..fb658e27aed1fbe481fce88d9b4d8ed9a3297c67 100644 (file)
--- a/src/mm/boehm-gc/Makefile.am
+++ b/src/mm/boehm-gc/Makefile.am
@@ -16,13 +16,6 @@
 
 ## Process this file with automake to produce Makefile.in.
 
-ACLOCAL_AMFLAGS = -I m4
-
-DISTCLEANFILES = \
-       atomic_ops.c \
-       atomic_ops_sysdeps.S \
-       libatomic_ops
-
 ## FIXME: `make distcheck' in this directory will not currently work.
 ##     This is most likely to the explicit flags passed to submakes.
 
@@ -41,22 +34,20 @@ SUBDIRS =
 
 # Initialize variables so that we can declare files locally.
 EXTRA_DIST = 
-noinst_LTLIBRARIES =
-# Don't install include/gc
-#include_HEADERS =
-#pkginclude_HEADERS =
+lib_LTLIBRARIES =
+include_HEADERS =
+pkginclude_HEADERS =
 dist_noinst_HEADERS =
 check_PROGRAMS =
 TESTS =
 
-# Don't install pkg-config data.
-#pkgconfigdir = $(libdir)/pkgconfig
-#dist_pkgconfig_DATA = bdw-gc.pc
+pkgconfigdir = $(libdir)/pkgconfig
+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 \
@@ -83,7 +74,7 @@ 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        
 endif
@@ -104,8 +95,8 @@ EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \
 # -------------
 
 if CPLUSPLUS
-noinst_LTLIBRARIES += libgccpp.la
-#pkginclude_HEADERS += include/gc_cpp.h include/gc_allocator.h
+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
 libgccpp_la_LDFLAGS = -version-info 1:3:0 -no-undefined
@@ -120,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 
@@ -174,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
 
@@ -198,7 +188,7 @@ CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host
 
 # :FIXME: why do we distribute this one???
 #
-#EXTRA_DIST += libtool.m4
+EXTRA_DIST += libtool.m4
 
 #
 # :GOTCHA: GNU make rule for making .s out of .S is flawed,