Author: lupus
Date: 2007-01-26 08:24:04 -0500 (Fri, 26 Jan 2007)
New Revision: 71749
Modified:
trunk/mono/mono/dis/Makefile.am
trunk/mono/mono/handles/Makefile.am
trunk/mono/mono/interpreter/Makefile.am
trunk/mono/mono/io-layer/Makefile.am
trunk/mono/mono/metadata/Makefile.am
trunk/mono/mono/mini/Makefile.am
trunk/mono/mono/monograph/Makefile.am
trunk/mono/mono/profiler/Makefile.am
trunk/mono/mono/utils/Makefile.am
Log:
Don't link to gmodule anymore.
Modified: trunk/mono/mono/dis/Makefile.am
===================================================================
--- trunk/mono/mono/dis/Makefile.am 2007-01-26 12:10:43 UTC (rev 71748)
+++ trunk/mono/mono/dis/Makefile.am 2007-01-26 13:24:04 UTC (rev 71749)
@@ -33,7 +33,6 @@
monodis_LDADD = \
libmonodis.a \
$(runtime_lib) \
- $(GMODULE_LIBS) \
$(GLIB_LIBS)
man_MANS = monodis.1
Modified: trunk/mono/mono/handles/Makefile.am
===================================================================
--- trunk/mono/mono/handles/Makefile.am 2007-01-26 12:10:43 UTC (rev 71748)
+++ trunk/mono/mono/handles/Makefile.am 2007-01-26 13:24:04 UTC (rev 71749)
@@ -3,7 +3,6 @@
INCLUDES = \
-I$(top_srcdir) \
- $(GMODULE_CFLAGS) \
$(GLIB_CFLAGS)
hps_LDADD = \
@@ -11,7 +10,6 @@
../utils/libmonoutils.la \
$(LIBGC_LIBS) \
$(GLIB_LIBS) \
- $(GMODULE_LIBS) \
-lm
semdel_LDADD = \
@@ -19,7 +17,6 @@
../utils/libmonoutils.la \
$(LIBGC_LIBS) \
$(GLIB_LIBS) \
- $(GMODULE_LIBS) \
-lm
EXTRA_DIST = ChangeLog
Modified: trunk/mono/mono/interpreter/Makefile.am
===================================================================
--- trunk/mono/mono/interpreter/Makefile.am 2007-01-26 12:10:43 UTC (rev
71748)
+++ trunk/mono/mono/interpreter/Makefile.am 2007-01-26 13:24:04 UTC (rev
71749)
@@ -1,7 +1,6 @@
INCLUDES = \
-I$(top_srcdir) \
$(LIBGC_CFLAGS) \
- $(GMODULE_CFLAGS) \
$(GLIB_CFLAGS)
if PLATFORM_WIN32
@@ -51,7 +50,6 @@
../utils/libmonoutils.la \
$(libgc_libs) \
$(GLIB_LIBS) \
- $(GMODULE_LIBS) \
$(ICU_LIBS) \
-lm
Modified: trunk/mono/mono/io-layer/Makefile.am
===================================================================
--- trunk/mono/mono/io-layer/Makefile.am 2007-01-26 12:10:43 UTC (rev
71748)
+++ trunk/mono/mono/io-layer/Makefile.am 2007-01-26 13:24:04 UTC (rev
71749)
@@ -2,7 +2,6 @@
INCLUDES = \
$(GLIB_CFLAGS) \
- $(GMODULE_CFLAGS) \
$(LIBGC_CFLAGS) \
-DMONO_BINDIR=\""$(bindir)"\" \
-I$(top_srcdir)
Modified: trunk/mono/mono/metadata/Makefile.am
===================================================================
--- trunk/mono/mono/metadata/Makefile.am 2007-01-26 12:10:43 UTC (rev
71748)
+++ trunk/mono/mono/metadata/Makefile.am 2007-01-26 13:24:04 UTC (rev
71749)
@@ -21,7 +21,7 @@
#
noinst_LTLIBRARIES = libmonoruntime.la libmonoruntime-static.la
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS)
$(GMODULE_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\"
-DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS)
-DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\"
-DMONO_CFG_DIR=\"$(confdir)\"
#
# Make sure any prefix changes are updated in the binaries too.
@@ -161,7 +161,7 @@
pedump.c
pedump_LDADD = libmonoruntime.la ../io-layer/libwapi.la
../utils/libmonoutils.la \
- $(LIBGC_LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) -lm
+ $(LIBGC_LIBS) $(GLIB_LIBS) -lm
monodiet_SOURCES = monodiet.c
@@ -171,7 +171,6 @@
../utils/libmonoutils.la \
$(LIBGC_LIBS) \
$(GLIB_LIBS) \
- $(GMODULE_LIBS) \
$(ICU_LIBS) \
-lm
Modified: trunk/mono/mono/mini/Makefile.am
===================================================================
--- trunk/mono/mono/mini/Makefile.am 2007-01-26 12:10:43 UTC (rev 71748)
+++ trunk/mono/mono/mini/Makefile.am 2007-01-26 13:24:04 UTC (rev 71749)
@@ -15,7 +15,6 @@
$(monodir)/mono/metadata/libmonoruntime.la \
$(monodir)/mono/io-layer/libwapi.la \
$(monodir)/mono/utils/libmonoutils.la \
- $(GMODULE_LIBS) \
$(GLIB_LIBS) \
$(libgc_libs)
@@ -23,7 +22,6 @@
$(monodir)/mono/metadata/libmonoruntime-static.la \
$(monodir)/mono/io-layer/libwapi.la \
$(monodir)/mono/utils/libmonoutils.la \
- $(GMODULE_LIBS) \
$(GLIB_LIBS) \
$(libgc_static_libs)
@@ -41,7 +39,6 @@
AM_CFLAGS = \
-I$(top_srcdir) \
$(LIBGC_CFLAGS) \
- $(GMODULE_CFLAGS) \
$(GLIB_CFLAGS)
$(PLATFORM_CFLAGS) $(ARCH_CFLAGS)
@@ -97,7 +94,7 @@
mono_LDADD = \
$(MONO_LIB) \
$(GLIB_LIBS) \
- $(GMODULE_LIBS) -lm
+ -lm
mono_LDFLAGS = \
$(static_flags) -export-dynamic $(monobinldflags)
@@ -117,8 +114,7 @@
# Don't link this against libmonoruntime to speed up rebuilds
genmdesc_LDADD = \
$(monodir)/mono/utils/libmonoutils.la
$(monodir)/mono/metadata/opcodes.lo -lm \
- $(GLIB_LIBS) \
- $(GMODULE_LIBS)
+ $(GLIB_LIBS)
x86_sources = \
mini-x86.c \
Modified: trunk/mono/mono/monograph/Makefile.am
===================================================================
--- trunk/mono/mono/monograph/Makefile.am 2007-01-26 12:10:43 UTC (rev
71748)
+++ trunk/mono/mono/monograph/Makefile.am 2007-01-26 13:24:04 UTC (rev
71749)
@@ -13,13 +13,11 @@
INCLUDES = \
-I$(top_srcdir) \
- $(GMODULE_CFLAGS) \
$(GLIB_CFLAGS)
monograph_LDADD = \
$(runtime_lib) \
$(GLIB_LIBS) \
- $(GMODULE_LIBS) \
-lm
GRAPHS=System.Object System.Enum System.Attribute System.ValueType
System.Reflection.MemberInfo
Modified: trunk/mono/mono/profiler/Makefile.am
===================================================================
--- trunk/mono/mono/profiler/Makefile.am 2007-01-26 12:10:43 UTC (rev
71748)
+++ trunk/mono/mono/profiler/Makefile.am 2007-01-26 13:24:04 UTC (rev
71749)
@@ -2,7 +2,6 @@
INCLUDES = \
-fexceptions -DMONO_USE_EXC_TABLES \
-I$(top_srcdir) \
- $(GMODULE_CFLAGS) \
$(GLIB_CFLAGS)
if JIT_SUPPORTED
Modified: trunk/mono/mono/utils/Makefile.am
===================================================================
--- trunk/mono/mono/utils/Makefile.am 2007-01-26 12:10:43 UTC (rev 71748)
+++ trunk/mono/mono/utils/Makefile.am 2007-01-26 13:24:04 UTC (rev 71749)
@@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libmonoutils.la
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS)
$(GMODULE_CFLAGS)
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS)
if EGLIB_BUILD
hash_sources = mono-ehash.c
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
