From: Alexander Barton Date: Mon, 3 Aug 2015 14:25:40 +0000 (+0200) Subject: Move Makefile.ax into new lib/ directory X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=backup-script.git;a=commitdiff_plain;h=7e39ab0494f63b482d5a2e31706919a32d7566f3 Move Makefile.ax into new lib/ directory --- diff --git a/Makefile b/Makefile index b807cab..1f09876 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ SUBDIRS = bin etc examples -include ./Makefile.ax +include ./lib/Makefile.ax install-local: install -d -o $(USER) -g $(GROUP) -m 755 \ diff --git a/Makefile.ax b/Makefile.ax deleted file mode 100644 index 180ce3c..0000000 --- a/Makefile.ax +++ /dev/null @@ -1,43 +0,0 @@ -# -# ax-make: Alex' Simple Makefile System -# Copyright (c)2014 Alexander Barton (alex@barton.de) -# -# This library is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published -# by the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. -# - -AX_SILENT ?= @ - -PREFIX ?= /usr/local - -USER ?= $(shell id -un) -GROUP ?= $(shell stat --format=%G $(DESTDIR)$(PREFIX) 2>/dev/null || id -gn) - -all: all-ax all-local - -all-ax: $(ALL) $(SUBDIRS) - -clean: clean-ax clean-local - -distclean: clean-local distclean-ax distclean-local - -maintainer-clean: clean-local distclean-local maintainer-clean-ax maintainer-clean-local - -check: check-pre check-ax check-local check-post - -install: install-ax install-local - -all-ax clean-ax distclean-ax maintainer-clean-ax check-ax install-ax: - $(AX_SILENT)for subdir in $(SUBDIRS); do \ - target=`echo "$@" | sed -e 's/-ax$$//'`; \ - echo "Making \"$$target\" in \"$$subdir\" ..."; \ - $(MAKE) -C $$subdir $$target || exit 1; \ - done - -.PHONY: all clean distclean maintainer-clean check install -.PHONY: all-ax clean-ax distclean-ax maintainer-clean-ax check-ax install-ax -.PHONY: all-local clean-local distclean-local maintainer-clean-local check-local install-local -.PHONY: check-pre check-post -.PHONY: $(SUBDIRS) diff --git a/bin/Makefile b/bin/Makefile index 38c6c3a..d665571 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -3,7 +3,7 @@ # Copyright (c)2008-2015 Alexander Barton # -include ../Makefile.ax +include ../lib/Makefile.ax install-local: install -d -o $(USER) -g $(GROUP) -m 755 \ diff --git a/etc/Makefile b/etc/Makefile index 34e39df..7822f70 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -3,4 +3,4 @@ # Copyright (c)2008-2015 Alexander Barton # -include ../Makefile.ax +include ../lib/Makefile.ax diff --git a/examples/Makefile b/examples/Makefile index 34e39df..7822f70 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -3,4 +3,4 @@ # Copyright (c)2008-2015 Alexander Barton # -include ../Makefile.ax +include ../lib/Makefile.ax diff --git a/lib/Makefile.ax b/lib/Makefile.ax new file mode 100644 index 0000000..180ce3c --- /dev/null +++ b/lib/Makefile.ax @@ -0,0 +1,43 @@ +# +# ax-make: Alex' Simple Makefile System +# Copyright (c)2014 Alexander Barton (alex@barton.de) +# +# This library is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published +# by the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# + +AX_SILENT ?= @ + +PREFIX ?= /usr/local + +USER ?= $(shell id -un) +GROUP ?= $(shell stat --format=%G $(DESTDIR)$(PREFIX) 2>/dev/null || id -gn) + +all: all-ax all-local + +all-ax: $(ALL) $(SUBDIRS) + +clean: clean-ax clean-local + +distclean: clean-local distclean-ax distclean-local + +maintainer-clean: clean-local distclean-local maintainer-clean-ax maintainer-clean-local + +check: check-pre check-ax check-local check-post + +install: install-ax install-local + +all-ax clean-ax distclean-ax maintainer-clean-ax check-ax install-ax: + $(AX_SILENT)for subdir in $(SUBDIRS); do \ + target=`echo "$@" | sed -e 's/-ax$$//'`; \ + echo "Making \"$$target\" in \"$$subdir\" ..."; \ + $(MAKE) -C $$subdir $$target || exit 1; \ + done + +.PHONY: all clean distclean maintainer-clean check install +.PHONY: all-ax clean-ax distclean-ax maintainer-clean-ax check-ax install-ax +.PHONY: all-local clean-local distclean-local maintainer-clean-local check-local install-local +.PHONY: check-pre check-post +.PHONY: $(SUBDIRS)