blkid: Avoid division by zero error when probing an invalid FAT filesystem

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

diff --git a/lib/Makefile.elf-lib b/lib/Makefile.elf-lib
index 83b59fc..c360adc 100644 (file)
--- a/lib/Makefile.elf-lib
+++ b/lib/Makefile.elf-lib
@@ -9,14 +9,13 @@
 # ELF_IMAGE = libce
 # ELF_MYDIR = et
 # ELF_INSTALL_DIR = $(SHLIBDIR)
-#
-
-all:: elfshared image
+# ELF_OTHER_LIBS = -lc
 
-subdirs:: elfshared
+all:: image
 
-elfshared:
-       mkdir elfshared
+real-subdirs:: Makefile
+       @echo " MKDIR elfshared"
+       @mkdir -p elfshared
 
 ELF_LIB = $(ELF_IMAGE).so.$(ELF_VERSION)
 ELF_SONAME = $(ELF_IMAGE).so.$(ELF_SO_VERSION)
@@ -24,23 +23,48 @@ 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))
-       $(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)
-
-installdirs::
-       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(ELF_INSTALL_DIR)
-
-install-shlibs install:: $(ELF_LIB) installdirs
-       $(INSTALL_PROGRAM) $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
-       $(STRIP) --strip-debug \
-               $(DESTDIR)$(DLL_INSTALL_DIR)/$(ELF_LIB)
-       $(LN) -sf $(ELF_LIB) $(DESTDIR)$(DLL_INSTALL_DIR)/$(ELF_SONAME)
-       $(LN) -sf $(ELF_SONAME) $(DESTDIR)$(DLL_INSTALL_DIR)/$(ELF_IMAGE).so
-       -ldconfig
+       @echo " GEN_ELF_SOLIB $(ELF_LIB)"
+       @(cd elfshared; $(CC) --shared -o $(ELF_LIB) $(LDFLAGS) \
+               -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)
+
+installdirs-elf-lib::
+       @echo " MKINSTALLDIRS $(ELF_INSTALL_DIR) $(libdir)"
+       @$(MKINSTALLDIRS) $(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-strip: install
+       @echo " STRIP-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
+       @$(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 \
+               --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)
 
 clean::
        $(RM) -rf elfshared