xfstests: install shared libs with +x bits

[xfstests-dev.git] / include / buildmacros

diff --git a/include/buildmacros b/include/buildmacros
index 41a4ef9211d13f50576fb5318a82a25a57dc873e..b80b534ca607865e44a497c167616483d101ac22 100644 (file)
--- a/include/buildmacros
+++ b/include/buildmacros
@@ -9,10 +9,10 @@ BUILDRULES = $(TOPDIR)/include/buildrules
 # $(CXXFILES), or $(HFILES) and is used to construct the manifest list
 # during the "dist" phase (packaging).
 
 # $(CXXFILES), or $(HFILES) and is used to construct the manifest list
 # during the "dist" phase (packaging).
 

-LDFLAGS = $(LLDFLAGS)
+LDFLAGS += $(LOADERFLAGS) $(LLDFLAGS)

 LDLIBS = $(LLDLIBS) $(PLDLIBS) $(MALLOCLIB)
 
 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
 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)
 
 
 INSTALL        = $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
 

-SHELL = /bin/sh

 IMAGES_DIR = $(TOPDIR)/all-images
 DIST_DIR = $(TOPDIR)/dist
 
 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)
 
 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)
 
 ifeq ($(ENABLE_SHARED),yes)
 LTLDFLAGS += -rpath $(PKG_LIB_DIR)


@@ -55,8 +54,7 @@ ifeq ($(ENABLE_SHARED),yes)
 INSTALL_LTLIB = \
        cd $(TOPDIR)/$(LIBNAME)/.libs; \
        ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
 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); \
-       test "$(PKG_DISTRIBUTION)" = debian || \
+       ../$(INSTALL) -m 755 -T so_dot_version $(LIBNAME).lai $(PKG_LIB_DIR); \

        ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_LIB_DIR)
 endif
 
        ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_LIB_DIR)
 endif
 


@@ -123,14 +121,6 @@ INSTALL_LINGUAS = \
        done
 endif
 
        done
 endif
 

-SUBDIRS_MAKERULE = \
-       @for d in $(SUBDIRS) ""; do \
-               if 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 \
 MAN_MAKERULE = \
        @for f in *.[12345678] ""; do \
                if test ! -z "$$f"; then \


@@ -144,10 +134,12 @@ DIST_MAKERULE = \
 SOURCE_MAKERULE = \
        @test -z "$$DIR" && DIR="."; \
        for f in $(SRCFILES) ""; do \
 SOURCE_MAKERULE = \
        @test -z "$$DIR" && DIR="."; \
        for f in $(SRCFILES) ""; do \

-           if test ! -z "$$f"; then $(ECHO) $$DIR/$$f; fi;\
+           test -z "$$f" && break; \
+           test -L "$$f" || $(ECHO) $$DIR/$$f; \

        done; \
        done; \

-       for d in `echo $(SUBDIRS)` ; do \
-           if test -d "$$d" -a ! -z "$$d"; then \
+       for d in `echo $(SUBDIRS)` ""; do \
+           test -z "$$d" && break; \
+           if test -d "$$d"; then \

                $(MAKEF) DIR=$$DIR/$$d -C $$d $@ || exit $$?; \
            fi; \
        done
                $(MAKEF) DIR=$$DIR/$$d -C $$d $@ || exit $$?; \
            fi; \
        done