Whamcloud - gitweb
git://git.whamcloud.com
/
tools
/
e2fsprogs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-15590 libext2fs: fix direct I/O read
[tools/e2fsprogs.git]
/
lib
/
Makefile.elf-lib
diff --git
a/lib/Makefile.elf-lib
b/lib/Makefile.elf-lib
index
ea600c7
..
f850f3d
100644
(file)
--- a/
lib/Makefile.elf-lib
+++ b/
lib/Makefile.elf-lib
@@
-24,7
+24,8
@@
image: $(ELF_LIB)
$(ELF_LIB): $(OBJS)
$(E) " GEN_ELF_SOLIB $(ELF_LIB)"
$(ELF_LIB): $(OBJS)
$(E) " GEN_ELF_SOLIB $(ELF_LIB)"
- $(Q) (cd elfshared; $(CC) --shared -o $(ELF_LIB) $(LDFLAGS) \
+ $(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)
-Wl,-soname,$(ELF_SONAME) $(OBJS) $(ELF_OTHER_LIBS))
$(Q) $(MV) elfshared/$(ELF_LIB) .
$(Q) $(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME)
@@
-34,24
+35,21
@@
$(ELF_LIB): $(OBJS)
$(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) $(ELF_LIB) $(ELF_SONAME))
installdirs-elf-lib::
$(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) $(ELF_LIB) $(ELF_SONAME))
installdirs-elf-lib::
- $(E) " MK
INSTALLDIRS
$(ELF_INSTALL_DIR) $(libdir)"
- $(Q) $(MK
INSTALLDIRS
) $(DESTDIR)$(ELF_INSTALL_DIR) \
+ $(E) " MK
DIR_P
$(ELF_INSTALL_DIR) $(libdir)"
+ $(Q) $(MK
DIR_P
) $(DESTDIR)$(ELF_INSTALL_DIR) \
$(DESTDIR)$(libdir)
installdirs:: installdirs-elf-lib
$(DESTDIR)$(libdir)
installdirs:: installdirs-elf-lib
-install-shlibs install:: $(ELF_LIB) installdirs-elf-lib
+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)"
$(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) $(LN_S) -f $(ELF_LIB) $(DESTDIR)$(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"
$(E) " SYMLINK $(libdir)/$(ELF_IMAGE).so"
- $(Q) if test "$(ELF_INSTALL_DIR)" = "$(libdir)"; then \
- $(LN_S) -f $(ELF_SONAME) $(DESTDIR)$(libdir)/$(ELF_IMAGE).so ; \
- else \
- $(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
- $(DESTDIR)$(libdir)/$(ELF_IMAGE).so; \
- fi
+ $(Q) $(INSTALL_SYMLINK) $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
+ $(libdir)/$(ELF_IMAGE).so $(DESTDIR)
$(E) " LDCONFIG"
$(Q) -$(LDCONFIG)
$(E) " LDCONFIG"
$(Q) -$(LDCONFIG)
@@
-60,7
+58,7
@@
install-strip: install
$(Q) $(STRIP) --strip-unneeded --remove-section=.comment \
--remove-section=.note $(DESTDIR)$(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
+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)
$(E) " STRIP-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
$(Q) $(STRIP) --strip-unneeded --remove-section=.comment \
--remove-section=.note $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)