Fix a bug in manual/Makefile.am: bad shell script for make disting .ps files. Coupl...

Original commit message from CVS:
Fix a bug in manual/Makefile.am: bad shell script for make disting .ps
files.   Couple of final fixes to libs/Makefile.am, too.
Add a few things to cvsignores.

diff --git a/docs/libs/.gitignore b/docs/libs/.gitignore
index b5548ac..fce9342 100644 (file)
--- a/docs/libs/.gitignore
+++ b/docs/libs/.gitignore
@@ -1,5 +1,6 @@
 Makefile
 Makefile.in
+tmpl
 html
 sgml
 gstreamer-libs-unused.txt

diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am
index 8c20dae..0e4ba25 100644 (file)
--- a/docs/libs/Makefile.am
+++ b/docs/libs/Makefile.am
@@ -36,12 +36,14 @@ tmpl/$(DOC_MODULE)-unused.sgml: $(DOC_MODULE)-decl.txt $(DOC_MODULE)-sections.tx
 sgml/$(DOC_MODULE)-doc.bottom: tmpl/$(DOC_MODULE)-unused.sgml
        gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)
 
+all-local: html
+
 clean-local:
        $(RM) -rf *~ *.bak *.signals *-unused.txt *.args tmpl html sgml tmpl/*.bak $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt 
 
 install-data-local: html
-       $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
-       (installfiles=`echo $(srcdir)/html/*.html`; \
+       @$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
+       @(installfiles=`echo $(srcdir)/html/*.html`; \
        if test "$$installfiles" = '$(srcdir)/html/*.html'; \
        then echo '-- Nothing to install' ; \
        else \
@@ -55,13 +57,12 @@ install-data-local: html
          gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)|| true; \
        fi)
 
+uninstall-local: html
+       @echo '-- Uninstalling '$(DESTDIR)$(TARGET_DIR) ; \
+       $(RM) -rf $(DESTDIR)$(TARGET_DIR)
+
 dist-hook: html
        mkdir $(distdir)/html
-       mkdir $(distdir)/sgml
-       mkdir $(distdir)/tmpl
        -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
-       -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-       -cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
-       -cp $(srcdir)/sgml/*.bottom $(srcdir)/sgml/*.top $(distdir)/sgml
 
 .PHONY : html

diff --git a/docs/manual/.gitignore b/docs/manual/.gitignore
index 1b70be8..dfe4b75 100644 (file)
--- a/docs/manual/.gitignore
+++ b/docs/manual/.gitignore
@@ -2,6 +2,7 @@ Makefile
 Makefile.in
 *.bak
 .deps
+images
 gstreamer-manual
 gstreamer-manual.pdf
 gstreamer-manual.ps

diff --git a/docs/manual/Makefile.am b/docs/manual/Makefile.am
index 31f548a..b8a17f2 100644 (file)
--- a/docs/manual/Makefile.am
+++ b/docs/manual/Makefile.am
@@ -112,7 +112,7 @@ pdfdist: pdfdocs
 
 psdocs: $(PSFILES)
 psdist: psdocs
-       @for a $(PSFILES) ; do \
+       @for a in $(PSFILES) ; do \
        if [ -r $$a ] ; then \
            echo "Adding $$a to distribution" ; \
            cp -a $$a $(distdir)/ ; \