Makefile.ax: Don't require a "all" target in "Makefile" any more

diff --git a/Makefile b/Makefile
index 68c37965b8072ed9c2ed3b583db7a064d244300d..0d50740d73d3011578a28fd079154b9730413534 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,4 @@
 
 SUBDIRS = btrfs bup lvm
 
-all: $(SUBDIRS)
-
 include Makefile.ax

diff --git a/Makefile.ax b/Makefile.ax
index c5f12fdf7b44319763a281453d76c941845d0f07..da7fb75792b3baa84ff5e8b6463b504552a7731a 100644 (file)
--- a/Makefile.ax
+++ b/Makefile.ax
@@ -15,8 +15,9 @@ PREFIX ?= /usr/local
 USER ?= $(shell id -un)
 GROUP ?= $(shell stat --format=%G $(DESTDIR)$(PREFIX) 2>/dev/null || id -gn)
 
-$(SUBDIRS):
-       $(MAKE) -C $@
+all: all-ax all-local
+
+all-ax: $(ALL) $(SUBDIRS)
 
 clean: clean-ax clean-local
 
@@ -53,7 +54,10 @@ install-ax:
          $(MAKE) -C $$subdir install || exit 1; \
         done
 
+$(SUBDIRS):
+       $(MAKE) -C $@
+
 .PHONY: all clean distclean maintainer-clean check install
-.PHONY: clean-ax distclean-ax maintainer-clean-ax check-ax install-ax
-.PHONY: clean-local distclean-local maintainer-clean-local check-local install-local
+.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: $(SUBDIRS)

diff --git a/btrfs/Makefile b/btrfs/Makefile
index 0dbdf4ec707c4d3ecf69ffe27838bc6c49b4afbc..e0a8ffa2f3741c7321bbefb2672e4589b33fed09 100644 (file)
--- a/btrfs/Makefile
+++ b/btrfs/Makefile
@@ -10,6 +10,4 @@
 
 SUBDIRS = mksnapshot
 
-all: $(SUBDIRS)
-
 include ../Makefile.ax

diff --git a/btrfs/mksnapshot/Makefile b/btrfs/mksnapshot/Makefile
index b70ab69310befa3c2644f6ccb5ed3e65952809f8..f56c7fe0f6d3852dd12eac0f0c3a317c1269e742 100644 (file)
--- a/btrfs/mksnapshot/Makefile
+++ b/btrfs/mksnapshot/Makefile
@@ -10,7 +10,7 @@
 
 ALL = btrfs-mksnapshot btrfs-mksnapshot-rootfs 06btrfs-mksnapshot
 
-all: $(ALL)
+include ../../Makefile.ax
 
 clean-local:
        rm -f 06btrfs-mksnapshot
@@ -30,5 +30,3 @@ install-local: $(ALL)
 06btrfs-mksnapshot: 06btrfs-mksnapshot.tmpl
        cat 06btrfs-mksnapshot.tmpl | sed -e 's@:PREFIX:@$(PREFIX)@g' \
         >06btrfs-mksnapshot
-
-include ../../Makefile.ax

diff --git a/bup/Makefile b/bup/Makefile
index 8e19c4adeccabb7351fb9dbebf923be333c52296..ad0cabb66dc60a49198d643daa5b78f6a3877d74 100644 (file)
--- a/bup/Makefile
+++ b/bup/Makefile
@@ -10,6 +10,4 @@
 
 SUBDIRS = save-user
 
-all: $(SUBDIRS)
-
 include ../Makefile.ax

diff --git a/bup/save-user/Makefile b/bup/save-user/Makefile
index ba42d5c0ad0dad40a160c448a5232de8649e95f6..cb6c748ff1e649051407c08aa5a8546d67b33db4 100644 (file)
--- a/bup/save-user/Makefile
+++ b/bup/save-user/Makefile
@@ -8,12 +8,12 @@
 # (at your option) any later version.
 #
 
-all: bup-save-user
+ALL = bup-save-user
+
+include ../../Makefile.ax
 
 install-local: bup-save-user
        install -d -o $(USER) -g $(GROUP) -m 755 \
         $(DESTDIR)/usr/local/bin
        install -p -o $(USER) -g $(GROUP) -m 755 bup-save-user \
         $(DESTDIR)/usr/local/bin/bup-save-user
-
-include ../../Makefile.ax

diff --git a/lvm/Makefile b/lvm/Makefile
index 32590b9282013b6067efd062ed30a985bebadfbc..0dbbe6ff8b9acdd515c68a106828d7fd9ce61f74 100644 (file)
--- a/lvm/Makefile
+++ b/lvm/Makefile
@@ -10,6 +10,4 @@
 
 SUBDIRS = pvclear
 
-all: $(SUBDIRS)
-
 include ../Makefile.ax

diff --git a/lvm/pvclear/Makefile b/lvm/pvclear/Makefile
index 2de721329966f48556ca0a961d1673f7afde465e..8052c4c6aa942d1f13876e7fa080aed12fafbe6c 100644 (file)
--- a/lvm/pvclear/Makefile
+++ b/lvm/pvclear/Makefile
@@ -8,12 +8,12 @@
 # (at your option) any later version.
 #
 
-all: lvm-pvclear
+ALL = lvm-pvclear
+
+include ../../Makefile.ax
 
 install-local: lvm-pvclear
        install -d -o $(USER) -g $(GROUP) -m 755 \
         $(DESTDIR)/usr/local/sbin
        install -p -o $(USER) -g $(GROUP) -m 755 lvm-pvclear \
         $(DESTDIR)/usr/local/sbin/lvm-pvclear
-
-include ../../Makefile.ax