diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | docs/gst/Makefile.am | 3 | ||||
| -rw-r--r-- | docs/libs/Makefile.am | 4 | ||||
| -rw-r--r-- | pkgconfig/Makefile.am | 4 |
4 files changed, 13 insertions, 4 deletions
@@ -1,3 +1,9 @@ +2004-04-19 David Schleef <ds@schleef.org> + + * docs/libs/Makefile.am: Change sinclude to include + * docs/gst/Makefile.am: same + * pkgconfig/Makefile.am: Remove GNU-ism from makefile target + 2004-04-19 Thomas Vander Stichele <thomas at apestaart dot org> * po/LINGUAS: diff --git a/docs/gst/Makefile.am b/docs/gst/Makefile.am index f55564208..99912278a 100644 --- a/docs/gst/Makefile.am +++ b/docs/gst/Makefile.am @@ -8,7 +8,7 @@ DOC_MODULE=gstreamer DOC=gstreamer FORMATS=html html: html-build.stamp -sinclude $(srcdir)/../upload.mak +include $(srcdir)/../upload.mak # generated basefiles #basefiles = \ @@ -311,6 +311,7 @@ uninstall-local: else install-data-local: uninstall-local: +all-local: endif # diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am index 62e570087..b373ef714 100644 --- a/docs/libs/Makefile.am +++ b/docs/libs/Makefile.am @@ -8,7 +8,7 @@ DOC_MODULE=gstreamer-libs DOC=gstreamer-libs FORMATS=html html: html-build.stamp -sinclude $(srcdir)/../upload.mak +include $(srcdir)/../upload.mak # generated basefiles #basefiles = \ @@ -186,6 +186,8 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) @echo '-- Fixing Crossreferences' LANG=C && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) touch html-build.stamp +else +all-local: endif clean-local: diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am index 3aa752eda..70bd96a63 100644 --- a/pkgconfig/Makefile.am +++ b/pkgconfig/Makefile.am @@ -10,9 +10,9 @@ pcfiles_uninstalled = \ all-local: $(pcfiles) $(pcfiles_uninstalled) ### how to generate pc files -$(pcfiles): %-@GST_MAJORMINOR@.pc: %.pc +%-@GST_MAJORMINOR@.pc: %.pc cp $< $@ -$(pcfiles_uninstalled): %-@GST_MAJORMINOR@-uninstalled.pc: %-uninstalled.pc +%-@GST_MAJORMINOR@-uninstalled.pc: %-uninstalled.pc cp $< $@ pkgconfigdir = $(libdir)/pkgconfig |