[Gnash-commit] gnash ChangeLog configure.ac libbase/Makefile.am

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/04/27 12:38:03

Modified files:
        .              : ChangeLog configure.ac 
        libbase        : Makefile.am 

Log message:
                * configure.ac: don't generate sysgnash{plugin,}rc, let
                  'make' take care of that.
                * libbase/Makefile.am: install sysgnash{plugin,}rc, generate
                  on make, clean on make clean.
        
        From now on, the NPAPI plugin will by default start in stopped mode
        (as per syswide config). As long as the NPAPI calls gtk-gnash (the 
default)
        this should be safe.
        The KPARTS plugin won't use sysgnashpluginrc yet, and the KDE gui 
doesn't
        support the paused widget either, so should be ok.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6413&r2=1.6414
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.521&r2=1.522
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/Makefile.am?cvsroot=gnash&r1=1.109&r2=1.110

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6413
retrieving revision 1.6414
diff -u -b -r1.6413 -r1.6414
--- ChangeLog   27 Apr 2008 09:46:37 -0000      1.6413
+++ ChangeLog   27 Apr 2008 12:38:02 -0000      1.6414
@@ -1,3 +1,10 @@
+2008-04-27 Sandro Santilli <address@hidden>
+
+       * configure.ac: don't generate sysgnash{plugin,}rc, let
+         'make' take care of that.
+       * libbase/Makefile.am: install sysgnash{plugin,}rc, generate
+         on make, clean on make clean.
+
 2008-04-27 Robert Millan <address@hidden>
 
        * gui/gui.{cpp,h}, gui/gtk{sup.h,.cpp}: add stopHook and playHook for

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.521
retrieving revision 1.522
diff -u -b -r1.521 -r1.522
--- configure.ac        26 Apr 2008 12:17:42 -0000      1.521
+++ configure.ac        27 Apr 2008 12:38:02 -0000      1.522
@@ -2004,8 +2004,6 @@
 libmedia/Makefile
 po/Makefile
 libbase/Makefile
-libbase/sysgnashrc
-libbase/sysgnashpluginrc
 libgeometry/Makefile
 server/Makefile
 server/asobj/Makefile

Index: libbase/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libbase/Makefile.am,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- libbase/Makefile.am 26 Apr 2008 10:10:36 -0000      1.109
+++ libbase/Makefile.am 27 Apr 2008 12:38:02 -0000      1.110
@@ -26,6 +26,21 @@
 LIBLTDLHEAD =  $(top_srcdir)/libltdl/ltdl.h
 endif
 
+sysconf_DATA = sysgnashrc sysgnashpluginrc
+
+edit = sed \
+       -e 's|@address@hidden|$(DEFAULT_FLASH_PLATFORM_ID)|g' \
+       -e 's|@address@hidden|$(DEFAULT_FLASH_MAJOR_VERSION)|g' \
+       -e 's|@address@hidden|$(DEFAULT_FLASH_MINOR_VERSION)|g' \
+       -e 's|@address@hidden|$(DEFAULT_FLASH_REV_NUMBER)|g' \
+       -e 's|@address@hidden|$(DEFAULT_STREAMS_TIMEOUT)|g' 
+
+sysgnashrc: sysgnashrc.in
+       $(edit) '$(srcdir)/address@hidden' >$@
+
+sysgnashpluginrc: sysgnashpluginrc.in
+       $(edit) '$(srcdir)/address@hidden' >$@
+
 # If we are using an installable libltdl, then it needs to be built
 # before libgnash, as libgnash depends on it for extensions.
 pkglib_LTLIBRARIES =  $(LIBLTDLLIB) libgnashbase.la
@@ -164,4 +179,4 @@
        $(MAKE) CXXFLAGS="$(CXXFLAGS) -fmudflap" LDFLAGS="$(LDFLAGS) -lmudflap"
 
 clean-hook:
-       -rm -f core.* *.obj
+       -rm -f core.* *.obj sysgnashrc sysgnashpluginrc