[Gnash-commit] gnash ./ChangeLog plugin/Makefile.am server/Mak...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Sandro Santilli <address@hidden>        06/05/24 19:01:12

Modified files:
        .              : ChangeLog 
        plugin         : Makefile.am 
        server         : Makefile.am 

Log message:
        applied patched by Patrice Dumas
        * server/Makefile.am: swap order of lib_LTLIBRARIES.
        * plugin/Makefile.am: remove redundant lib flags for plugin.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.377&tr2=1.378&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/Makefile.am.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Makefile.am.diff?tr1=1.45&tr2=1.46&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.377 gnash/ChangeLog:1.378
--- gnash/ChangeLog:1.377       Wed May 24 13:54:42 2006
+++ gnash/ChangeLog     Wed May 24 19:01:12 2006
@@ -1,5 +1,7 @@
 2006-05-24 Patrice Dumas <address@hidden>
 
+       * server/Makefile.am: swap order of lib_LTLIBRARIES.
+       * plugin/Makefile.am: remove redundant lib flags for plugin.
        * configure.ac, plugin/Makefile.am: removed references to
        the unused Xmu library.
        * macros/atk.m4, macros/glib.m4, macros/gstreamer.m4,
Index: gnash/plugin/Makefile.am
diff -u gnash/plugin/Makefile.am:1.24 gnash/plugin/Makefile.am:1.25
--- gnash/plugin/Makefile.am:1.24       Wed May 24 13:54:42 2006
+++ gnash/plugin/Makefile.am    Wed May 24 19:01:12 2006
@@ -83,26 +83,6 @@
 # PLUGIN_TRACE Enable this define to get debug prints whenever the plugin
 #              api gets control.
 AM_CPPFLAGS = -DPLUGIN_TRACE -DXP_UNIX -DMOZ_X11 -DPREFIX=\""${prefix}"\"
-AM_LDFLAGS  = $(X_LIBS) -lX11 -lXi \
-       $(SDL_LIBS)     \
-       $(SDL_MIXER_LIBS)\
-       $(OPENGL_LIBS)  \
-       $(GLEXT_LIBS)   \
-       $(GTK2_LIBS)    \
-       $(PANGO_LIBS)   \
-       $(CAIRO_LIBS)   \
-       $(ATK_LIBS)     \
-       $(GLIB_LIBS)    \
-       $(LIBXML_LIBS)  \
-       $(JPEG_LIBS)    \
-       $(PNG_LIBS)     \
-       $(DMALLOC_LIBS) \
-       $(OGG_LIBS)     \
-       $(DMALLOC_LIBS)
-
-#      -lXmu
-#      $(X_LIBS)\
-#      $(X_EXTRA_LIBS)
 
 plugin_LTLIBRARIES = libgnashplugin.la
 
@@ -136,12 +116,34 @@
         mozilla-sdk/npp_gate.cpp \
         mozilla-sdk/np_entry.cpp
 
-libgnashplugin_la_LIBADD   = $(AM_LDFLAGS) \
+libgnashplugin_la_LIBADD   = \
+       $(X_LIBS) \
+       $(SDL_LIBS)     \
+       $(SDL_MIXER_LIBS)\
+       $(OPENGL_LIBS)  \
+       $(GLEXT_LIBS)   \
+       $(GTK2_LIBS)    \
+       $(PANGO_LIBS)   \
+       $(CAIRO_LIBS)   \
+       $(ATK_LIBS)     \
+       $(GLIB_LIBS)    \
+       $(LIBXML_LIBS)  \
+       $(JPEG_LIBS)    \
+       $(PNG_LIBS)     \
+       $(DMALLOC_LIBS) \
+       $(OGG_LIBS)     \
+       $(DMALLOC_LIBS) \
        ../backend/libgnashbackend.la\
        ../server/libgnashasobjs.la \
        ../server/libgnashserver.la\
        ../libgeometry/libgnashgeo.la\
        ../libbase/libgnashbase.la
+
+#      -lXi -lX11
+#      -lXmu
+#      $(X_LIBS)\
+#      $(X_EXTRA_LIBS)
+
 libgnashplugin_la_LDFLAGS = -module -avoid-version -no-undefined -L$(plugindir)
 
 # For now the plugin has to be installed in the root plugin
Index: gnash/server/Makefile.am
diff -u gnash/server/Makefile.am:1.45 gnash/server/Makefile.am:1.46
--- gnash/server/Makefile.am:1.45       Tue May 23 07:59:21 2006
+++ gnash/server/Makefile.am    Wed May 24 19:01:12 2006
@@ -41,7 +41,7 @@
 AM_CPPFLAGS = 
 
 # noinst_LTLIBRARIES = libserver.la libasobjs.la
-lib_LTLIBRARIES = libgnashserver.la libgnashasobjs.la
+lib_LTLIBRARIES = libgnashasobjs.la libgnashserver.la
 # noinst_SCRIPTS = gen-files.sh
 
 # Only enable if we're configured with --enable-mp3