From 5c82e0091e3281ef5c6a45f2ee1a8d6c6baf5c1c Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Fri, 22 Apr 2011 16:48:41 -0400 Subject: [PATCH] make: remove non-sense setup.stamp and use setup-build.stamp Nothing would ever generate setup.stamp --- gtk-doc.make | 8 ++------ gtk-doc.notmpl.make | 8 ++------ tests/gtk-doc.make | 9 ++------- tests/gtk-doc.notmpl.make | 8 ++------ 4 files changed, 8 insertions(+), 25 deletions(-) diff --git a/gtk-doc.make b/gtk-doc.make index 074dba8..07971c3 100644 --- a/gtk-doc.make +++ b/gtk-doc.make @@ -35,7 +35,7 @@ EXTRA_DIST = \ DOC_STAMPS=setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ html-build.stamp pdf-build.stamp \ - setup.stamp tmpl.stamp sgml.stamp html.stamp pdf.stamp + tmpl.stamp sgml.stamp html.stamp pdf.stamp SCANOBJ_FILES = \ $(DOC_MODULE).args \ @@ -90,10 +90,6 @@ setup-build.stamp: @touch setup-build.stamp -setup.stamp: setup-build.stamp - @true - - #### scan #### scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) @@ -126,7 +122,7 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE) #### templates #### -tmpl-build.stamp: setup.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt +tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt @echo ' DOC Rebuilding template files' @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ diff --git a/gtk-doc.notmpl.make b/gtk-doc.notmpl.make index 7f8868c..3f95d9e 100644 --- a/gtk-doc.notmpl.make +++ b/gtk-doc.notmpl.make @@ -35,7 +35,7 @@ EXTRA_DIST = \ DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \ html-build.stamp pdf-build.stamp \ - setup.stamp sgml.stamp html.stamp pdf.stamp + sgml.stamp html.stamp pdf.stamp SCANOBJ_FILES = \ $(DOC_MODULE).args \ @@ -88,10 +88,6 @@ setup-build.stamp: @touch setup-build.stamp -setup.stamp: setup-build.stamp - @true - - #### scan #### scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) @@ -124,7 +120,7 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE) #### xml #### -sgml-build.stamp: setup.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) +sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) @echo ' DOC Building XML' @_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ diff --git a/tests/gtk-doc.make b/tests/gtk-doc.make index 3c89439..30b10f9 100644 --- a/tests/gtk-doc.make +++ b/tests/gtk-doc.make @@ -36,7 +36,7 @@ EXTRA_DIST = \ DOC_STAMPS=setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ html-build.stamp pdf-build.stamp \ - setup.stamp tmpl.stamp sgml.stamp html.stamp pdf.stamp + tmpl.stamp sgml.stamp html.stamp pdf.stamp SCANOBJ_FILES = \ $(DOC_MODULE).args \ @@ -77,11 +77,6 @@ setup-build.stamp: fi @touch setup-build.stamp - -setup.stamp: setup-build.stamp - @true - - #### scan #### scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) @@ -113,7 +108,7 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE) #### templates #### -tmpl-build.stamp: setup.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt +tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt @echo " DOC `date +%H:%M:%S.%N`: Rebuilding template files" @PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \ gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) diff --git a/tests/gtk-doc.notmpl.make b/tests/gtk-doc.notmpl.make index 14d317f..6dbeb11 100644 --- a/tests/gtk-doc.notmpl.make +++ b/tests/gtk-doc.notmpl.make @@ -36,7 +36,7 @@ EXTRA_DIST = \ DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \ html-build.stamp pdf-build.stamp \ - setup.stamp sgml.stamp html.stamp pdf.stamp + sgml.stamp html.stamp pdf.stamp SCANOBJ_FILES = \ $(DOC_MODULE).args \ @@ -76,10 +76,6 @@ setup-build.stamp: @touch setup-build.stamp -setup.stamp: setup-build.stamp - @true - - #### scan #### scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) @@ -111,7 +107,7 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE) #### xml #### -sgml-build.stamp: setup.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) +sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) @echo " DOC `date +%H:%M:%S.%N`: Building XML" @_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ -- 2.11.4.GIT