[Gnash-commit] gnash ./ChangeLog ./Makefile.am doc/C/Makefile....

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/04/03 04:26:06

Modified files:
        .              : ChangeLog Makefile.am 
        doc/C          : Makefile.am 
        plugin/mozilla-sdk: Makefile.am 

Log message:
        * gnash/Makefile.am: Move libamf to DIST_SUBDIRS, since it's not
        really used yet anyway. Tweak the path for building deb and rpm
        files.
        * doc/C/Makefile.am: Don't error out if Makeinfo has problems.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.197&tr2=1.198&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/Makefile.am.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/C/Makefile.am.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/mozilla-sdk/Makefile.am.diff?tr1=1.9&tr2=1.10&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.197 gnash/ChangeLog:1.198
--- gnash/ChangeLog:1.197       Sun Apr  2 22:55:29 2006
+++ gnash/ChangeLog     Mon Apr  3 04:26:06 2006
@@ -1,3 +1,10 @@
+2006-04-02  Rob Savoye  <address@hidden>
+
+       * gnash/Makefile.am: Move libamf to DIST_SUBDIRS, since it's not
+       really used yet anyway. Tweak the path for building deb and rpm
+       files.
+       * doc/C/Makefile.am: Don't error out if Makeinfo has problems.
+
 2006-04-02  Rob Savoye  <address@hidden>
 
        * doc/C/gnash-man.xml: Add the -x and -w options.
Index: gnash/Makefile.am
diff -u gnash/Makefile.am:1.17 gnash/Makefile.am:1.18
--- gnash/Makefile.am:1.17      Fri Mar 31 17:37:18 2006
+++ gnash/Makefile.am   Mon Apr  3 04:26:06 2006
@@ -40,12 +40,13 @@
 AUTOMAKE_OPTIONS = dejagnu
 ACLOCAL_AMFLAGS = -I macros
 
-STD_DIRS = libbase libgeometry server backend utilities plugin libamf
+STD_DIRS = libbase libgeometry server backend utilities plugin
 if DOCBOOK
 DOC_DIRS = doc
 endif
 SUBDIRS      = $(STD_DIRS) $(DOC_DIRS)
-DIST_SUBDIRS = $(STD_DIRS) doc testsuite
+# libamf isn't used yet, but we still want it in the distribution
+DIST_SUBDIRS = $(STD_DIRS) doc testsuite libamf
 
 #EXTRA_DIST = macros
 # if HTTP
@@ -57,16 +58,16 @@
 noinst_HEADERS = compatibility_include.h
 
 # Build an RPM package
-rpm redhat: dist-gzip $(srcdir)/rpm/gnash.spec
-       cp -f $(srcdir)/rpm/gnash.spec /usr/src/redhat/SPECS/
+rpm redhat: dist-gzip $(srcdir)/packaging/redhat/gnash.spec
+       cp -f $(srcdir)/packaging/redhat/gnash.spec /usr/src/redhat/SPECS/
        cp -f gnash-${VERSION}.tar.gz /usr/src/redhat/SOURCES/
        rpmbuild -ba /usr/src/redhat/SPECS/gnash.spec
 
 # Build a Debian GNU/Linux package
-deb debian: dist-bzip2 $(srcdir)/debian/rules
+deb debian: dist-bzip2 $(srcdir)/packaging/debian/rules
        rm -rf gnash-${VERSION}
        tar jxf gnash-${VERSION}.tar.bz2
-       cp -fr $(srcdir)/debian gnash-${VERSION}/
+       cp -fr $(srcdir)/packaging/debian gnash-${VERSION}/
        (cd gnash-${VERSION}; dpkg-buildpackage)
 
 mudflap:
Index: gnash/doc/C/Makefile.am
diff -u gnash/doc/C/Makefile.am:1.17 gnash/doc/C/Makefile.am:1.18
--- gnash/doc/C/Makefile.am:1.17        Sun Apr  2 21:45:55 2006
+++ gnash/doc/C/Makefile.am     Mon Apr  3 04:26:06 2006
@@ -143,7 +143,7 @@
 endif
 
 .texi.info:
-       $(MAKEINFO) --force $<
+       -$(MAKEINFO) --force $<
 
 gnash.1: gnash-man.xml
 if ENABLE_MAN
Index: gnash/plugin/mozilla-sdk/Makefile.am
diff -u gnash/plugin/mozilla-sdk/Makefile.am:1.9 
gnash/plugin/mozilla-sdk/Makefile.am:1.10
--- gnash/plugin/mozilla-sdk/Makefile.am:1.9    Fri Mar 31 17:37:18 2006
+++ gnash/plugin/mozilla-sdk/Makefile.am        Mon Apr  3 04:26:06 2006
@@ -31,26 +31,26 @@
 lib_LTLIBRARIES = libmozsdk.la
 
 noinst_HEADERS = npplat.h \
-        pluginbase.h           \
-         include/jri.h         \
-        include/npapi.h        \
-         include/npupp.h       \
-         include/prtypes.h     \
-         include/jni.h         \
-         include/jri_md.h      \
-         include/npruntime.h   \
-         include/jni_md.h      \
-         include/jritypes.h    \
-         include/nptypes.h     \
-         include/prcpucfg.h    \
-         include/prlock.h      \
-         include/prcvar.h      \
-         include/prthread.h    \
-         include/prinit.h      \
-         include/prerr.h       \
-         include/prerror.h     \
-         include/prinrval.h     \
-        include/prwin16.h      \
+        pluginbase.h \
+         include/jri.h \
+        include/npapi.h \
+         include/npupp.h \
+         include/prtypes.h \
+         include/jni.h \
+         include/jri_md.h \
+         include/npruntime.h \
+         include/jni_md.h \
+         include/jritypes.h \
+         include/nptypes.h \
+         include/prcpucfg.h \
+         include/prlock.h \
+         include/prcvar.h \
+         include/prthread.h \
+         include/prinit.h \
+         include/prerr.h \
+         include/prerror.h \
+         include/prinrval.h \
+        include/prwin16.h \
          include/obsolete/protypes.h 
 
 libmozsdk_la_SOURCES = \