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

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    08/01/17 00:18:51

Modified files:
        .              : Makefile.am configure.ac ChangeLog 
        plugin         : Makefile.am 
        plugin/klash   : Makefile.am 

Log message:
                * configure.ac: Don't use AX_GCC_ARCHFLAG anymore.
                * Makefile.am: Make a seperate install-plugins target. Build all
                extensions, guis, and cygnal for distcheck. Fix ipkg
                packaging. Add OpenBSD packaging.
                * plugin/Makefile.am: Make seperate install-plugin and
                install-plugins targets.
                * plugin/klash/Makefile.am: Make install-plugin target with
                install-plugins alias.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.100&r2=1.101
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.472&r2=1.473
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5419&r2=1.5420
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/Makefile.am?cvsroot=gnash&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/Makefile.am?cvsroot=gnash&r1=1.41&r2=1.42

Patches:
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- Makefile.am 9 Jan 2008 20:06:01 -0000       1.100
+++ Makefile.am 17 Jan 2008 00:18:50 -0000      1.101
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # 
 
-# $Id: Makefile.am,v 1.100 2008/01/09 20:06:01 bwy Exp $
+# $Id: Makefile.am,v 1.101 2008/01/17 00:18:50 rsavoye Exp $
 
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS = 1.6.0
@@ -31,12 +31,17 @@
 ## permission problems and unexpected unistalls
 ## from home dir. Ideally we should put them somewhere
 ## under ${prefix} to make the uninstall check effective
-## (and I belive it should actually be the default when
+## (and I believe it should actually be the default when
 ## --prefix is given, but that's another story --strk)
 ##
+## We also want to build everything possible, since we're
+## testing builds.
 DISTCHECK_CONFIGURE_FLAGS = \
-       --with-kde-pluginprefix=/tmp/gnash-distcheck/kparts \
-       --with-plugindir=/tmp/gnash-distcheck/npapi 
+       --with-kde-pluginprefix=/tmp/gnash-distcheck-$$/kparts \
+       --with-plugindir=/tmp/gnash-distcheck-$$/npapi \
+       --enable-extensions=all \
+       --enable-gui=all \
+       --enable-cygnal
 
 STD_DIRS = \
        libbase \
@@ -95,8 +100,10 @@
        cp -fr $(srcdir)/packaging/debian gnash-${VERSION}/
        (cd gnash-${VERSION}; dpkg-buildpackage)
 
+#
 # Build a Debian Familiar .ipk GNU/Linux package. These are always
 # cross compiled, typically for the ARM or XScale.
+#
 
 # this is where the output of "make install" goes, which is what
 # we use to build the package.
@@ -132,11 +139,18 @@
 
 ipkg-install: ipkg-build Makefile
        address@hidden -f ipkg-install
-       @echo "FIXME:   $@"
        $(MAKE) -C $(IPKG_BUILD) install DESTDIR=$(IPKG_TMP)
        @touch ipkg-install
 
-ipk ipkg: ipkg-install
+ipkg-depend: 
+       address@hidden -f ipkg-depend
+       rsync -avc $(libdir)/libcurl* $(IPKG_TMP)/usr/lib
+       rsync -avc $(libdir)/libagg* $(IPKG_TMP)/usr/lib
+       rsync -avc $(libdir)/libboost_thread* $(IPKG_TMP)/usr/lib
+       rsync -avc $(libdir)/libboost_serialization* $(IPKG_TMP)/usr/lib
+       @touch ipkg-depend
+
+ipk ipkg ipkg-bundle: ipkg-install # ipkg-depend
        if ! test -d $(IPKG_TMP)/CONTROL ; then \
          mkdir $(IPKG_TMP)/CONTROL; \
        fi
@@ -150,7 +164,19 @@
        ipkg-build $(IPKG_TMP)
 
 ipkg-clean:
-       rm -fr ipkg-* $(IPKG_BUILD)
+       rm -fr ipkg-* $(IPKG_BUILD) $(IPKG_TMP) gnash*$(VERSION)*.ipk
+
+#
+# OpenBSD package building
+#
+
+bsd-pkg:
+       $(MAKE) checksum
+       $(MAKE) extract
+       $(MAKE) build
+       $(MAKE) fake
+       $(MAKE) plist
+       $(MAKE) package
 
 # build a snapshot
 snapshot: distdir
@@ -300,10 +326,6 @@
        @echo " AGG_CFLAGS is $(AGG_CFLAGS)"
        @echo " AGG_LIBS is $(AGG_LIBS)"
 endif
-if BUILD_ALP_GUI
-        @echo " ALP_CFLAGS is $(ALP_CFLAGS)"
-        @echo " ALP_LIBS is $(ALP_LIBS)"
-endif
        @echo ""
        @echo "A blank value for CFLAGS means the header is installed in the"
        @echo "default system header location. All the LIBS should have a"
@@ -342,6 +364,12 @@
        @echo " Supported GUI: FB"
 endif
 
+       @if test -n "$(EXTENSIONS_LIST)" ; then \
+         echo "        Extensions added are: $(EXTENSIONS_LIST)"; \
+       fi
+       @if test -n "$(SECURITY_LIST)" ; then \
+         echo "        Security features enables are: $(SECURITY_LIST)"; \
+       fi
 if KPARTS
        @echo " KPARTS (KDE) plugin enabled"
        @echo "   KPARTS plugin install dir: $(KDE_PLUGINDIR)"
@@ -358,14 +386,13 @@
 else
        @echo " NPAPI (Mozilla) plugin disabled"
 endif
-       @if test -n "$(EXTENSIONS_LIST)" ; then \
-         echo "        Extensions added are: $(EXTENSIONS_LIST)"; \
-       fi
 
 check: check-recursive anal
 
 anal testreport checksum:
        $(srcdir)/testsuite/anaylse-results.sh
 
-.PHONY : dumpconfig anal testreport checksum check mudflap mudflap-check 
snapshot deb debian rpm redhat ipkg ipk
+.PHONY : dumpconfig anal testreport checksum check mudflap mudflap-check 
snapshot deb debian rpm redhat ipkg ipk ipkg-bundle alp alp-bundle alp-ip 
install-plugins install-plugin
 
+install-plugins install-plugin:
+       $(MAKE) -C plugin $@

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.472
retrieving revision 1.473
diff -u -b -r1.472 -r1.473
--- configure.ac        16 Jan 2008 15:11:01 -0000      1.472
+++ configure.ac        17 Jan 2008 00:18:50 -0000      1.473
@@ -1,4 +1,4 @@
-hednl  
+dnl  
 dnl    Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 dnl  
 dnl  This program is free software; you can redistribute it and/or modify
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.472 2008/01/16 15:11:01 strk Exp $
+dnl $Id: configure.ac,v 1.473 2008/01/17 00:18:50 rsavoye Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -240,7 +240,7 @@
 fi
 
 AC_ARG_WITH(shm,
-  AC_HELP_STRING([--with-shm],[specify a cpu when cross compiling.]),
+  AC_HELP_STRING([--with-shm],[specify a shared memory type.]),
   [case "${withval}" in
     sysv) with_shm=sysv
           ;;
@@ -883,6 +883,7 @@
 AC_PATH_PROG(PYTHON, python, ,[${pathlist}])
 AM_CONDITIONAL([ENABLE_GNASH_PYTHON_MODULE], false)
 
+AC_PATH_PROG(MKINSTALLDIRS, mkinstalldirs, ,[${pathlist}])
 
 dnl Look for scratchbox
 sbox=no
@@ -1656,7 +1657,7 @@
 fi
 
 GNASH_PATH_BOOST
-AX_GCC_ARCHFLAG(no)
+dnl AX_GCC_ARCHFLAG(no)
 
 AC_ARG_ENABLE([strict],
   AC_HELP_STRING([--enable-strict],[Accept only standards compliant code (GCC 
only)]),

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5419
retrieving revision 1.5420
diff -u -b -r1.5419 -r1.5420
--- ChangeLog   16 Jan 2008 20:15:40 -0000      1.5419
+++ ChangeLog   17 Jan 2008 00:18:50 -0000      1.5420
@@ -1,3 +1,14 @@
+2008-01-16  Rob Savoye  <address@hidden>
+
+       * configure.ac: Don't use AX_GCC_ARCHFLAG anymore.
+       * Makefile.am: Make a seperate install-plugins target. Build all
+       extensions, guis, and cygnal for distcheck. Fix ipkg
+       packaging. Add OpenBSD packaging.
+       * plugin/Makefile.am: Make seperate install-plugin and
+       install-plugins targets.
+       * plugin/klash/Makefile.am: Make install-plugin target with
+       install-plugins alias.
+
 2008-01-16 Sandro Santilli <address@hidden>
 
        * testsuite/actionscript.all/check.as: add a MING_LOGICAL_ANDOR_BROKEN

Index: plugin/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/Makefile.am,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- plugin/Makefile.am  16 Jan 2008 00:42:55 -0000      1.66
+++ plugin/Makefile.am  17 Jan 2008 00:18:51 -0000      1.67
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.66 2008/01/16 00:42:55 rsavoye Exp $
+# $Id: Makefile.am,v 1.67 2008/01/17 00:18:51 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -93,6 +93,14 @@
 endif
 endif
 
+test_perms:
+       @if test ! -w $(DESTDIR)$(plugindir); then \
+         echo "WARNING: Improper permissions for $(DESTDIR)$(plugindir)!"; \
+         echo "You probably need to be root"; \
+         echo "Or configure with --with-plugindir= set to a writable 
directory"; \
+       exit 1; \
+       fi
+
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
        @echo "Nothing to install here now."
        @echo "Use \"make install-plugin\" to install the Firefox plugin to 
$(DESTDIR)$(plugindir)."
@@ -106,6 +114,10 @@
          cp -f libgnashplugin.so $(DESTDIR)$(plugindir)/libgnashplugin.so; \
        fi
 
+install-plugins: install-plugin
+       $(MAKE) -C klash install-plugins
+
 uninstall-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
        $(RM) -f $(DESTDIR)$(plugindir)/libgnashplugin.so
 
+.PHONY : install-plugins install-plugin test_perms

Index: plugin/klash/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/Makefile.am,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- plugin/klash/Makefile.am    5 Jan 2008 01:04:11 -0000       1.41
+++ plugin/klash/Makefile.am    17 Jan 2008 00:18:51 -0000      1.42
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.41 2008/01/05 01:04:11 strk Exp $
+# $Id: Makefile.am,v 1.42 2008/01/17 00:18:51 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -64,15 +64,39 @@
 #      test -d $(DESTDIR)$(kde_servicesdir) || $(mkinstalldirs) 
$(DESTDIR)$(kde_servicesdir)
 #      $(INSTALL) $(dist_kde_services_DATA) $(DESTDIR)$(kde_servicesdir)
 # 
-# install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-#      test -d $(DESTDIR)$(plugindir) || $(mkinstalldirs) 
$(DESTDIR)$(plugindir)
-#      $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) 
$(plugin_LTLIBRARIES) $(DESTDIR)$(plugindir)
-# 
-# uninstall-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-#      $(RM) -f $(DESTDIR)$(plugindir)/libklashpart.so
-#      $(RM) -f $(DESTDIR)$(plugindir)/libklashpart.la
-#      $(RM) -f $(DESTDIR)$(plugindir)/libklashpart.a
+test_perms:
+       @if test ! -w $(DESTDIR)$(kde_appsdatadir) -o ! -w 
$(DESTDIR)$(kde_servicesdir); then \
+         echo "WARNING: Improper permissions for $(DESTDIR)$(kde_appsdatadir) 
and $(DESTDIR)$(kde_servicesdir)!"; \
+         echo "You probably need to be root"; \
+         echo "Or configure with --with-kde-pluginprefix= set to a writable 
directory"; \
+       exit 1; \
+       fi
+
+install-data-am: $(dist_kde_services_DATA)
+       @echo "No data to install now."
+
+install-plugin-data:
+       test -d $(DESTDIR)$(kde_servicesdir) || $(mkinstalldirs) 
$(DESTDIR)$(kde_servicesdir)
+       if test 
+       $(INSTALL) $(dist_kde_services_DATA) $(DESTDIR)$(kde_servicesdir)
+
+install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
+       @echo "Nothing to install here now."
+       @echo "Use \"make install-plugin\" to install the KDE plugin to 
$(DESTDIR)$(plugindir)."
+
+install-plugin install-plugins: test_perms $(plugin_LTLIBRARIES) 
$(dist_kde_services_DATA) \
+       install-dist_kde_appsdataDATA install-dist_kde_rcDATA \
+       install-dist_kde_servicesDATA
+       test -d $(DESTDIR)$(plugindir) || $(mkinstalldirs) 
$(DESTDIR)$(plugindir)
+       $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) 
$(plugin_LTLIBRARIES) $(DESTDIR)$(plugindir)
+
+uninstall-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
+       $(RM) -f $(DESTDIR)$(plugindir)/libklashpart.so
+       $(RM) -f $(DESTDIR)$(plugindir)/libklashpart.la
+       $(RM) -f $(DESTDIR)$(plugindir)/libklashpart.a
 
 endif
 
 force:
+
+.PHONY : install-plugins install-plugin test_perms