fuse2fs: fix fsname option in some cases

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

diff --git a/lib/Makefile.elf-lib b/lib/Makefile.elf-lib
index e755d20c68cd42afea86b936e1fc6ecc3bceda4a..bd7b2b3c48b7927dba39d50102b497083604610a 100644 (file)
--- a/lib/Makefile.elf-lib
+++ b/lib/Makefile.elf-lib
@@ -11,12 +11,11 @@
 # ELF_INSTALL_DIR = $(SHLIBDIR)
 # ELF_OTHER_LIBS = -lc
 
-all:: elfshared image
+all:: image
 
-subdirs:: elfshared
-
-elfshared:
-       mkdir 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)
@@ -24,34 +23,51 @@ ELF_SONAME = $(ELF_IMAGE).so.$(ELF_SO_VERSION)
 image:         $(ELF_LIB)
 
 $(ELF_LIB): $(OBJS)
-       (cd elfshared; $(CC) --shared -o $(ELF_LIB) -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)
+       $(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))
+       $(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::
-       $(top_srcdir)/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
-       $(INSTALL_PROGRAM) $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
-       $(STRIP) --strip-debug \
-               $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
-       $(LN_S) -f $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME)
-       $(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
-               $(DESTDIR)$(libdir)/$(ELF_IMAGE).so
-       -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
+       $(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
+       $(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::
        $(RM) -f $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB) \
                $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME) \
                $(DESTDIR)$(libdir)/$(ELF_IMAGE).so
-       -ldconfig
+       -$(LDCONFIG)
 
 clean::
        $(RM) -rf elfshared