build: use MKDIR_P instead of MKINSTALLDIRS

[tools/e2fsprogs.git] / lib / Makefile.elf-lib

diff --git a/lib/Makefile.elf-lib b/lib/Makefile.elf-lib
index 8819ced..bd7b2b3 100644 (file)
--- a/lib/Makefile.elf-lib
+++ b/lib/Makefile.elf-lib
@@ -13,9 +13,9 @@
 
 all:: image
 
-subdirs:: Makefile
-       @echo " MKDIR elfshared"
-       @mkdir -p elfshared
+real-subdirs:: Makefile
+       $(E) "  MKDIR elfshared"
+       $(Q) mkdir -p elfshared
 
 ELF_LIB = $(ELF_IMAGE).so.$(ELF_VERSION)
 ELF_SONAME = $(ELF_IMAGE).so.$(ELF_SO_VERSION)
@@ -23,41 +23,44 @@ ELF_SONAME = $(ELF_IMAGE).so.$(ELF_SO_VERSION)
 image:         $(ELF_LIB)
 
 $(ELF_LIB): $(OBJS)
-       @echo " GEN_ELF_SOLIB $(ELF_LIB)"
-       @(cd elfshared; $(CC) --shared -o $(ELF_LIB) $(LDFLAGS) \
+       $(E) "  GEN_ELF_SOLIB $(ELF_LIB)"
+       $(Q) (cd elfshared; $(CC) -o $(ELF_LIB) \
+               -L$(top_builddir)/../lib $(LDFLAGS_SHLIB) -fPIC -shared \
                -Wl,-soname,$(ELF_SONAME) $(OBJS) $(ELF_OTHER_LIBS))
-       @$(MV) elfshared/$(ELF_LIB) .
-       @$(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME)
-       @$(LN) $(ELF_LIB) ../$(ELF_LIB)
-       @$(LN) ../$(ELF_LIB) ../$(ELF_IMAGE).so
-       @$(LN) ../$(ELF_LIB) ../$(ELF_SONAME)
+       $(Q) $(MV) elfshared/$(ELF_LIB) .
+       $(Q) $(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME)
+       $(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) \
+               `echo $(my_dir) | sed -e 's;lib/;;'`/$(ELF_LIB) $(ELF_LIB))
+       $(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) $(ELF_LIB) $(ELF_IMAGE).so)
+       $(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) $(ELF_LIB) $(ELF_SONAME))
 
 installdirs-elf-lib::
-       @echo " MKINSTALLDIRS $(ELF_INSTALL_DIR) $(libdir)"
-       @$(MKINSTALLDIRS) $(DESTDIR)$(ELF_INSTALL_DIR) \
+       $(E) "  MKDIR_P $(ELF_INSTALL_DIR) $(libdir)"
+       $(Q) $(MKDIR_P) $(DESTDIR)$(ELF_INSTALL_DIR) \
                $(DESTDIR)$(libdir)
 
 installdirs:: installdirs-elf-lib
 
-install-shlibs install:: $(ELF_LIB) installdirs-elf-lib
-       @echo " INSTALL-ELF-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
-       @$(INSTALL_PROGRAM) $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
-       @echo " SYMLINK $(ELF_INSTALL_DIR)/$(ELF_SONAME)"
-       @$(LN_S) -f $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME)
-       @echo " SYMLINK $(libdir)/$(ELF_IMAGE).so"
-       @$(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
-               $(DESTDIR)$(libdir)/$(ELF_IMAGE).so
-       @echo " LDCONFIG"
-       @-$(LDCONFIG)
+install-shlibs install:: $(ELF_LIB) installdirs-elf-lib $(DEP_INSTALL_SYMLINK)
+       $(E) "  INSTALL-ELF-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
+       $(Q) $(INSTALL_PROGRAM) $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
+       $(E) "  SYMLINK $(ELF_INSTALL_DIR)/$(ELF_SONAME)"
+       $(Q) $(INSTALL_SYMLINK) $(ELF_INSTALL_DIR)/$(ELF_LIB) \
+               $(ELF_INSTALL_DIR)/$(ELF_SONAME) $(DESTDIR)
+       $(E) "  SYMLINK $(libdir)/$(ELF_IMAGE).so"
+       $(Q) $(INSTALL_SYMLINK) $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
+               $(libdir)/$(ELF_IMAGE).so $(DESTDIR)
+       $(E) "  LDCONFIG"
+       $(Q) -$(LDCONFIG)
 
 install-strip: install
-       @echo " STRIP-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
-       @$(STRIP) --strip-unneeded --remove-section=.comment \
+       $(E) "  STRIP-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
+       $(Q) $(STRIP) --strip-unneeded --remove-section=.comment \
                --remove-section=.note $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
 
 install-shlibs-strip: install-shlibs
-       @echo " STRIP-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
-       @$(STRIP) --strip-unneeded --remove-section=.comment \
+       $(E) "  STRIP-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
+       $(Q) $(STRIP) --strip-unneeded --remove-section=.comment \
                --remove-section=.note $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
 
 uninstall-shlibs uninstall::