diff options
| -rw-r--r-- | Makefile.in | 25 | ||||
| -rwxr-xr-x | build.sh | 2 | ||||
| -rwxr-xr-x | configure | 5 |
3 files changed, 13 insertions, 19 deletions
diff --git a/Makefile.in b/Makefile.in index 67f2c9c..411879e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -26,9 +26,7 @@ metafiles = build.sh configure Makefile.in process_html_file.sh README.txt \ # The default target: placed up here default: $(default_target) -.PHONY: mozilla chromium \ - all build_all build_all.zip all_zip \ - default build zip \ +.PHONY: mozilla chromium all all-unpacked default unpacked \ install install-html install-dvi install-pdf install-ps uninstall \ install-strip clean distclean mostlyclean maintainer-clean TAGS info \ dvi html pdf ps dist check installcheck installdirs @@ -40,25 +38,22 @@ icons/haketilo16.png: icons/haketilo.svg # browser-specific targets all: mozilla chromium -mozilla: build_mozilla build_mozilla.zip -chromium: build_chromium build_chromium.zip +mozilla: mozilla-build.zip +chromium: chromium-build.zip -build: build_$(default_target)/ -build_all/: build_mozilla/ build_chromium/ - -zip: build_$(default_target).zip -build_all.zip all_zip: build_mozilla.zip build_chromium.zip - -build_% build_%/: $(extension_files) icons/haketilo16.png +unpacked: $(default_target)-unpacked +all-unpacked: mozilla-unpacked chromium-unpacked +%-unpacked: $(extension_files) icons/haketilo16.png $(srcdir)/build.sh $* $(srcdir) $(UPDATE_URL) -build_%.zip: build_%/ +%-build.zip: %-unpacked cd $< && zip -q -r ../$@ * # helper targets clean mostlyclean: - rm -rf build_mozilla build_chromium haketilo-$(version) - rm -f build_mozilla.zip build_chromium.zip haketilo-$(version).tar.gz + rm -rf mozilla-unpacked chromium-unpacked haketilo-$(version) + rm -f mozilla-build.zip chromium-build.zip haketilo-$(version).tar.gz \ + haketilo-$(version).tar distclean: clean rm -f Makefile config.status record.conf @@ -305,7 +305,7 @@ main() { SRCDIR="${2:-.}" if [ -d "$SRCDIR" ]; then - BUILDDIR="$(realpath build_$BROWSER)" + BUILDDIR="$(realpath $BROWSER-unpacked)" rm -rf "$BUILDDIR" mkdir "$BUILDDIR" cd "$SRCDIR" @@ -26,7 +26,7 @@ while [ "x$1" != x ]; do "UPDATE_URL"=*) UPDATE_URL="$(echo "$1" | cut -c 12-)";; --host=*) TARGET="$(echo "$1" | cut -c 8-)";; --host) TARGET="$2"; shift;; - mozilla | chromium | all) TARGET=$1;; + mozilla | chromium) TARGET=$1;; *) echo Ignoring option "'$1'";; esac shift @@ -52,10 +52,9 @@ fi # TODO: automate target detection # Standardize and check browser names -case "${TARGET:-all}" in +case "$TARGET" in mozilla) TARGET=mozilla;; chromium) TARGET=chromium;; - all) TARGET=all;; *) echo Invalid target "'$1'" >&2; exit 2;; esac |