Rename configure.in -> configure.ac. Based on PR #976.

[mono.git] / mono / metadata / Makefile.am.in

diff --git a/mono/metadata/Makefile.am.in b/mono/metadata/Makefile.am.in
index 2df7f945429092f407ad84536511cc84489217fc..fa6228326346f1b492131ccfa1c1752958f4ba94 100644 (file)
--- a/mono/metadata/Makefile.am.in
+++ b/mono/metadata/Makefile.am.in
@@ -75,7 +75,7 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CPPFLAGS) $(GLIB_CFLA
 #  mono-config.c uses MONO_CFG_DIR
 #
 # This won't result in many more false positives than AC_DEFINEing them
-# in configure.in.
+# in configure.ac.
 #
 assembly.lo mono-config.lo: Makefile
 
@@ -190,7 +190,8 @@ common_sources = \
        threadpool-internals.h  \
        verify.c                \
        verify-internals.h      \
-       wrapper-types.h
+       wrapper-types.h \
+       reflection-internals.h
 
 # These source files have compile time dependencies on GC code
 gc_dependent_sources = \
@@ -219,6 +220,9 @@ sgen_sources = \
        sgen-protocol.c \
        sgen-bridge.c           \
        sgen-bridge.h           \
+       sgen-old-bridge.c               \
+       sgen-new-bridge.c               \
+       sgen-tarjan-bridge.c            \
        sgen-toggleref.c                \
        sgen-toggleref.h                \
        sgen-gc.h               \
@@ -255,7 +259,8 @@ sgen_sources = \
        sgen-fin-weak-hash.c    \
        sgen-layout-stats.c     \
        sgen-layout-stats.h     \
-       sgen-qsort.c
+       sgen-qsort.c    \
+       sgen-qsort.h
 
 libmonoruntime_la_SOURCES = $(common_sources) $(gc_dependent_sources) $(boehm_sources)
 libmonoruntime_la_CFLAGS = $(BOEHM_DEFINES)
@@ -320,7 +325,7 @@ pedump_LDADD = libmonoruntime.la ../io-layer/libwapi.la ../utils/libmonoutils.la
        $(LIBGC_LIBS) $(GLIB_LIBS) -lm $(LIBICONV) $(PEDUMP_DTRACE_OBJECT)
 
 if PLATFORM_DARWIN
-pedump_LDFLAGS=-framework CoreFoundation
+pedump_LDFLAGS=-framework CoreFoundation -framework Foundation
 endif
 endif
 endif
@@ -333,23 +338,3 @@ else
 Makefile.am: Makefile.am.in
        cp $< $@
 endif
-
-test_sgen_qsort_SOURCES = test-sgen-qsort.c
-test_sgen_qsort_CFLAGS = $(SGEN_DEFINES)
-test_sgen_qsort_LDADD = libmonoruntimesgen.la ../io-layer/libwapi.la ../utils/libmonoutils.la \
-       $(LIBGC_LIBS) $(GLIB_LIBS) -lm $(LIBICONV)
-if PLATFORM_DARWIN
-test_sgen_qsort_LDFLAGS=-framework CoreFoundation
-endif
-
-test_gc_memfuncs_SOURCES = test-gc-memfuncs.c
-test_gc_memfuncs_CFLAGS = $(SGEN_DEFINES)
-test_gc_memfuncs_LDADD = libmonoruntimesgen.la ../io-layer/libwapi.la ../utils/libmonoutils.la \
-       $(LIBGC_LIBS) $(GLIB_LIBS) -lm $(LIBICONV)
-if PLATFORM_DARWIN
-test_gc_memfuncs_LDFLAGS=-framework CoreFoundation
-endif
-
-noinst_PROGRAMS = test-sgen-qsort test-gc-memfuncs
-
-TESTS = test-sgen-qsort test-gc-memfuncs