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

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/02/04 19:57:37

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

Log message:
        * Makefile.am: Rearrange variable definitions so the diit and
        distcheck Makefile targets actually work. Add DIST directories so
        everything makes it into the tarball.
        * doc/C/Makefile.am: Define XML_FILES for all the other xml doc
        files. Add DESTDIR to the install path. Rearrange variable
        definitions so the distcheck Makefile target actually works.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.87&tr2=1.88&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/Makefile.am.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/C/Makefile.am.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.87 gnash/ChangeLog:1.88
--- gnash/ChangeLog:1.87        Sat Feb  4 16:56:55 2006
+++ gnash/ChangeLog     Sat Feb  4 19:57:37 2006
@@ -1,3 +1,12 @@
+2006-02-04  Rob Savoye  <address@hidden>
+
+       * Makefile.am: Rearrange variable definitions so the diit and
+       distcheck Makefile targets actually work. Add DIST directories so
+       everything makes it into the tarball.
+       * doc/C/Makefile.am: Define XML_FILES for all the other xml doc
+       files. Add DESTDIR to the install path. Rearrange variable
+       definitions so the distcheck Makefile target actually works. 
+
 2006-02-04  John Gilmore  <address@hidden>
 
        * backend/gnash.cpp:  Set window title to "gnash: " and movie name.
Index: gnash/Makefile.am
diff -u gnash/Makefile.am:1.9 gnash/Makefile.am:1.10
--- gnash/Makefile.am:1.9       Fri Feb  3 18:16:33 2006
+++ gnash/Makefile.am   Sat Feb  4 19:57:37 2006
@@ -14,13 +14,15 @@
 ACLOCAL_AMFLAGS = -I macros
 
 STD_DIRS = libbase libgeometry server backend utilities
-DIST_SUBDIRS = doc
 if PLUGIN
-SUBDIRS = $(STD_DIRS) plugin
-else
-SUBDIRS = $(STD_DIRS)
+PLUG_DIR = $(STD_DIRS) plugin
 endif
-
+if DOCBOOK
+DOC_DIRS += $(STD_DIRS) doc
+endif
+SUBDIRS = $(STD_DIRS) $(PLUG_DIR)
+DIST_SUBDIRS = $(STD_DIRS)  $(PLUG_DIR) $(DOC_DIRS) testsuite
+EXTRA_DIST = macros
 # if HTTP
 # SUBDIRS += net $(STD_DIRS)
 # else
@@ -29,12 +31,6 @@
 
 noinst_HEADERS = compatibility_include.h
 
-install-doc:
-       @cd doc/C ; $(MAKE) install-doc
-
-doc:
-       @cd doc/C ; $(MAKE) alldocs
-
 # Build an RPM package
 rpm redhat: dist-gzip $(srcdir)/rpm/gnash.spec
        cp -f $(srcdir)/rpm/gnash.spec /usr/src/redhat/SPECS/
Index: gnash/doc/C/Makefile.am
diff -u gnash/doc/C/Makefile.am:1.6 gnash/doc/C/Makefile.am:1.7
--- gnash/doc/C/Makefile.am:1.6 Mon Jan 30 18:55:09 2006
+++ gnash/doc/C/Makefile.am     Sat Feb  4 19:57:37 2006
@@ -21,31 +21,81 @@
 include $(top_srcdir)/doc/xmldocs.make
 
 STYLESDIR = @docbook_styles@
-EXTRA_DIST += \
-       gnash.html \
-       gnash.pdf \
-       gnash.1
 
 figdir = images
 docname = gnash
 lang = C
 omffile = gnash.omf
 entities = legal.xml
-all:
-       @echo "Nothing to do in doc/C for target all"
 
-alldocs: html pdf man info
+# additional documentation files
+docudir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+imagesdir = $(docudir)/$(figdir)
+# dist_docu_DATA = gnash.html 
+dist_man_MANS = gnash.1
+
+noinst_SCRIPTS = gen-doc.sh
 
 html: gnash.html
 pdf:  gnash.pdf
 man:  gnash.1
 texi: gnash.texi
 info: gnash.info
-gnash.pdf gnash.html gnash.texi gnash.info gnash.1: gnash.xml
+gnash.pdf gnash.html gnash.texi gnash.info: \
+       gnash.xml       \
+       sources.xml     \
+       internals.xml   \
+       $(XML_FILES)
 
 SUFFIXES = .xml .html .texi .pdf .info .1
 
-gnash.xml: sources.xml internals.xml
+gnash.xml: 
+XML_FILES = \
+       accessibility.xml       \
+       appendix.xml            \
+       array.xml               \
+       boolean.xml             \
+       button.xml              \
+       camera.xml              \
+       color.xml               \
+       contextmenu.xml         \
+       customactions.xml       \
+       date.xml                \
+       error.xml               \
+       function.xml            \
+       key.xml                 \
+       legal.xml               \
+       loadvars.xml            \
+       localconnection.xml     \
+       math.xml                \
+       microphone.xml          \
+       mouse.xml               \
+       movieclip.xml           \
+       moviecliploader.xml     \
+       netconnection.xml       \
+       netstream.xml           \
+       number.xml              \
+       object.xml              \
+       selection.xml           \
+       sharedobject.xml        \
+       sound.xml               \
+       sources.xml             \
+       stage.xml               \
+       string.xml              \
+       system.xml              \
+       textfield.xml           \
+       textformat.xml          \
+       textsnapshot.xml        \
+       video.xml               \
+       xml.xml                 \
+       xmlsocket.xml
+
+EXTRA_DIST += $(XML_FILES)     \
+       $(noinst_SCRIPTS)       \
+       gnash-man.xml           \
+       gnash.html              \
+       gnash.pdf               \
+       gnash.1
 
 .xml.html:
        @echo "Making HTML from XML source..."
@@ -80,6 +130,8 @@
        fi
        address@hidden(RM) gnash.texi
 
+alldocs: html pdf man info
+
 dist-hook: app-dist-hook
 
 lint:
@@ -110,21 +162,19 @@
        fi
        address@hidden(RM) gnash.mxml
 
-
-# FIXME: install man page
-install-data-hook: install-data-hook-omf gnash.html gnash.pdf
+#$(INSTALL_DATA) gnash.html $(DESTDIR)$(datadir)/doc/$(PACKAGE)-$(VERSION);
+#$(INSTALL_DATA) gnash.pdf  $(DESTDIR)$(datadir)/doc/$(PACKAGE)-$(VERSION);
+install-data-hook: install-data-hook-omf
        @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(datadir)/doc/$(PACKAGE)-$(VERSION)/images;
-       $(INSTALL_DATA) gnash.html 
$(DESTDIR)$(datadir)/doc/$(PACKAGE)-$(VERSION);
-       $(INSTALL_DATA) gnash.pdf  
$(DESTDIR)$(datadir)/doc/$(PACKAGE)-$(VERSION);
+       test -z "$(imagesdir)" || $(mkdir_p) "$(DESTDIR)$(imagesdir)"
        for png in $(srcdir)/images/*.png; do \
            if test -f $$png; then \
-             $(INSTALL_DATA) $$png 
$(DESTDIR)$(datadir)/doc/$(PACKAGE)-$(VERSION)/images; \
+             $(INSTALL_DATA) $$png $(DESTDIR)$(imagedir)/; \
            fi \
          done
 
-uninstall-hook: 
-       -rm -fr $(DESTDIR)$(datadir)/doc/$(PACKAGE)-$(VERSION)
+uninstall-hook:
+       $(DESTDIR)$(imagesdir)/*.png
 
 # install GNOME help files, which are basically the html output
 # install-ghelp: gnash.html
@@ -134,6 +184,3 @@
 
 #      $(INSTALL_DATA) $(srcdir)/images/*.png $(gnash_helpdir)/images
 
-install-doc:
-
-