docs/libs/Makefile.am: Change sinclude to include
Original commit message from CVS:
* docs/libs/Makefile.am: Change sinclude to include
* docs/gst/Makefile.am: same
* pkgconfig/Makefile.am: Remove GNU-ism from makefile target
diff --git a/ChangeLog b/ChangeLog
index 345fa6d..d4e4383 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 f555642..9991227 100644
--- a/docs/gst/Makefile.am
+++ b/docs/gst/Makefile.am
@@ -8,7 +8,7 @@
DOC=gstreamer
FORMATS=html
html: html-build.stamp
-sinclude $(srcdir)/../upload.mak
+include $(srcdir)/../upload.mak
# generated basefiles
#basefiles = \
@@ -311,6 +311,7 @@
else
install-data-local:
uninstall-local:
+all-local:
endif
#
diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am
index 62e5700..b373ef7 100644
--- a/docs/libs/Makefile.am
+++ b/docs/libs/Makefile.am
@@ -8,7 +8,7 @@
DOC=gstreamer-libs
FORMATS=html
html: html-build.stamp
-sinclude $(srcdir)/../upload.mak
+include $(srcdir)/../upload.mak
# generated basefiles
#basefiles = \
@@ -186,6 +186,8 @@
@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 3aa752e..70bd96a 100644
--- a/pkgconfig/Makefile.am
+++ b/pkgconfig/Makefile.am
@@ -10,9 +10,9 @@
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