janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +01:00
Code Activity

lib.mk, rules.mk, make-version-script.sh: Fix versionscript handling

Browse source
This commit is contained in:
Jan Lindemann 2005-04-05 08:50:22 +00:00 • committed by Jan Lindemann
commit 087ed3b7b3
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/lib.mk
View file

@ -11,7 +11,7 @@ all: $(LIB_SO) $(LINKS_SO)
include $(MODDIR)/make/rules.mk include $(MODDIR)/make/rules.mk
install: $(LOCAL_TARGETS) all $(INSTALLED_LIB_A) $(INSTALLED_LIB_SO) $(INSTALLED_LINKS_SO) install: $(LOCAL_TARGETS) all $(INSTALLED_LIB_A) $(INSTALLED_LIB_SO) $(INSTALLED_LINKS_SO)
clean: local_libclean clean: libclean local_libclean
distclean: clean distclean: clean
local_libclean: local_libclean:
rm -rf *.a *.o *.so.* *.so *~ st* .*.swp *.done rm -rf *.a *.o *.so.* *.so *~ st* .*.swp *.done

5
make/rules.mk
View file

@ -44,8 +44,7 @@ version.ldscript:
$(MOD_SCRIPT_DIR)/make_version_script.sh $(BINARY_VERSION) > $@ $(MOD_SCRIPT_DIR)/make_version_script.sh $(BINARY_VERSION) > $@
$(LIB_SO): version.ldscript $(LIB_A) $(LIB_SO): version.ldscript $(LIB_A)
$(CC) -shared -Wl,--whole-archive,-soname=$(notdir $@) $(filter-out version.ldscript, $<) \ $(CC) -shared -Wl,--whole-archive,-soname=$(notdir $@) $^ -Wl,--no-whole-archive \
-Wl,--no-whole-archive -Wl,--version-script=version.ldscript \
$(filter-out -l$(LIBNAME),$(LDFLAGS)) -o $@ $(filter-out -l$(LIBNAME),$(LDFLAGS)) -o $@
$(TOPDIR)/include: $(TOPDIR)/include:
@ -201,7 +200,7 @@ localclean: $(LOCAL_CLEAN)
rm -rf $(CLEAN) rm -rf $(CLEAN)
libclean: libclean:
rm -rf $(LIB_A) $(LIB_SO) rm -rf $(LIB_A) $(LIB_SO) version.ldscript
vcdistclean: vcdistclean:
rm -rf *.plg *.opt *.ncb Debug *.exe dist *.ilk rm -rf *.plg *.opt *.ncb Debug *.exe dist *.ilk

10
scripts/make-version-script.sh
View file

@ -32,8 +32,10 @@
version_tag=$1 version_tag=$1
cat << EOT cat << EOT
$version_tag { VERSION {
global: $version_tag {
*; global:
}; *;
};
}
EOT EOT