mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-15 12:03:31 +01:00
make: Clean up library dependencies
Clean up dependencies of version.ldscript, libdir.done in defs.mk and rules.mk.
This commit is contained in:
parent
d25fddcd63
commit
81de57cbd9
3 changed files with 11 additions and 11 deletions
|
|
@ -54,10 +54,10 @@ lib%.so: %.o
|
|||
$(CC) $(LDFLAGS) $^ -o $@
|
||||
endif
|
||||
|
||||
version.ldscript:
|
||||
$(VERSION_SCRIPT):
|
||||
$(MOD_SCRIPT_DIR)/make_version_script.sh $(BINARY_VERSION) > $@
|
||||
|
||||
$(LIB_SO): version.ldscript $(LIB_A)
|
||||
$(LIB_SO): $(VERSION_SCRIPT) $(LIB_A)
|
||||
$(CC) -shared -Wl,--whole-archive,-soname=$(notdir $@) $^ -Wl,--no-whole-archive \
|
||||
$(filter-out -l$(LIBNAME),$(LDFLAGS)) -o $@
|
||||
|
||||
|
|
@ -120,10 +120,12 @@ $(INSTALL_HDRDIR) $(INSTALL_BINDIR) $(INSTALL_LIBDIR) $(INSTALL_MKDIR):
|
|||
|
||||
$(INSTALLED_LIB_SO) $(INSTALLED_LIB_A): $(TOPDIR)/libdir.done
|
||||
|
||||
$(TOPDIR)/libdir.done: $(INSTALL_LIBDIR)
|
||||
$(TOPDIR)/libdir.done:
|
||||
if [ -n "$(INSTALL_LIBDIR)" ]; then mkdir -p $(INSTALL_LIBDIR); fi
|
||||
touch $@
|
||||
|
||||
hdrdir.done: $(INSTALL_HDRDIR)
|
||||
hdrdir.done:
|
||||
if [ -n "$(INSTALL_HDRDIR)" ]; then mkdir -p $(INSTALL_HDRDIR); fi
|
||||
touch $@
|
||||
|
||||
$(LINKS_SO):
|
||||
|
|
@ -236,7 +238,7 @@ localclean: $(LOCAL_CLEAN)
|
|||
rm -rf $(CLEAN)
|
||||
|
||||
libclean:
|
||||
rm -rf $(LIB_A) $(LIB_SO) version.ldscript
|
||||
rm -rf $(LIB_A) $(LIB_SO) $(VERSION_SCRIPT)
|
||||
|
||||
vcdistclean:
|
||||
rm -rf *.plg *.opt *.ncb Debug *.exe dist *.ilk
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue