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

Renamed some variables used internally when linking libraries, for consistency

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@14876 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2002-10-30 12:42:22 +00:00
parent 5bd3e91e66
commit 31b6c57045
3 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Wed Oct 30 12:38:42 2002 Nicola Pero <n.pero@mi.flashnet.it>
* target.make (AFTER_INSTALL_STATIC_LIB_COMMAND): Renamed
to AFTER_INSTALL_STATIC_LIB_CMD for consistency with other
variables.
(AFTER_INSTALL_SHARED_LIB_COMMAND): Idem.
* common.make (AFTER_INSTALL_LIBRARY_CMD): Updated for changes.
Mon Oct 28 10:48:26 2002 Nicola Pero <n.pero@mi.flashnet.it>
* Instance/framework.make (Resources/Info.plist): Use

4
common.make
View file

@ -391,12 +391,12 @@ ifeq ($(shared), yes)
OBJ_DIR_PREFIX += shared_
INTERNAL_OBJCFLAGS += $(SHARED_CFLAGS)
INTERNAL_CFLAGS += $(SHARED_CFLAGS)
AFTER_INSTALL_LIBRARY_CMD = $(AFTER_INSTALL_SHARED_LIB_COMMAND)
AFTER_INSTALL_LIBRARY_CMD = $(AFTER_INSTALL_SHARED_LIB_CMD)
else
LIB_LINK_CMD = $(STATIC_LIB_LINK_CMD)
FRAMEWORK_LINK_CMD = $(STATIC_FRAMEWORK_LINK_CMD)
OBJ_DIR_PREFIX += static_
AFTER_INSTALL_LIBRARY_CMD = $(AFTER_INSTALL_STATIC_LIB_COMMAND)
AFTER_INSTALL_LIBRARY_CMD = $(AFTER_INSTALL_STATIC_LIB_CMD)
LIBRARY_NAME_SUFFIX := s$(LIBRARY_NAME_SUFFIX)
endif

20
target.make
View file

@ -107,13 +107,13 @@ HAVE_SHARED_LIBS = no
STATIC_LIB_LINK_CMD = \
$(AR) $(ARFLAGS) $(AROUT)$(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE) $^;\
$(RANLIB) $(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE)
AFTER_INSTALL_STATIC_LIB_COMMAND = \
AFTER_INSTALL_STATIC_LIB_CMD = \
(cd $(FINAL_LIBRARY_INSTALL_DIR); \
$(RANLIB) $(VERSION_LIBRARY_FILE))
SHARED_LIB_LINK_CMD =
SHARED_CFLAGS =
SHARED_LIBEXT =
AFTER_INSTALL_SHARED_LIB_COMMAND = \
AFTER_INSTALL_SHARED_LIB_CMD = \
(cd $(FINAL_LIBRARY_INSTALL_DIR); \
rm -f $(LIBRARY_FILE); \
$(LN_S) $(VERSION_LIBRARY_FILE) $(LIBRARY_FILE))
@ -193,7 +193,7 @@ STATIC_LIB_LINK_CMD = \
# This doesn't work with 4.1, what about others?
#ADDITIONAL_LDFLAGS += -Wl,-read_only_relocs,suppress
AFTER_INSTALL_STATIC_LIB_COMMAND =
AFTER_INSTALL_STATIC_LIB_CMD =
SHARED_CFLAGS += -dynamic
SHARED_LIBEXT = .dylib
@ -292,7 +292,7 @@ STATIC_LIB_LINK_CMD = \
# This doesn't work with 4.1, what about others?
#ADDITIONAL_LDFLAGS += -Wl,-read_only_relocs,suppress
AFTER_INSTALL_STATIC_LIB_COMMAND =
AFTER_INSTALL_STATIC_LIB_CMD =
SHARED_CFLAGS += -dynamic -fno-common
SHARED_LIBEXT = .dylib
@ -407,7 +407,7 @@ STATIC_LIB_LINK_CMD = \
/usr/bin/libtool $(STATIC_LD_PREFLAGS) -static $(ARCH_FLAGS) -o $@ $^ \
$(STATIC_LD_POSTFLAGS)
AFTER_INSTALL_STATIC_LIB_COMMAND = \
AFTER_INSTALL_STATIC_LIB_CMD = \
(cd $(FINAL_LIBRARY_INSTALL_DIR); \
$(RANLIB) $(VERSION_LIBRARY_FILE))
@ -476,7 +476,7 @@ STATIC_LIB_LINK_CMD = \
# This doesn't work with 4.1, what about others?
#ADDITIONAL_LDFLAGS += -Wl,-read_only_relocs,suppress
AFTER_INSTALL_STATIC_LIB_COMMAND =
AFTER_INSTALL_STATIC_LIB_CMD =
SHARED_CFLAGS += -dynamic
SHARED_LIBEXT = .a
@ -540,7 +540,7 @@ STATIC_LIB_LINK_CMD = \
ADDITIONAL_LDFLAGS += -Wl,-read_only_relocs,suppress
AFTER_INSTALL_STATIC_LIB_COMMAND =
AFTER_INSTALL_STATIC_LIB_CMD =
SHARED_CFLAGS += -dynamic
SHARED_LIBEXT = .a
@ -577,7 +577,7 @@ SHARED_FRAMEWORK_LINK_CMD = \
(cd $(FRAMEWORK_LIBRARY_DIR_NAME); \
rm -f $(FRAMEWORK_LIBRARY_FILE); \
$(LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE) $(FRAMEWORK_LIBRARY_FILE))
AFTER_INSTALL_SHARED_LIB_COMMAND = \
AFTER_INSTALL_SHARED_LIB_CMD = \
(cd $(FINAL_LIBRARY_INSTALL_DIR); \
rm -f $(LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
$(LN_S) $(VERSION_LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
@ -667,7 +667,7 @@ SHARED_FRAMEWORK_LINK_CMD = \
rm -f $(FRAMEWORK_LIBRARY_FILE) $(SONAME_FRAMEWORK_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_CMD = \
(cd $(FINAL_LIBRARY_INSTALL_DIR); \
rm -f $(LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
$(LN_S) $(VERSION_LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
@ -964,7 +964,7 @@ SHARED_FRAMEWORK_LINK_CMD = \
(cd $(FRAMEWORK_LIBRARY_DIR_NAME); \
rm -f $(FRAMEWORK_LIBRARY_FILE); \
$(LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE) $(FRAMEWORK_LIBRARY_FILE))
AFTER_INSTALL_SHARED_LIB_COMMAND = \
AFTER_INSTALL_SHARED_LIB_CMD = \
(cd $(FINAL_LIBRARY_INSTALL_DIR); \
rm -f $(LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
$(LN_S) $(VERSION_LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \