[Gnash-commit] gnash ChangeLog utilities/Makefile.am

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/07/28 02:36:38

Modified files:
        .              : ChangeLog 
        utilities      : Makefile.am 

Log message:
                * utilities/Makefile.am: remove all LIBS references, deps
                  are derived from Gnash libs (simplifies things a lot)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.543&r2=1.544
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/Makefile.am?cvsroot=gnash&r1=1.21&r2=1.22

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.543
retrieving revision 1.544
diff -u -b -r1.543 -r1.544
--- ChangeLog   28 Jul 2006 01:27:48 -0000      1.543
+++ ChangeLog   28 Jul 2006 02:36:38 -0000      1.544
@@ -1,5 +1,7 @@
 2006-07-27 Sandro Santilli <address@hidden>
 
+       * utilities/Makefile.am: remove all LIBS references, deps
+         are derived from Gnash libs (simplifies things a lot)
        * macros/glib.m4: Fix the fix of --with-glib-lib.
 
 2006-07-27  Rob Savoye  <address@hidden>

Index: utilities/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/utilities/Makefile.am,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- utilities/Makefile.am       27 Jul 2006 13:07:21 -0000      1.21
+++ utilities/Makefile.am       28 Jul 2006 02:36:38 -0000      1.22
@@ -28,27 +28,31 @@
 # @@ shouldn't we drop package_LIBS and leave deps
 #    on the gnash libraries side instead ?
 
-AM_CPPFLAGS = # -Wall
-AM_LDFLAGS = \
+GNASH_LIBS = \
        ../backend/libgnashbackend.la \
        ../server/libgnashserver.la \
        ../server/asobj/libgnashasobjs.la \
        ../libgeometry/libgnashgeo.la \
-       ../libbase/libgnashbase.la \
-       $(LIBXML_LIBS) \
-       $(JPEG_LIBS) \
-       $(PNG_LIBS) \
-        $(OGG_LIBS) \
-       $(ZLIB_LIBS) \
-       $(CURL_LIBS) \
-        $(LIBXML_LIBS) \
-        $(OPENGL_LIBS) \
-       $(CAIRO_LIBS) \
-       $(GLEXT_LIBS) \
-       $(GTK2_LIBS) \
-       $(MP3_LIBS) \
-       $(PTHREAD_LIBS) \
-       $(GSTREAMER_LIBS)
+       ../libbase/libgnashbase.la 
+
+AM_CPPFLAGS = # -Wall
+
+# @@ dependencies are derived by GNASH_LIBS
+#AM_LDFLAGS = \
+#      $(LIBXML_LIBS) \
+#      $(JPEG_LIBS) \
+#      $(PNG_LIBS) \
+#        $(OGG_LIBS) \
+#      $(ZLIB_LIBS) \
+#      $(CURL_LIBS) \
+#        $(LIBXML_LIBS) \
+#        $(OPENGL_LIBS) \
+#      $(CAIRO_LIBS) \
+#      $(GLEXT_LIBS) \
+#      $(GTK2_LIBS) \
+#      $(MP3_LIBS) \
+#      $(PTHREAD_LIBS) \
+#      $(GSTREAMER_LIBS)
 
 INCLUDES = -I.. \
         -I$(top_srcdir)                \
@@ -70,11 +74,13 @@
 
 gparser_SOURCES = \
        parser.cpp
-gparser_LDADD = $(AM_LDFLAGS)
+gparser_LDADD = $(GNASH_LIBS)
+#gparser_LDFLAGS = $(AM_LDFLAGS)
 
 gprocessor_SOURCES = \
        processor.cpp
-gprocessor_LDADD = $(AM_LDFLAGS)
+gprocessor_LDADD = $(GNASH_LIBS)
+#gprocessor_LDFLAGS = $(AM_LDFLAGS)
 
 MUDFLAP_OPT = -fmudflap
 MUDFLAP_LIB =  /usr/local/lib/libmudflap.so