ext4/306: Add -b blocksize parameter too to avoid failure with DAX config

[xfstests-dev.git] / include / buildmacros

diff --git a/include/buildmacros b/include/buildmacros
index c6678e57268625e5cb8c0bfc66646cc076986729..60874842412b73cd513c121a7d2042ee73454db0 100644 (file)
--- a/include/buildmacros
+++ b/include/buildmacros
@@ -1,4 +1,4 @@
-#
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (c) 2002-2003 Silicon Graphics, Inc.  All Rights Reserved.
 #
 
@@ -12,7 +12,7 @@ BUILDRULES = $(TOPDIR)/include/buildrules
 LDFLAGS += $(LOADERFLAGS) $(LLDFLAGS)
 LDLIBS = $(LLDLIBS) $(PLDLIBS) $(MALLOCLIB)
 
-MAKEOPTS = --no-print-directory
+MAKEOPTS = --no-print-directory Q=$(Q)
 SRCFILES = Makefile $(HFILES) $(CFILES) $(LSRCFILES) $(LFILES) $(YFILES)
 
 DEPDIRT = dep dep.bak
@@ -28,7 +28,6 @@ OBJECTS = $(ASFILES:.s=.o) \
 
 INSTALL        = $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
 
-SHELL = /bin/sh
 IMAGES_DIR = $(TOPDIR)/all-images
 DIST_DIR = $(TOPDIR)/dist
 
@@ -41,10 +40,10 @@ LIBNAME = $(basename $(LTLIBRARY))
 LTOBJECTS = $(OBJECTS:.o=.lo)
 LTVERSION = $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
-LTLINK = $(LIBTOOL) --mode=link $(CC)
-LTEXEC = $(LIBTOOL) --mode=execute
-LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CCF)
+LTLINK = $(LIBTOOL) --quiet --tag=CC --mode=link $(CC)
+LTEXEC = $(LIBTOOL) --quiet --mode=execute
+LTINSTALL = $(LIBTOOL) --quiet --mode=install $(INSTALL)
+LTCOMPILE = $(LIBTOOL) --quiet --tag=CC --mode=compile $(CCF)
 
 ifeq ($(ENABLE_SHARED),yes)
 LTLDFLAGS += -rpath $(PKG_LIB_DIR)
@@ -55,7 +54,7 @@ ifeq ($(ENABLE_SHARED),yes)
 INSTALL_LTLIB = \
        cd $(TOPDIR)/$(LIBNAME)/.libs; \
        ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-       ../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_LIB_DIR); \
+       ../$(INSTALL) -m 755 -T so_dot_version $(LIBNAME).lai $(PKG_LIB_DIR); \
        ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_LIB_DIR)
 endif
 
@@ -122,21 +121,6 @@ INSTALL_LINGUAS = \
        done
 endif
 
-SUBDIRS_MAKERULE = \
-       @for d in $(SUBDIRS) ""; do \
-               if test "$$d" == "dmapi"; then \
-                       if test "$(PKG_PLATFORM)" == "irix" ; then \
-                               echo "DMAPI QA NOT AVAIABLE FOR IRIX"; \
-                       else \
-                               $(ECHO) === $$d ===; \
-                                       cd dmapi && $(MAKE) && cd .. || exit $$?; \
-                       fi; \
-               elif test -d "$$d" -a ! -z "$$d"; then \
-                       $(ECHO) === $$d ===; \
-                       $(MAKEF) -C $$d $@ || exit $$?; \
-               fi; \
-       done
-
 MAN_MAKERULE = \
        @for f in *.[12345678] ""; do \
                if test ! -z "$$f"; then \