gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-21 11:38:00 +01:00
Code Issues Projects Releases Wiki Activity

Polished Makefile.doc anD Makefile.common.

Browse Source 
(includes a more elegant fix for 1e4369cb40de23bd912bb7b5175c6cfae4e665c2)
This commit is contained in:
Ted Pavlic
2009-01-21 10:59:47 -05:00
parent f381a86bf7
commit 74c04cc49b
2 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
common/Makefile.common
View File

@@ -34,6 +34,7 @@ RDF_IN = $(RDF).in
BUILD_DIR = build.$(VERSION).$(OS) BUILD_DIR = build.$(VERSION).$(OS)
ASCIIDOC = asciidoc ASCIIDOC = asciidoc
AWK = awk
.SILENT: .SILENT:
@@ -41,11 +42,9 @@ ASCIIDOC = asciidoc
TARGETS = all help info doc jar xpi install clean distclean $(JAR) TARGETS = all help info doc jar xpi install clean distclean $(JAR)
$(TARGETS:%=\%.%): $(TARGETS:%=\%.%):
echo MAKE $* $(@:$*.%=%) echo " MAKE" $* $(@:$*.%=%)
$(MAKE) -C $* $(@:$*.%=%) $(MAKE) -C $* $(@:$*.%=%)
#$(TARGETS): %: $(LOCALES:%=%.%)
.PHONY: $(TARGETS) .PHONY: $(TARGETS)
all: help all: help
@@ -75,39 +74,36 @@ jar: $(JAR)
release: $(XPI) $(RDF) release: $(XPI) $(RDF)
$(RDF): $(RDF_IN) Makefile $(RDF): $(RDF_IN) Makefile
@echo "Preparing release..." @echo " Preparing release..."
$(SED) -e "s,###VERSION###,$(VERSION),g" \ $(SED) -e "s,###VERSION###,$(VERSION),g" \
-e "s,###DATE###,$(BUILD_DATE),g" \ -e "s,###DATE###,$(BUILD_DATE),g" \
< $< > $@ < $< > $@
@echo "SUCCESS: $@" @echo " SUCCESS: $@"
clean: clean: $(LOCALES:%=%.clean)
@echo "General $(NAME) cleanup..." @echo " General $(NAME) cleanup..."
@set -e; for locale in $(LOCALES); do $(MAKE) -C $$locale clean; done
rm -f $(JAR) $(XPI) rm -f $(JAR) $(XPI)
distclean: clean distclean: $(LOCALES:%=%.distclean) clean
@echo "More $(NAME) cleanup..." @echo " More $(NAME) cleanup..."
@set -e; for locale in $(LOCALES); do $(MAKE) -C $$locale distclean; done
rm -rf $(BUILD_DIR) rm -rf $(BUILD_DIR)
#### xpi #### xpi
$(XPI): $(JAR) $(XPI): $(JAR)
@echo "Building XPI..." @echo " Building XPI..."
mkdir -p $(XPI_PATH) mkdir -p $(XPI_PATH)
awk -v 'name=$(NAME)' -f $(BASE)/process_manifest.awk $(TOP)/chrome.manifest >$(XPI_PATH)/chrome.manifest $(AWK) -v 'name=$(NAME)' -f $(BASE)/process_manifest.awk $(TOP)/chrome.manifest >$(XPI_PATH)/chrome.manifest
$(MAKE_JAR) "$(XPI)" "$(XPI_BASES)" "$(XPI_DIRS)" "$(XPI_TEXTS)" "$(XPI_BINS)" "$(XPI_FILES)" $(MAKE_JAR) "$(XPI)" "$(XPI_BASES)" "$(XPI_DIRS)" "$(XPI_TEXTS)" "$(XPI_BINS)" "$(XPI_FILES)"
@echo "SUCCESS: $@" @echo " SUCCESS: $@"
#### jar #### jar
$(JAR): doc $(JAR): doc
@echo "Building JAR..." @echo " Building JAR..."
$(MAKE_JAR) "$(JAR)" "$(JAR_BASES)" "$(JAR_DIRS)" "$(JAR_TEXTS)" "$(JAR_BINS)" "$(JAR_FILES)" $(MAKE_JAR) "$(JAR)" "$(JAR_BASES)" "$(JAR_DIRS)" "$(JAR_TEXTS)" "$(JAR_BINS)" "$(JAR_FILES)"
@echo "SUCCESS: $@" @echo " SUCCESS: $@"
#### doc (see Makefile.doc) #### doc (see Makefile.doc)
doc: doc: $(LOCALES:%=%.doc) ;
@set -e; for locale in $(LOCALES); do $(MAKE) -C $$locale doc; done

4
common/Makefile.doc
View File

@@ -32,7 +32,7 @@ help:
@echo " make distclean - clean up more" @echo " make distclean - clean up more"
clean: clean:
@echo " Cleanup of $(LOCALE) documentation..." @echo " Cleanup of $(LOCALE) documentation..."
distclean: clean distclean: clean
@echo " More cleanup of $(LOCALE) documentation..." @echo " More cleanup of $(LOCALE) documentation..."
@@ -51,6 +51,6 @@ check-asciidoc:
echo >&2 "Warning: asciidoc versions other than 8.2.x are unsupported" echo >&2 "Warning: asciidoc versions other than 8.2.x are unsupported"
$(ADC_FILES): %.html: %.txt $(BASE)/Makefile.doc $(ADC_DEPS) $(ADC_FILES): %.html: %.txt $(BASE)/Makefile.doc $(ADC_DEPS)
@echo "DOC locale/$(LOCALE)/$@" @echo " DOC locale/$(LOCALE)/$@"
$(ASCIIDOC) --unsafe -a linkcss -a quirks! -a lang=$(LANG) -a doctitle="$(shell basename $@)" -o $@ $< $(ASCIIDOC) --unsafe -a linkcss -a quirks! -a lang=$(LANG) -a doctitle="$(shell basename $@)" -o $@ $<