diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2005-05-02 11:47:17 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2005-05-02 11:47:17 +0000 |
| commit | d3f4ae10f2023b2b27cf80de482156065ddfee84 (patch) | |
| tree | 83953a11ebc603bcda1a7a8c63fb69823d375675 | |
| parent | 71359c38a02292d367620f153aa2d85465146d7e (diff) | |
possible fixes for automake-1.5
Original commit message from CVS:
possible fixes for automake-1.5
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | docs/faq/Makefile.am | 2 | ||||
| -rw-r--r-- | docs/manual/Makefile.am | 2 | ||||
| -rw-r--r-- | docs/manuals.mak | 6 | ||||
| -rw-r--r-- | docs/pwg/Makefile.am | 2 | ||||
| -rw-r--r-- | gst/Makefile.am | 4 |
6 files changed, 17 insertions, 8 deletions
@@ -1,3 +1,12 @@ +2005-05-02 Thomas Vander Stichele <thomas at apestaart dot org> + + * docs/faq/Makefile.am: + * docs/manual/Makefile.am: + * docs/manuals.mak: + * docs/pwg/Makefile.am: + * gst/Makefile.am: + possible fixes for automake-1.5 + 2005-04-28 Wim Taymans <wim@fluendo.com> * gst/base/gstbasesink.c: (gst_basesink_base_init), diff --git a/docs/faq/Makefile.am b/docs/faq/Makefile.am index 31427736b..57f095032 100644 --- a/docs/faq/Makefile.am +++ b/docs/faq/Makefile.am @@ -17,7 +17,7 @@ PNG_SRC = FIG_SRC = $(notdir $(wildcard $(srcdir)/*.fig)) # extra sources to copy in build directory -EXTRA_SOURCES = gst-uninstalled +EXTRA_SRC = gst-uninstalled ### this is the generic bit and you shouln't need to change this diff --git a/docs/manual/Makefile.am b/docs/manual/Makefile.am index 4a577eb03..8ee9e3003 100644 --- a/docs/manual/Makefile.am +++ b/docs/manual/Makefile.am @@ -17,7 +17,7 @@ PNG_SRC = FIG_SRC = $(notdir $(wildcard $(srcdir)/*.fig)) # extra sources to copy in build directory -EXTRA_SOURCES = +EXTRA_SRC = ### this is the generic bit and you shouln't need to change this diff --git a/docs/manuals.mak b/docs/manuals.mak index 14079302e..87a26fa0f 100644 --- a/docs/manuals.mak +++ b/docs/manuals.mak @@ -22,7 +22,7 @@ PNG_BUILT = $(foreach file, $(PNG), $(BUILDIMAGESDIR)/$(file)) EPS_BUILT = $(foreach file, $(EPS), $(BUILDIMAGESDIR)/$(file)) PDF_BUILT = $(foreach file, $(PDF), $(BUILDIMAGESDIR)/$(file)) -SRC = $(XML) $(PNG_SRC) $(FIG_SRC) $(CSS) $(EXTRA_SOURCES) +SRC = $(XML) $(PNG_SRC) $(FIG_SRC) $(CSS) $(EXTRA_SRC) # generate A4 docs PAPER_LOCALE = nl_NL @@ -79,9 +79,9 @@ debug: @echo "PDF_DAT: '$(PDF_DAT)'" # a rule to copy all of the source for docs into $(builddir)/build -$(BUILDDIR)/$(MAIN): $(XML) $(CSS) $(EXTRA_SOURCES) +$(BUILDDIR)/$(MAIN): $(XML) $(CSS) $(EXTRA_SRC) @-mkdir -p $(BUILDDIR) - @if test "x$(EXTRA_SOURCES)" != "x"; then for a in $(EXTRA_SOURCES); do cp $(srcdir)/$$a $(BUILDDIR); done; fi + @if test "x$(EXTRA_SRC)" != "x"; then for a in $(EXTRA_SRC); do cp $(srcdir)/$$a $(BUILDDIR); done; fi @for a in $(XML); do cp $(srcdir)/$$a $(BUILDDIR); done @for a in $(CSS); do cp $(srcdir)/$$a $(BUILDDIR); done @cp ../version.entities $(BUILDDIR) diff --git a/docs/pwg/Makefile.am b/docs/pwg/Makefile.am index 414f2dbd1..fa5e63bb2 100644 --- a/docs/pwg/Makefile.am +++ b/docs/pwg/Makefile.am @@ -17,7 +17,7 @@ PNG_SRC = FIG_SRC = $(notdir $(wildcard $(srcdir)/*.fig)) # extra sources to copy in build directory -EXTRA_SOURCES = +EXTRA_SRC = ### this is the generic bit and you shouln't need to change this diff --git a/gst/Makefile.am b/gst/Makefile.am index 6ed0414b1..dcb1315ab 100644 --- a/gst/Makefile.am +++ b/gst/Makefile.am @@ -12,7 +12,7 @@ endif if GST_DISABLE_PARSE GST_PARSE_SRC = GST_PARSE_DIRS = -GST_PARSE_LIBADD = +# GST_PARSE_LIBADD = else GST_PARSE_SRC = gstparse.c GST_PARSE_DIRS = parse @@ -28,7 +28,7 @@ endif if GST_DISABLE_REGISTRY GST_REGISTRY_SRC = GST_REGISTRY_DIRS = -GST_REGISTRY_LIBADD = +# GST_REGISTRY_LIBADD = else GST_REGISTRY_SRC = gstregistry.c GST_REGISTRY_DIRS = registries |