summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2003-11-24 08:53:29 +0000
committerDavid Schleef <ds@schleef.org>2003-11-24 08:53:29 +0000
commit8c2d7db76fec331c127fad635ba026e0422f333c (patch)
tree2427c98f3ed6bd34fb228e4470974ecab2f0ed86
parent5ffdd48422ea925d43bbafc969afafde089a0422 (diff)
downloadgstreamer-BRANCH-RELEASE-0_7_2.tar.gz
build patches merged from HEADBRANCH-RELEASE-0_7_2
Original commit message from CVS: build patches merged from HEAD
-rw-r--r--configure.ac3
-rw-r--r--docs/Makefile.am4
-rw-r--r--docs/gst/Makefile.am36
-rw-r--r--docs/libs/Makefile.am46
-rw-r--r--docs/manual/appendix-quotes.xml16
-rw-r--r--docs/manual/quotes.xml16
-rw-r--r--docs/manuals.mak2
-rw-r--r--po/Makefile.in.in2
-rw-r--r--tests/old/testsuite/debug/Makefile.am4
-rw-r--r--testsuite/debug/Makefile.am4
10 files changed, 118 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac
index 275c298a4c..8e39a6b6f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -635,10 +635,13 @@ examples/typefind/Makefile
examples/xml/Makefile
tools/Makefile
docs/Makefile
+docs/faq/Makefile
docs/gst/Makefile
docs/libs/Makefile
+docs/manual/Makefile
docs/plugins/Makefile
docs/plugins/gstreamer-plugins.types
+docs/pwg/Makefile
docs/xsl/Makefile
docs/version.entities
pkgconfig/Makefile
diff --git a/docs/Makefile.am b/docs/Makefile.am
index f883a3b3ff..9ff0084371 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -12,14 +12,14 @@ SUBDIRS_DOCS =
endif
SUBDIRS = $(SUBDIRS_DOCS) $(SUBDIRS_PLUGINS)
-DIST_SUBDIRS = gst libs plugins xsl
+DIST_SUBDIRS = gst faq manual pwg libs plugins xsl
EXTRA_DIST = \
slides manuals.mak htmlinstall.mak \
image-png image-pdf image-eps version.entities.in
upload:
- @for a in pwg; do cd $$a; make upload; cd ..; done
+ @for a in manual faq pwg; do cd $$a; make upload; cd ..; done
dist-hook:
$(RM) -rf $(distdir)/random/CVS
diff --git a/docs/gst/Makefile.am b/docs/gst/Makefile.am
index 22e9941102..b631a84222 100644
--- a/docs/gst/Makefile.am
+++ b/docs/gst/Makefile.am
@@ -214,22 +214,54 @@ distclean-local: clean
if DOC_HTML
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
- (installfiles=`echo $(srcdir)/html/*.html $(srcdir)/html/*.png`; \
- if test "$$installfiles" = '$(srcdir)/html/*.html'; \
+ (installfiles=`echo ./html/*.html`; \
+ if test "$$installfiles" = './html/*.html'; \
then echo '-- Nothing to install' ; \
else \
for i in $$installfiles; do \
echo '-- Installing '$$i ; \
$(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
done; \
+ pngfiles=`echo ./html/*.png`; \
+ if test "$$pngfiles" != './html/*.png'; then \
+ for i in $$pngfiles; do \
+ echo '-- Installing '$$i ; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
+ done; \
+ fi; \
echo '-- Installing $(srcdir)/html/$(DOC_MODULE).devhelp' ; \
$(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp \
$(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp; \
echo '-- Installing $(srcdir)/html/index.sgml' ; \
$(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
fi)
+uninstall-local:
+ (installfiles=`echo ./html/*.html`; \
+ if test "$$installfiles" = './html/*.html'; \
+ then echo '-- Nothing to uninstall' ; \
+ else \
+ for i in $$installfiles; do \
+ rmfile=`basename $$i` ; \
+ echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/'$$rmfile ; \
+ rm -f $(DESTDIR)$(TARGET_DIR)/$$rmfile; \
+ done; \
+ pngfiles=`echo ./html/*.png`; \
+ if test "$$pngfiles" != './html/*.png'; then \
+ for i in $$pngfiles; do \
+ rmfile=`basename $$i` ; \
+ echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/'$$rmfile ; \
+ rm -f $(DESTDIR)$(TARGET_DIR)/$$rmfile; \
+ done; \
+ fi; \
+ echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE).devhelp' ; \
+ rm -f $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp; \
+ echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/index.sgml' ; \
+ rm -f $(DESTDIR)$(TARGET_DIR)/index.sgml; \
+ fi)
+ rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(TARGET_DIR)
else
install-data-local:
+uninstall-local:
endif
#
diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am
index d412d80a22..e2101b6ef8 100644
--- a/docs/libs/Makefile.am
+++ b/docs/libs/Makefile.am
@@ -212,23 +212,55 @@ distclean-local: clean
if DOC_HTML
install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
- (installfiles=`echo $(srcdir)/html/*.html $(srcdir)/html/*.png`; \
- if test "$$installfiles" = '$(srcdir)/html/*.html'; \
+ $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
+ (installfiles=`echo ./html/*.html`; \
+ if test "$$installfiles" = './html/*.html'; \
then echo '-- Nothing to install' ; \
else \
for i in $$installfiles; do \
echo '-- Installing '$$i ; \
$(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
done; \
- echo '-- Installing $(srcdir)/html/$(DOC_MODULE).devhelp' ; \
- $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp \
- $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp; \
+ pngfiles=`echo ./html/*.png`; \
+ if test "$$pngfiles" != './html/*.png'; then \
+ for i in $$pngfiles; do \
+ echo '-- Installing '$$i ; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
+ done; \
+ fi; \
+ echo '-- Installing $(srcdir)/html/$(DOC_MODULE).devhelp' ; \
+ $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp \
+ $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp; \
echo '-- Installing $(srcdir)/html/index.sgml' ; \
$(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
- fi)
+ fi)
+uninstall-local:
+ (installfiles=`echo ./html/*.html`; \
+ if test "$$installfiles" = './html/*.html'; \
+ then echo '-- Nothing to uninstall' ; \
+ else \
+ for i in $$installfiles; do \
+ rmfile=`basename $$i` ; \
+ echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/'$$rmfile ; \
+ rm -f $(DESTDIR)$(TARGET_DIR)/$$rmfile; \
+ done; \
+ pngfiles=`echo ./html/*.png`; \
+ if test "$$pngfiles" != './html/*.png'; then \
+ for i in $$pngfiles; do \
+ rmfile=`basename $$i` ; \
+ echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/'$$rmfile ; \
+ rm -f $(DESTDIR)$(TARGET_DIR)/$$rmfile; \
+ done; \
+ fi; \
+ echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE).devhelp' ; \
+ rm -f $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp; \
+ echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/index.sgml' ; \
+ rm -f $(DESTDIR)$(TARGET_DIR)/index.sgml; \
+ fi)
+ rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(TARGET_DIR)
else
install-data-local:
+uninstall-local:
endif
#
diff --git a/docs/manual/appendix-quotes.xml b/docs/manual/appendix-quotes.xml
index cc88ad101d..30ad944316 100644
--- a/docs/manual/appendix-quotes.xml
+++ b/docs/manual/appendix-quotes.xml
@@ -12,6 +12,22 @@
<variablelist>
<varlistentry>
+ <term>23 Nov 2003</term>
+ <listitem>
+ <para>
+ <emphasis>Uraeus</emphasis>: ah yes, the sleeping part, my mind
+ is not multitasking so I was still thinking about exercise
+ </para>
+ <para>
+ <emphasis>dolphy</emphasis>: Uraeus: your mind is multitasking
+ </para>
+ <para>
+ <emphasis>dolphy</emphasis>: Uraeus: you just miss low latency patches
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>14 Sep 2002</term>
<listitem>
<para>
diff --git a/docs/manual/quotes.xml b/docs/manual/quotes.xml
index cc88ad101d..30ad944316 100644
--- a/docs/manual/quotes.xml
+++ b/docs/manual/quotes.xml
@@ -12,6 +12,22 @@
<variablelist>
<varlistentry>
+ <term>23 Nov 2003</term>
+ <listitem>
+ <para>
+ <emphasis>Uraeus</emphasis>: ah yes, the sleeping part, my mind
+ is not multitasking so I was still thinking about exercise
+ </para>
+ <para>
+ <emphasis>dolphy</emphasis>: Uraeus: your mind is multitasking
+ </para>
+ <para>
+ <emphasis>dolphy</emphasis>: Uraeus: you just miss low latency patches
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>14 Sep 2002</term>
<listitem>
<para>
diff --git a/docs/manuals.mak b/docs/manuals.mak
index 49afddb75a..7c12eb622c 100644
--- a/docs/manuals.mak
+++ b/docs/manuals.mak
@@ -119,7 +119,7 @@ $(DOC).pdf: $(DOC).ps
# @export LC_PAPER=$(PAPER_LOCALE) && xmlto pdf $(MAIN)
# @rm image.entities
-clean:
+clean-local:
-$(RM) -r $(BUILDDIR)
-$(RM) -r html
-$(RM) $(DOC).ps
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 80b7aa368e..343b743fe8 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -282,11 +282,11 @@ clean: mostlyclean
distclean: clean
rm -f Makefile Makefile.in POTFILES *.mo
+ rm -f stamp-po $(GMOFILES)
maintainer-clean: distclean
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
- rm -f stamp-po $(GMOFILES)
dist distdir:
$(MAKE) update-po
diff --git a/tests/old/testsuite/debug/Makefile.am b/tests/old/testsuite/debug/Makefile.am
index dfcfd02716..9c7397e0c3 100644
--- a/tests/old/testsuite/debug/Makefile.am
+++ b/tests/old/testsuite/debug/Makefile.am
@@ -1,5 +1,7 @@
include ../Rules
-tests_pass = commandline category global output
+tests_pass = commandline category output
tests_fail =
+tests_inconsistent = global
+
diff --git a/testsuite/debug/Makefile.am b/testsuite/debug/Makefile.am
index dfcfd02716..9c7397e0c3 100644
--- a/testsuite/debug/Makefile.am
+++ b/testsuite/debug/Makefile.am
@@ -1,5 +1,7 @@
include ../Rules
-tests_pass = commandline category global output
+tests_pass = commandline category output
tests_fail =
+tests_inconsistent = global
+