gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-05-06 11:50:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* target.make (SHARED_FRAMEWORK_LINK_CMD): fix framework soname for

Browse source 
FreeBSD ELF.
* framework.make (internal-framework-install): handle symlink for
libxxx.so.n files. (patches by Kim Shrier <kim@tinker.com>)


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@9918 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Mirko Viviani 2001-05-10 20:07:23 +00:00
parent 723f9ee9ac
commit 15596298bc
3 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2001-05-10 Mirko Viviani <mirko.viviani@rccr.cremona.it>
* target.make (SHARED_FRAMEWORK_LINK_CMD): fix framework soname for
FreeBSD ELF.
* framework.make (internal-framework-install): handle symlink for
libxxx.so.n files. (patches by Kim Shrier <kim@tinker.com>)
2001-05-08 Adam Fedor <fedor@gnu.org> 2001-05-08 Adam Fedor <fedor@gnu.org>
* bundle.make ($(BUNDLE_DIR_NAME)/Contents/Resources): Remove * bundle.make ($(BUNDLE_DIR_NAME)/Contents/Resources): Remove

10
framework.make
View file

@ -102,8 +102,8 @@ FRAMEWORK_CURRENT_LIBRARY_DIR_NAME := $(FRAMEWORK_CURRENT_DIR_NAME)/$(GNUSTEP_TA
FRAMEWORK_LIBRARY_FILE = lib$(INTERNAL_framework_NAME)$(SHARED_LIBEXT) FRAMEWORK_LIBRARY_FILE = lib$(INTERNAL_framework_NAME)$(SHARED_LIBEXT)
FRAMEWORK_LIBRARY_FILE_EXT = $(SHARED_LIBEXT) FRAMEWORK_LIBRARY_FILE_EXT = $(SHARED_LIBEXT)
VERSION_FRAMEWORK_LIBRARY_FILE = $(FRAMEWORK_LIBRARY_FILE).$(VERSION) VERSION_FRAMEWORK_LIBRARY_FILE = $(FRAMEWORK_LIBRARY_FILE).$(VERSION)
SOVERSION = `echo $(VERSION)|awk -F. '{print $$1}'` SOVERSION = $(word 1,$(subst ., ,$(VERSION)))
SONAME_FRAMEWORK_FILE = $(FRAMEWORK_LIBRARY_FILE).$(SOVERSION) SONAME_FRAMEWORK_FILE = $(FRAMEWORK_LIBRARY_FILE).$(SOVERSION)
FRAMEWORK_FILE := $(FRAMEWORK_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE) FRAMEWORK_FILE := $(FRAMEWORK_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE)
@ -430,10 +430,16 @@ internal-framework-install:: $(FRAMEWORK_INSTALL_DIR) $(GNUSTEP_FRAMEWORKS_LIBRA
if test -f "$(FRAMEWORK_LIBRARY_FILE)"; then \ if test -f "$(FRAMEWORK_LIBRARY_FILE)"; then \
rm -f $(FRAMEWORK_LIBRARY_FILE); \ rm -f $(FRAMEWORK_LIBRARY_FILE); \
fi; \ fi; \
if test -f "$(SONAME_FRAMEWORK_FILE)"; then \
rm -f $(SONAME_FRAMEWORK_FILE); \
fi; \
if test -f "$(VERSION_FRAMEWORK_LIBRARY_FILE)"; then \ if test -f "$(VERSION_FRAMEWORK_LIBRARY_FILE)"; then \
rm -f $(VERSION_FRAMEWORK_LIBRARY_FILE); \ rm -f $(VERSION_FRAMEWORK_LIBRARY_FILE); \
fi; \ fi; \
$(LN_S) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(FRAMEWORK_LIBRARY_FILE) $(FRAMEWORK_LIBRARY_FILE); \ $(LN_S) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(FRAMEWORK_LIBRARY_FILE) $(FRAMEWORK_LIBRARY_FILE); \
if test -f "$(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(SONAME_FRAMEWORK_FILE)"; then \
$(LN_S) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(SONAME_FRAMEWORK_FILE) $(SONAME_FRAMEWORK_FILE); \
fi; \
$(LN_S) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE) $(VERSION_FRAMEWORK_LIBRARY_FILE);) $(LN_S) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE) $(VERSION_FRAMEWORK_LIBRARY_FILE);)
$(FRAMEWORK_DIR_NAME)/Resources $(FRAMEWORK_INSTALL_DIR):: $(FRAMEWORK_DIR_NAME)/Resources $(FRAMEWORK_INSTALL_DIR)::

7
target.make
View file

@ -561,14 +561,15 @@ SHARED_LIB_LINK_CMD = \
$(LN_S) $(VERSION_LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \ $(LN_S) $(VERSION_LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
$(LN_S) $(SONAME_LIBRARY_FILE) $(LIBRARY_FILE)) $(LN_S) $(SONAME_LIBRARY_FILE) $(LIBRARY_FILE))
SHARED_FRAMEWORK_LINK_CMD = \ SHARED_FRAMEWORK_LINK_CMD = \
$(CC) -shared -Wl,-soname,$(VERSION_FRAMEWORK_LIBRARY_FILE) \ $(CC) -shared -Wl,-soname,$(SONAME_FRAMEWORK_FILE) \
-o $(FRAMEWORK_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE) \ -o $(FRAMEWORK_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE) \
$^ $(ALL_FRAMEWORK_DIRS) \ $^ $(ALL_FRAMEWORK_DIRS) \
$(LIBRARIES_DEPEND_UPON) \ $(LIBRARIES_DEPEND_UPON) \
$(SHARED_LD_POSTFLAGS);\ $(SHARED_LD_POSTFLAGS);\
(cd $(FRAMEWORK_LIBRARY_DIR_NAME); \ (cd $(FRAMEWORK_LIBRARY_DIR_NAME); \
rm -f $(FRAMEWORK_LIBRARY_FILE); \ rm -f $(FRAMEWORK_LIBRARY_FILE) $(SONAME_FRAMEWORK_FILE); \
$(LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE) $(FRAMEWORK_LIBRARY_FILE)) $(LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE) $(SONAME_FRAMEWORK_FILE); \
$(LN_S) $(SONAME_FRAMEWORK_FILE) $(FRAMEWORK_LIBRARY_FILE))
AFTER_INSTALL_SHARED_LIB_COMMAND = \ AFTER_INSTALL_SHARED_LIB_COMMAND = \
(cd $(LIBRARY_INSTALL_DIR); \ (cd $(LIBRARY_INSTALL_DIR); \
rm -f $(LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \ rm -f $(LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \