Author: toshok
Date: 2007-10-17 11:37:57 -0400 (Wed, 17 Oct 2007)
New Revision: 87693
Modified:
trunk/moon/ChangeLog
trunk/moon/configure.ac
trunk/moon/src/ChangeLog
trunk/moon/src/Makefile.am
trunk/moon/test/ChangeLog
trunk/moon/test/harness/Makefile.am
Log:
from .:
2007-10-17 Chris Toshok <[EMAIL PROTECTED]>
* configure.ac: define MOON_PROG_LIBS for the unmanaged programs
that we compile during the build (test/harness/xaml2png,
src/sizes, src/demo) that may need to pull in the mono libraries
to resolve symbols.
from src/:
2007-10-17 Chris Toshok <[EMAIL PROTECTED]>
* Makefile.am (demo_LDADD): add MOON_PROG_LIBS.
(sizes_LDADD): same.
from test/:
2007-10-17 Chris Toshok <[EMAIL PROTECTED]>
* harness/Makefile.am (xaml2png_LDADD): add MOON_PROG_LIBS.
Modified: trunk/moon/ChangeLog
===================================================================
--- trunk/moon/ChangeLog 2007-10-17 15:28:47 UTC (rev 87692)
+++ trunk/moon/ChangeLog 2007-10-17 15:37:57 UTC (rev 87693)
@@ -1,3 +1,10 @@
+2007-10-17 Chris Toshok <[EMAIL PROTECTED]>
+
+ * configure.ac: define MOON_PROG_LIBS for the unmanaged programs
+ that we compile during the build (test/harness/xaml2png,
+ src/sizes, src/demo) that may need to pull in the mono libraries
+ to resolve symbols.
+
2007-10-16 Andrew Jorgensen <[EMAIL PROTECTED]>
* Makefile.am: gtk and tools should only build if we are including
Modified: trunk/moon/configure.ac
===================================================================
--- trunk/moon/configure.ac 2007-10-17 15:28:47 UTC (rev 87692)
+++ trunk/moon/configure.ac 2007-10-17 15:37:57 UTC (rev 87693)
@@ -195,6 +195,8 @@
AC_SUBST(PLUGIN_CFLAGS)
AC_SUBST(PLUGIN_LIBS)
+MOON_PROG_LIBS=`pkg-config --libs $MOON_PKGS $MONO_PKGS`
+AC_SUBST(MOON_PROG_LIBS)
#CFLAGS="$CFLAGS `pkg-config --cflags gtk+-2.0 libavcodec libavformat
gthread-2.0 libswscale alsa $mozilla_nspr $mozilla_nss`"
#CXXFLAGS="$CXXFLAGS `pkg-config --libs gtk+-2.0 libavcodec libavformat
gthread-2.0 libswscale alsa $mozilla_nspr $mozilla_nss`"
Modified: trunk/moon/src/ChangeLog
===================================================================
--- trunk/moon/src/ChangeLog 2007-10-17 15:28:47 UTC (rev 87692)
+++ trunk/moon/src/ChangeLog 2007-10-17 15:37:57 UTC (rev 87693)
@@ -1,3 +1,8 @@
+2007-10-17 Chris Toshok <[EMAIL PROTECTED]>
+
+ * Makefile.am (demo_LDADD): add MOON_PROG_LIBS.
+ (sizes_LDADD): same.
+
2007-10-17 Rolf Bjarne Kvinge <[EMAIL PROTECTED]>
* dependencyobject.h: Add a GET_OBJ_ID macro that resolves to -1 if
Modified: trunk/moon/src/Makefile.am
===================================================================
--- trunk/moon/src/Makefile.am 2007-10-17 15:28:47 UTC (rev 87692)
+++ trunk/moon/src/Makefile.am 2007-10-17 15:37:57 UTC (rev 87693)
@@ -116,9 +116,9 @@
libmoon_la_LIBADD = $(MOON_LIBS)
-demo_LDADD = -lmoon
+demo_LDADD = -lmoon $(MOON_PROG_LIBS)
-sizes_LDADD = -lmoon
+sizes_LDADD = -lmoon $(MOON_PROG_LIBS)
debug:
LD_LIBRARY_PATH=.libs gdb .libs/demo
Modified: trunk/moon/test/ChangeLog
===================================================================
--- trunk/moon/test/ChangeLog 2007-10-17 15:28:47 UTC (rev 87692)
+++ trunk/moon/test/ChangeLog 2007-10-17 15:37:57 UTC (rev 87693)
@@ -1,3 +1,7 @@
+2007-10-17 Chris Toshok <[EMAIL PROTECTED]>
+
+ * harness/Makefile.am (xaml2png_LDADD): add MOON_PROG_LIBS.
+
2007-09-27 Jeffrey Stedfast <[EMAIL PROTECTED]>
* harness/xaml2png.cpp (main): Updated runtime_init() call.
Modified: trunk/moon/test/harness/Makefile.am
===================================================================
--- trunk/moon/test/harness/Makefile.am 2007-10-17 15:28:47 UTC (rev 87692)
+++ trunk/moon/test/harness/Makefile.am 2007-10-17 15:37:57 UTC (rev 87693)
@@ -3,7 +3,7 @@
noinst_PROGRAMS=xaml2png
xaml2png_SOURCES=xaml2png.cpp
-xaml2png_LDADD=$(top_builddir)/src/libmoon.la
+xaml2png_LDADD=$(top_builddir)/src/libmoon.la $(MOON_PROG_LIBS)
MOON_TESTS= \
../xaml/test-brush-linear.xaml \
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
