build patches merged from HEAD

Original commit message from CVS:
build patches merged from HEAD
This commit is contained in:
David Schleef 2003-11-24 08:53:29 +00:00
parent 5ffdd48422
commit 8c2d7db76f
10 changed files with 118 additions and 15 deletions

View file

@ -635,10 +635,13 @@ examples/typefind/Makefile
examples/xml/Makefile examples/xml/Makefile
tools/Makefile tools/Makefile
docs/Makefile docs/Makefile
docs/faq/Makefile
docs/gst/Makefile docs/gst/Makefile
docs/libs/Makefile docs/libs/Makefile
docs/manual/Makefile
docs/plugins/Makefile docs/plugins/Makefile
docs/plugins/gstreamer-plugins.types docs/plugins/gstreamer-plugins.types
docs/pwg/Makefile
docs/xsl/Makefile docs/xsl/Makefile
docs/version.entities docs/version.entities
pkgconfig/Makefile pkgconfig/Makefile

View file

@ -12,14 +12,14 @@ SUBDIRS_DOCS =
endif endif
SUBDIRS = $(SUBDIRS_DOCS) $(SUBDIRS_PLUGINS) SUBDIRS = $(SUBDIRS_DOCS) $(SUBDIRS_PLUGINS)
DIST_SUBDIRS = gst libs plugins xsl DIST_SUBDIRS = gst faq manual pwg libs plugins xsl
EXTRA_DIST = \ EXTRA_DIST = \
slides manuals.mak htmlinstall.mak \ slides manuals.mak htmlinstall.mak \
image-png image-pdf image-eps version.entities.in image-png image-pdf image-eps version.entities.in
upload: 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: dist-hook:
$(RM) -rf $(distdir)/random/CVS $(RM) -rf $(distdir)/random/CVS

View file

@ -214,22 +214,54 @@ distclean-local: clean
if DOC_HTML if DOC_HTML
install-data-local: install-data-local:
$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR) $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
(installfiles=`echo $(srcdir)/html/*.html $(srcdir)/html/*.png`; \ (installfiles=`echo ./html/*.html`; \
if test "$$installfiles" = '$(srcdir)/html/*.html'; \ if test "$$installfiles" = './html/*.html'; \
then echo '-- Nothing to install' ; \ then echo '-- Nothing to install' ; \
else \ else \
for i in $$installfiles; do \ for i in $$installfiles; do \
echo '-- Installing '$$i ; \ echo '-- Installing '$$i ; \
$(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
done; \ 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' ; \ echo '-- Installing $(srcdir)/html/$(DOC_MODULE).devhelp' ; \
$(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp \ $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp \
$(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp; \ $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp; \
echo '-- Installing $(srcdir)/html/index.sgml' ; \ echo '-- Installing $(srcdir)/html/index.sgml' ; \
$(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \ $(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 else
install-data-local: install-data-local:
uninstall-local:
endif endif
# #

View file

@ -213,22 +213,54 @@ distclean-local: clean
if DOC_HTML if DOC_HTML
install-data-local: install-data-local:
$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR) $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
(installfiles=`echo $(srcdir)/html/*.html $(srcdir)/html/*.png`; \ (installfiles=`echo ./html/*.html`; \
if test "$$installfiles" = '$(srcdir)/html/*.html'; \ if test "$$installfiles" = './html/*.html'; \
then echo '-- Nothing to install' ; \ then echo '-- Nothing to install' ; \
else \ else \
for i in $$installfiles; do \ for i in $$installfiles; do \
echo '-- Installing '$$i ; \ echo '-- Installing '$$i ; \
$(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
done; \ done; \
echo '-- Installing $(srcdir)/html/$(DOC_MODULE).devhelp' ; \ pngfiles=`echo ./html/*.png`; \
$(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp \ if test "$$pngfiles" != './html/*.png'; then \
$(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp; \ 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' ; \ echo '-- Installing $(srcdir)/html/index.sgml' ; \
$(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \ $(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 else
install-data-local: install-data-local:
uninstall-local:
endif endif
# #

View file

@ -11,6 +11,22 @@
</para> </para>
<variablelist> <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> <varlistentry>
<term>14 Sep 2002</term> <term>14 Sep 2002</term>
<listitem> <listitem>

View file

@ -11,6 +11,22 @@
</para> </para>
<variablelist> <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> <varlistentry>
<term>14 Sep 2002</term> <term>14 Sep 2002</term>
<listitem> <listitem>

View file

@ -119,7 +119,7 @@ $(DOC).pdf: $(DOC).ps
# @export LC_PAPER=$(PAPER_LOCALE) && xmlto pdf $(MAIN) # @export LC_PAPER=$(PAPER_LOCALE) && xmlto pdf $(MAIN)
# @rm image.entities # @rm image.entities
clean: clean-local:
-$(RM) -r $(BUILDDIR) -$(RM) -r $(BUILDDIR)
-$(RM) -r html -$(RM) -r html
-$(RM) $(DOC).ps -$(RM) $(DOC).ps

View file

@ -282,11 +282,11 @@ clean: mostlyclean
distclean: clean distclean: clean
rm -f Makefile Makefile.in POTFILES *.mo rm -f Makefile Makefile.in POTFILES *.mo
rm -f stamp-po $(GMOFILES)
maintainer-clean: distclean maintainer-clean: distclean
@echo "This command is intended for maintainers to use;" @echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild." @echo "it deletes files that may require special tools to rebuild."
rm -f stamp-po $(GMOFILES)
dist distdir: dist distdir:
$(MAKE) update-po $(MAKE) update-po

View file

@ -1,5 +1,7 @@
include ../Rules include ../Rules
tests_pass = commandline category global output tests_pass = commandline category output
tests_fail = tests_fail =
tests_inconsistent = global

View file

@ -1,5 +1,7 @@
include ../Rules include ../Rules
tests_pass = commandline category global output tests_pass = commandline category output
tests_fail = tests_fail =
tests_inconsistent = global