[Gnash-commit] gnash testsuite/samples/Makefile.am doc/C/Makef...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    08/03/02 23:39:24

Modified files:
        testsuite/samples: Makefile.am 
        doc/C          : Makefile.am 
        .              : ChangeLog 

Log message:
                * testsuite/samples/Makefile.am: Add AGG_LIBS.
                * doc/C/Makefile.am: Tweak how images get installed so distcheck
                is happy.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/samples/Makefile.am?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/Makefile.am?cvsroot=gnash&r1=1.64&r2=1.65
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5777&r2=1.5778

Patches:
Index: testsuite/samples/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/samples/Makefile.am,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- testsuite/samples/Makefile.am       22 Jan 2008 17:05:11 -0000      1.24
+++ testsuite/samples/Makefile.am       2 Mar 2008 23:39:23 -0000       1.25
@@ -41,6 +41,7 @@
        $(top_builddir)/server/libgnashserver.la \
        $(top_builddir)/libbase/libgnashbase.la \
        $(top_builddir)/libamf/libgnashamf.la \
+       $(AGG_LIBS) \
        $(NULL)
 
 check_PROGRAMS = \

Index: doc/C/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/doc/C/Makefile.am,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- doc/C/Makefile.am   2 Mar 2008 20:06:35 -0000       1.64
+++ doc/C/Makefile.am   2 Mar 2008 23:39:24 -0000       1.65
@@ -74,6 +74,10 @@
 
 EXTRA_DIST = \
        preformatted \
+       usermanual \
+       refmanual \
+       $(COMMON) \
+       $(XML_MAIN) \
        $(dist_man_MANS) \
        $(MANSRC) \
        $(XML_MAIN:.xml=.html) \
@@ -91,7 +95,7 @@
 PDFS   = $(XML_MAIN:.xml=.pdf)
 TEXIS  = gnash_user.texi gnashuser.texi gnash_ref.texi gnashref.texi
 
-all-local: images info html man
+all-local: info html man
 
 gnashuser.html gnashuser.pdf gnash_user.info gnashuser.info: gnashuser.xml 
$(USERMAN)
 gnashref.html gnashref.pdf gnash_ref.info gnashref.info: gnashref.xml $(REFMAN)
@@ -99,11 +103,11 @@
 # Convienience rules for developers of these manuals. By default
 # all output formats are built if the Docbook tools are installed
 # and working correctly.
-html: images $(HTMLS)
-pdf:  images $(PDFS)
+html: $(HTMLS)
+pdf:  $(PDFS)
 man:  $(dist_man_MANS)
-info: images $(INFOS)
-texi: images $(TEXIS)
+info: $(INFOS)
+texi: $(TEXIS)
 
 #
 # Gnash uses suffix rules to build all the various supported
@@ -224,10 +228,10 @@
 
 # When we build in a seperate build tree, we need links to the images
 # subdirectory to have them be included in the final output.
-images:
-       @if test ! -d images; then \
-          $(LN_S) -f $(srcdir)/images images; \
-       fi
+# images:
+#      @if test ! -d images; then \
+#         $(LN_S) -f $(top_srcdir)/doc/C/images images; \
+#      fi
 
 lint-user:
        @xmllint $(srcdir)/gnashuser.xml
@@ -239,13 +243,13 @@
 # produced by the dist-bzip2, dist-gzip, or snapshot targets.
 # distdir is a built in target for Automake.
 dist-hook:
-       if test "image"; then \
-         $(mkinstalldirs) $(distdir)/image; \
-         for file in $(srcdir)/images/*.png; do \
-           basefile=`echo $$file | sed -e  's,^.*/,,'`; \
-           $(INSTALL_DATA) $$file $(distdir)/images/$$basefile; \
-         done \
-       fi
+       test -d "$(distdir)/images/images" || $(mkinstalldirs) 
"$(distdir)/images"
+       for file in $(srcdir)/images/*.png $(srcdir)/images/*.txt; do \
+         basefile="`basename $${file}`"; \
+         if test ! -e $(distdir)/images/$${basefile}; then \
+           $(INSTALL_DATA) $$file $(distdir)/images/; \
+         fi; \
+       done
 
 #
 # Installing documentation can be a complex process, as we build

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5777
retrieving revision 1.5778
diff -u -b -r1.5777 -r1.5778
--- ChangeLog   2 Mar 2008 20:02:42 -0000       1.5777
+++ ChangeLog   2 Mar 2008 23:39:24 -0000       1.5778
@@ -1,5 +1,9 @@
 2008-03-02  Rob Savoye  <address@hidden>
 
+       * testsuite/samples/Makefile.am: Add AGG_LIBS.
+       * doc/C/Makefile.am: Tweak how images get installed so distcheck
+       is happy.
+
        * po/fi.po: Finish translation by Timo Jyrinki.
        * po/Makefile.am: Build finish translation.
        
@@ -7,7 +11,8 @@
        * doc/C/Makefile.am: Furthur tweaking of the .xml.texi rule so it
        works with versions to correctly produce both info files. On
        Fedora, it kept only creating gnash_user.info. Fix install rule to
-       deal with multiple versions of install-info.
+       deal with multiple versions of install-info. Add --dir-file= when
+       removing entries.
 
        * doc/C/refmanual/internals.xml: Use <emphasis> instead of <code>,
        as <code> doesn't appear to be supported on Fedora.