]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
xfsprogs: clean up make install build V2
authorDave Chinner <david@fromorbit.com>
Wed, 17 Feb 2010 05:19:17 +0000 (16:19 +1100)
committerDave Chinner <david@fromorbit.com>
Wed, 17 Feb 2010 05:19:17 +0000 (16:19 +1100)
The install targets did not get the silent treatment like the
normal build targets. Shut them up.

Also, remove the top level install target dependency on the default
target. Each sub-directory already defines the correct dependencies
for the install targets and so all the rebuilds can be done in one
traversal of the subdirectories via the install rules.

Signed-off-by: Dave Chinner <david@fromorbit.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Makefile
include/buildrules
man/Makefile
mdrestore/Makefile

index 83d1b0ad95ee40e262a2b75a1b963c03ea4e8921..68025e5b426db9032daf8049d5e6e5885435897d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -98,22 +98,25 @@ include/platform_defs.h: include/builddefs
                $(MAKE) $(MAKEOPTS) $(AM_MAKEFLAGS) include/builddefs; \
        fi
 
-install: default $(addsuffix -install,$(SUBDIRS))
+install: $(addsuffix -install,$(SUBDIRS))
        $(INSTALL) -m 755 -d $(PKG_DOC_DIR)
        $(INSTALL) -m 644 README $(PKG_DOC_DIR)
 
-install-dev: default $(addsuffix -install-dev,$(SUBDIRS))
+install-dev: $(addsuffix -install-dev,$(SUBDIRS))
 
 install-qa: install $(addsuffix -install-qa,$(SUBDIRS))
 
 %-install:
-       $(MAKE) -C $* install
+       @echo "Installing $@"
+       $(Q)$(MAKE) $(MAKEOPTS) -C $* install
 
 %-install-dev:
-       $(MAKE) -C $* install-dev
+       @echo "Installing $@"
+       $(Q)$(MAKE) $(MAKEOPTS) -C $* install-dev
 
 %-install-qa:
-       $(MAKE) -C $* install-qa
+       @echo "Installing $@"
+       $(Q)$(MAKE) $(MAKEOPTS) -C $* install-qa
 
 distclean: clean
        $(Q)rm -f $(LDIRT)
index 1695e235981fc2c3a3319f2d8cc54650bfbbcab4..beb469b69445d32081e309c3426cbbc02ccca3f1 100644 (file)
@@ -101,7 +101,3 @@ ltdepend: $(CFILES) $(HFILES)
 depend: $(CFILES) $(HFILES)
        @echo "    [DEP]"
        $(Q)$(MAKEDEP) $(CFILES) > .dep
-
-
-#      $(Q)$(MAKEDEP) $(CFILES) | $(SED) -e 's,^\([^:]*\)\.o,\1,' > .dep
-
index 2b5e89c2ee16378f725af43e210f6ea946dcd919..863284c25c3aa174808b46512e0edfc7206e01df 100644 (file)
@@ -14,9 +14,9 @@ install : $(addsuffix -install,$(SUBDIRS))
 install-dev : $(addsuffix -install-dev,$(SUBDIRS))
 
 %-install:
-       $(MAKE) -C $* install
+       $(Q)$(MAKE) $(MAKEOPTS) -C $* install
 
 %-install-dev:
-       $(MAKE) -C $* install-dev
+       $(Q)$(MAKE) $(MAKEOPTS) -C $* install-dev
 
 include $(BUILDRULES)
index fd35d80881856b0612719339df55266ffb2d2096..ca2d1a0957d1ac5e1fa750e4028f8d0ec34adf84 100644 (file)
@@ -16,7 +16,7 @@ default: depend $(LTCOMMAND)
 
 include $(BUILDRULES)
 
-install:
+install: default
        $(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
        $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR)
 install-dev: