[Gnash-commit] gnash ChangeLog libamf/Makefile.am libgeometry/...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/07/07 15:10:15

Modified files:
        .              : ChangeLog 
        libamf         : Makefile.am 
        libgeometry    : Makefile.am 
        plugin         : Makefile.am 
        plugin/mozilla-sdk: Makefile.am 

Log message:
        patch by Stefan Schweizer <address@hidden>
        
                * libamf/Makefile.am, libgeometry/Makefile.am, 
plugin/Makefile.am,
                plugin/mozilla-sdk/Makefile.am:
                Use CXXFLAGS where appropriate; install plugin using libtool.
        
                ( see bug # 17049 )

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.479&r2=1.480
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/Makefile.am?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/Makefile.am?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/Makefile.am?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/mozilla-sdk/Makefile.am?cvsroot=gnash&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.479
retrieving revision 1.480
diff -u -b -r1.479 -r1.480
--- ChangeLog   7 Jul 2006 14:52:39 -0000       1.479
+++ ChangeLog   7 Jul 2006 15:10:15 -0000       1.480
@@ -1,3 +1,9 @@
+2006-07-07 Stefan Schweizer <address@hidden>
+
+       * libamf/Makefile.am, libgeometry/Makefile.am, plugin/Makefile.am,
+       plugin/mozilla-sdk/Makefile.am:
+       Use CXXFLAGS where appropriate; install plugin using libtool.
+
 2006-07-07 Sandro Santilli <address@hidden>
 
        * TODO: updated

Index: libamf/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libamf/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libamf/Makefile.am  24 Apr 2006 23:05:55 -0000      1.6
+++ libamf/Makefile.am  7 Jul 2006 15:10:15 -0000       1.7
@@ -38,7 +38,7 @@
 
 AUTOMAKE_OPTIONS = 
 
-AM_CXXFLAGS =  $(CFLAGS) $(SDL_CFLAGS) $(INCLUDES)
+AM_CXXFLAGS =  $(CXXFLAGS) $(SDL_CFLAGS) $(INCLUDES)
 AM_CPPFLAGS = 
 AM_LDFLAGS = \
        ../libbase/libgnashbase.la \

Index: libgeometry/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libgeometry/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- libgeometry/Makefile.am     24 Apr 2006 23:05:55 -0000      1.14
+++ libgeometry/Makefile.am     7 Jul 2006 15:10:15 -0000       1.15
@@ -38,7 +38,7 @@
 
 AUTOMAKE_OPTIONS = 
 
-AM_CXXFLAGS =  $(CFLAGS) $(SDL_CFLAGS) $(INCLUDES)
+AM_CXXFLAGS =  $(CXXFLAGS) $(SDL_CFLAGS) $(INCLUDES)
 AM_CPPFLAGS = #-Wall
 # AM_LDFLAGS  = $(OPENGL_LIBNS) $(SDL_LIBS)
 

Index: plugin/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/Makefile.am,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- plugin/Makefile.am  30 May 2006 14:49:54 -0000      1.26
+++ plugin/Makefile.am  7 Jul 2006 15:10:15 -0000       1.27
@@ -152,8 +152,8 @@
 # won't load due to errors with an undefined MaiAtkObject.
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
        test -d "$(DESTDIR)$(plugindir)" || $(mkinstalldirs) 
"$(DESTDIR)$(plugindir)"
-       cp .libs/libgnashplugin.so $(DESTDIR)$(plugindir)/libgnashplugin.so
-#      $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) 
$(plugin_LTLIBRARIES) "$(DESTDIR)$(plugindir)/$(plugin_LTLIBRARIES)"
+#      cp .libs/libgnashplugin.so $(DESTDIR)$(plugindir)/libgnashplugin.so
+       $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) 
$(plugin_LTLIBRARIES) "$(DESTDIR)$(plugindir)/$(plugin_LTLIBRARIES)"
        $(RM) $(DESTDIR)$(plugindir)/libgnashplugin.*a
 
 

Index: plugin/mozilla-sdk/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/mozilla-sdk/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- plugin/mozilla-sdk/Makefile.am      24 Apr 2006 23:05:56 -0000      1.11
+++ plugin/mozilla-sdk/Makefile.am      7 Jul 2006 15:10:15 -0000       1.12
@@ -42,7 +42,7 @@
         -I$(srcdir) \
        -I$(srcdir)/include
 
-AM_CXXFLAGS = $(CFLAGS) $(INCLUDES)
+AM_CXXFLAGS = $(CXXFLAGS) $(INCLUDES)
 AM_CPPFLAGS = -DPLUGIN_TRACE -DXP_UNIX # $(FIREFOX_DEFS)
 # AM_LDFLAGS  = $(FIREFOX_LIBS)