diff options
| -rw-r--r-- | Makefile-maint | 46 | ||||
| -rw-r--r-- | README-maint | 16 |
2 files changed, 37 insertions, 25 deletions
diff --git a/Makefile-maint b/Makefile-maint index f083973..776275f 100644 --- a/Makefile-maint +++ b/Makefile-maint @@ -3,35 +3,55 @@ srcdir := . m4dir := $(srcdir)/m4 htmldir := $(srcdir)/html +stagedir := $(srcdir)/stage +buildauxdir := $(srcdir)/build-aux -STAGEDIR := $(srcdir)/stage M4_FILES := $(wildcard $(m4dir)/*.m4) MACROS := $(patsubst $(m4dir)/%.m4,%, $(M4_FILES)) -CANON_M4_FILES := $(patsubst %,$(STAGEDIR)/%.m4,$(MACROS)) -RAW_HTML_FILES := $(patsubst %,$(STAGEDIR)/%.html,$(MACROS)) +CANON_M4_FILES := $(patsubst %,$(stagedir)/%.m4,$(MACROS)) +RAW_HTML_FILES := $(patsubst %,$(stagedir)/%.html,$(MACROS)) HTML_FILES := $(patsubst %,$(htmldir)/%.html,$(MACROS)) -GENERATED_FILES = $(HTML_FILES) -CLEAN_FILES = $(GENERATED_FILES) $(STAGEDIR)/.dirCreated $(STAGEDIR)/autoconf-archive.css +GENERATED_FILES = $(HTML_FILES) $(stagedir)/.dirCreated AUTHORS ChangeLog +CLEAN_FILES = $(GENERATED_FILES) .SECONDARY: $(GENERATED_FILES) -.PHONY: all clean +.PHONY: all clean update-gnulib autoreconf configure bootstrap all: $(HTML_FILES) -$(STAGEDIR)/%.html : $(m4dir)/%.m4 $(STAGEDIR)/.dirCreated $(srcdir)/macro.py $(srcdir)/macro2html.py - @$(srcdir)/macro2html.py --input-encoding=latin-1 --output-encoding=latin-1 --output-dir=$(STAGEDIR) --output-suffix=.html $< +$(stagedir)/%.html : $(m4dir)/%.m4 $(stagedir)/.dirCreated macro.py macro2html.py + @macro2html.py --input-encoding=latin-1 --output-encoding=latin-1 --output-dir=$(stagedir) --output-suffix=.html $< -$(htmldir)/%.html : $(STAGEDIR)/%.html +$(htmldir)/%.html : $(stagedir)/%.html @echo publish $* @tidy -quiet -ascii --indent yes --indent-spaces 1 --tidy-mark no -wrap 80 --hide-comments yes $< >$@ -$(STAGEDIR)/autoconf-archive.css : $(srcdir)/autoconf-archive.css $(STAGEDIR)/.dirCreated - @cp -v $< $@ - %/.dirCreated: @install -D /dev/null $@ clean: @rm -f $(CLEAN_FILES) - @if [ -d "$(STAGEDIR)" ] ; then rmdir "$(STAGEDIR)"; fi + @if [ -d "$(stagedir)" ] ; then rmdir "$(stagedir)"; fi + @rm -rf $(buildauxdir) + +update-gnulib: + gnulib-tool --m4-base build-aux --source-base build-aux --import git-version-gen gitlog-to-changelog gnupload + +autoreconf: + autoreconf --install -Wall + +AUTHORS: + echo >$@ todo + +ChangeLog: + cd $(m4dir) && ../build-aux/gitlog-to-changelog -- master >../$@ + +configure: + ./configure + +bootstrap: + $(MAKE) -f Makefile-maint update-gnulib + $(MAKE) -f Makefile-maint AUTHORS ChangeLog + $(MAKE) -f Makefile-maint autoreconf + $(MAKE) -f Makefile-maint configure diff --git a/README-maint b/README-maint index cd5f0d6..28d8b69 100644 --- a/README-maint +++ b/README-maint @@ -34,18 +34,10 @@ - Automake and Autoconf - Add the following settings to your =.git/config= file: + - GNU Make - : [alias] - : update-gnulib = !gnulib-tool --m4-base build-aux --source-base build-aux --import git-version-gen gitlog-to-changelog gnupload - : update-autotools = !autoreconf --install -Wall - : update-changelog = !build-aux/gitlog-to-changelog -- --branches >ChangeLog - : update-authors = !touch AUTHORS - : configure = !./configure --prefix=$(pwd)/_stage - : bootstrap = !git update-gnulib && git update-changelog && git update-authors && git update-autotools && git configure - - Running =git bootstrap= sets up and configures the Autotools build. Once - that's accomplished, run =make -f Makefile distcheck=. + Running =make -f Makefile-maint bootstrap= sets up and configures the + Autotools build. Once that's accomplished, run =make distcheck=. The tarballs can be uploaded to Savannah as follows: @@ -54,7 +46,7 @@ * THINGS TO DO -*** TODO Document the newly mailing lists. +*** TODO Document our new mailing lists. ***** autoconf-archive-maintainers ***** autoconf-archive-commits |