* src/vm/vm.c, src/vm/vm.h: Moved to .cpp.

[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 89298b010f4fa5955165ad39df34133e7a4c6406..cf83b26147f3d9bd6d6adaefbd4f0098221b3566 100644 (file)
--- a/src/mm/boehm-gc/Makefile.am
+++ b/src/mm/boehm-gc/Makefile.am
@@ -16,6 +16,13 @@
 
 ## 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.
 
@@ -35,14 +42,16 @@ SUBDIRS =
 # Initialize variables so that we can declare files locally.
 EXTRA_DIST = 
 noinst_LTLIBRARIES =
-include_HEADERS =
-pkginclude_HEADERS =
+# Don't install include/gc
+#include_HEADERS =
+#pkginclude_HEADERS =
 dist_noinst_HEADERS =
 check_PROGRAMS =
 TESTS =
 
-pkgconfigdir = $(libdir)/pkgconfig
-dist_pkgconfig_DATA = bdw-gc.pc
+# Don't install pkg-config data.
+#pkgconfigdir = $(libdir)/pkgconfig
+#dist_pkgconfig_DATA = bdw-gc.pc
 
 # C Library
 # ---------
@@ -74,7 +83,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
@@ -96,7 +105,7 @@ EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \
 
 if CPLUSPLUS
 noinst_LTLIBRARIES += libgccpp.la
-pkginclude_HEADERS += include/gc_cpp.h include/gc_allocator.h
+#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
@@ -113,7 +122,7 @@ EXTRA_DIST += gc_cpp.cpp
 
 #AM_CXXFLAGS = @GC_CFLAGS@
 #AM_CFLAGS = @GC_CFLAGS@
-AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/libatomic_ops-1.2/src
+AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/libatomic_ops/src
 
 ## FIXME: relies on internal code generated by automake.
 ## FIXME: ./configure --enable-dependency-tracking should be used 
@@ -189,7 +198,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,