[PATCH 05/13] xfsprogs: remove install-qa target

[Christoph Hellwig]

Now that we don't install all the libxfs internals but just the disk format
defintions we can install those as part of the normal install-dev target.

Signed-off-by: Christoph Hellwig <hch at lst.de>
---
 Makefile           |  6 ------
 include/Makefile   | 11 +++--------
 include/buildrules |  2 +-
 libdisk/Makefile   |  2 --
 libhandle/Makefile |  2 --
 libxcmd/Makefile   |  2 +-
 libxfs/Makefile    | 10 ++--------
 libxlog/Makefile   |  2 +-
 8 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/Makefile b/Makefile
index 6d6803b..111bf76 100644
--- a/Makefile
+++ b/Makefile
@@ -108,8 +108,6 @@ install: $(addsuffix -install,$(SUBDIRS))
 
 install-dev: $(addsuffix -install-dev,$(SUBDIRS))
 
-install-qa: install $(addsuffix -install-qa,$(SUBDIRS))
-
 %-install:
 	@echo "Installing $@"
 	$(Q)$(MAKE) $(MAKEOPTS) -C $* install
@@ -118,10 +116,6 @@ install-qa: install $(addsuffix -install-qa,$(SUBDIRS))
 	@echo "Installing $@"
 	$(Q)$(MAKE) $(MAKEOPTS) -C $* install-dev
 
-%-install-qa:
-	@echo "Installing $@"
-	$(Q)$(MAKE) $(MAKEOPTS) -C $* install-qa
-
 distclean: clean
 	$(Q)rm -f $(LDIRT)
 
diff --git a/include/Makefile b/include/Makefile
index 0135860..bd8b0ca 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -18,8 +18,6 @@
 TOPDIR = ..
 include $(TOPDIR)/include/builddefs
 
-QAHFILES = xfs_arch.h
-
 LIBHFILES = libxfs.h \
 	libxlog.h \
 	atomic.h \
@@ -47,7 +45,8 @@ HFILES = handle.h \
 	$(PKG_PLATFORM).h \
 	platform_defs.h \
 	xfs.h \
-	xqm.h
+	xqm.h \
+	xfs_arch.h
 
 PHFILES = darwin.h freebsd.h irix.h linux.h gnukfreebsd.h
 DKHFILES = volume.h fstyp.h dvh.h
@@ -66,7 +65,7 @@ disk:
 include $(BUILDRULES)
 
 # set up include/xfs header directory
-install-headers: $(addsuffix -hdrs, $(HFILES) $(QAHFILES) $(PHFILES) $(DKHFILES) $(LIBHFILES))
+install-headers: $(addsuffix -hdrs, $(HFILES) $(PHFILES) $(DKHFILES) $(LIBHFILES))
 
 %-hdrs: xfs
 	$(Q)$(LN_S) -f $(PWD)/include/$* xfs/$*
@@ -79,7 +78,3 @@ install: default
 
 install-dev: install
 	$(INSTALL) -m 644 $(HFILES) $(PKG_INC_DIR)
-
-install-qa: install-dev
-	$(INSTALL) -m 644 $(QAHFILES) $(PKG_INC_DIR)
-
diff --git a/include/buildrules b/include/buildrules
index 0e13f9d..72491db 100644
--- a/include/buildrules
+++ b/include/buildrules
@@ -94,7 +94,7 @@ $(_FORCE):
 # rebuild on every make invocation isn't a problem we need to care about. Just
 # do it silently so it doesn't make the build unnecessarily noisy.
 
-.PHONY : depend ltdepend install-qa
+.PHONY : depend ltdepend
 
 MAKEDEP := $(MAKEDEPEND) $(CFLAGS)
 
diff --git a/libdisk/Makefile b/libdisk/Makefile
index b058a9f..3b84a3a 100644
--- a/libdisk/Makefile
+++ b/libdisk/Makefile
@@ -32,6 +32,4 @@ install: default
 
 install-dev: default
 
-install-qa: install-dev
-
 -include .ltdep
diff --git a/libhandle/Makefile b/libhandle/Makefile
index 865ca22..cc4ad1d 100644
--- a/libhandle/Makefile
+++ b/libhandle/Makefile
@@ -25,6 +25,4 @@ install: default
 install-dev: default
 	$(INSTALL_LTLIB_DEV)
 
-install-qa: install-dev
-
 -include .ltdep
diff --git a/libxcmd/Makefile b/libxcmd/Makefile
index ce082a5..7701ed9 100644
--- a/libxcmd/Makefile
+++ b/libxcmd/Makefile
@@ -34,6 +34,6 @@ default: ltdepend $(LTLIBRARY)
 
 include $(BUILDRULES)
 
-install install-dev install-qa: default
+install install-dev: default
 
 -include .ltdep
diff --git a/libxfs/Makefile b/libxfs/Makefile
index 3d3b448..ebbe40e 100644
--- a/libxfs/Makefile
+++ b/libxfs/Makefile
@@ -12,10 +12,7 @@ LT_AGE = 0
 
 # headers to install in include/xfs
 PKGHFILES = xfs_fs.h \
-	xfs_types.h
-
-# headers installed in QA targets
-QAHFILES = \
+	xfs_types.h \
 	xfs_da_format.h \
 	xfs_format.h \
 	xfs_log_format.h
@@ -138,7 +135,7 @@ include $(BUILDRULES)
 install: default
 	$(INSTALL) -m 755 -d $(PKG_INC_DIR)
 
-install-headers: $(addsuffix -hdrs, $(PKGHFILES) $(LIBHFILES) $(QAHFILES))
+install-headers: $(addsuffix -hdrs, $(PKGHFILES) $(LIBHFILES))
 
 %-hdrs:
 	$(Q)$(LN_S) -f $(PWD)/libxfs/$* $(TOPDIR)/include/xfs/$*
@@ -146,9 +143,6 @@ install-headers: $(addsuffix -hdrs, $(PKGHFILES) $(LIBHFILES) $(QAHFILES))
 install-dev: install
 	$(INSTALL) -m 644 $(PKGHFILES) $(PKG_INC_DIR)
 
-install-qa: install-dev
-	$(INSTALL) -m 644 $(QAHFILES) $(PKG_INC_DIR)
-
 # We need to install the headers before building the dependencies.  If we
 # include the .ltdep file, the makefile decides that it needs to build the
 # dependencies to remake the makefile before running the header install target,
diff --git a/libxlog/Makefile b/libxlog/Makefile
index 4673663..3417eed 100644
--- a/libxlog/Makefile
+++ b/libxlog/Makefile
@@ -19,6 +19,6 @@ default: ltdepend $(LTLIBRARY)
 
 include $(BUILDRULES)
 
-install install-dev install-qa: default
+install install-dev: default
 
 -include .ltdep
-- 
1.9.1