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

Update versions

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@3499 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 1998-12-21 21:30:13 +00:00
parent fe294f8e2d
commit e1f0335193
4 changed files with 40 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
Mon Dec 21 11:04:45 1998 Matthias Klose <doko@cs.tu-berlin.de>
* common.make: New macros MAJOR_VERSION (0), MINOR_VERSION (5),
SUBMINOR_VERSION (0) forming VERSION.
* library.make: internal-uninstall-lib: rm SONAME_LIBRARY_FILE.
Rename VERSION_MAJOR_LIBRARY_FILE to SONAME_LIBRARY_FILE.
New macro SOVERSION.
* target.make: define -D_REENTRANT for linux-gnu objc_threaded.
For Solaris define AFTER_INSTALL_SHARED_LIB_COMMAND and set
shared object name for library.
Mon Dec 21 11:04:45 1998 Matthias Klose <doko@cs.tu-berlin.de>
* aggregate.make: Exit with original exit status from submakes.

5
common.make
View file

@ -23,7 +23,10 @@
SHELL = /bin/sh
# Default version
VERSION = 1.0.0
MAJOR_VERSION=1
MINOR_VERSION=0
SUBMINOR_VERSION=0
VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${SUBMINOR_VERSION}
#
# Scripts to run for parsing canonical names

5
library.make
View file

@ -66,12 +66,13 @@ ifeq ($(shared), yes)
LIBRARY_FILE = $(INTERNAL_library_NAME)$(LIBRARY_NAME_SUFFIX)$(SHARED_LIBEXT)
LIBRARY_FILE_EXT=$(SHARED_LIBEXT)
VERSION_LIBRARY_FILE = $(LIBRARY_FILE).$(VERSION)
VERSION_MAJOR_LIBRARY_FILE=$(LIBRARY_FILE).`echo $(VERSION)|awk -F. '{print $$1}'`
SOVERSION = `echo $(VERSION)|awk -F. '{print $$1}'`
SONAME_LIBRARY_FILE=$(LIBRARY_FILE).$(SOVERSION)
else
LIBRARY_FILE = $(INTERNAL_library_NAME)$(LIBRARY_NAME_SUFFIX)$(LIBEXT)
LIBRARY_FILE_EXT=$(LIBEXT)
VERSION_LIBRARY_FILE = $(LIBRARY_FILE)
VERSION_MAJOR_LIBRARY_FILE=$(LIBRARY_FILE)
SONAME_LIBRARY_FILE=$(LIBRARY_FILE)
endif
ifeq ($(strip $(HEADER_FILES_DIR)),)

34
target.make
View file

@ -39,6 +39,8 @@ ifeq ($(GNUSTEP_TARGET_OS),linux-gnu)
ifeq ("$(objc_threaded)","")
TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) -ldl -lm
else
INTERNAL_CFLAGS = -D_REENTRANT
INTERNAL_OBJCFLAGS = -D_REENTRANT
TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) $(objc_threaded) -ldl -lm
endif
endif
@ -242,18 +244,18 @@ endif
ifeq ($(GNUSTEP_TARGET_OS), linux-gnu)
HAVE_SHARED_LIBS = yes
SHARED_LIB_LINK_CMD = \
$(CC) -shared -Wl,-soname,$(VERSION_MAJOR_LIBRARY_FILE) \
$(CC) -shared -Wl,-soname,$(SONAME_LIBRARY_FILE) \
-o $(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE) $^ ;\
(cd $(GNUSTEP_OBJ_DIR); \
rm -f $(LIBRARY_FILE) $(VERSION_MAJOR_LIBRARY_FILE); \
$(LN_S) $(VERSION_LIBRARY_FILE) $(VERSION_MAJOR_LIBRARY_FILE); \
$(LN_S) $(VERSION_MAJOR_LIBRARY_FILE) $(LIBRARY_FILE); \
rm -f $(LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
$(LN_S) $(VERSION_LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
$(LN_S) $(SONAME_LIBRARY_FILE) $(LIBRARY_FILE); \
)
AFTER_INSTALL_SHARED_LIB_COMMAND = \
(cd $(GNUSTEP_LIBRARIES); \
rm -f $(LIBRARY_FILE) $(VERSION_MAJOR_LIBRARY_FILE); \
$(LN_S) $(VERSION_LIBRARY_FILE) $(VERSION_MAJOR_LIBRARY_FILE); \
$(LN_S) $(VERSION_MAJOR_LIBRARY_FILE) $(LIBRARY_FILE); \
rm -f $(LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
$(LN_S) $(VERSION_LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
$(LN_S) $(SONAME_LIBRARY_FILE) $(LIBRARY_FILE); \
)
SHARED_CFLAGS += -fPIC
@ -336,11 +338,19 @@ endif
ifeq ($(findstring solaris, $(GNUSTEP_TARGET_OS)), solaris)
HAVE_SHARED_LIBS = yes
SHARED_LIB_LINK_CMD = \
$(CC) -G -o $(VERSION_LIBRARY_FILE) $^ ;\
mv $(VERSION_LIBRARY_FILE) $(GNUSTEP_OBJ_DIR) ;\
(cd $(GNUSTEP_OBJ_DIR); \
rm -f $(LIBRARY_FILE); \
$(LN_S) $(VERSION_LIBRARY_FILE) $(LIBRARY_FILE))
$(CC) -G -Wl,-h,$(SONAME_LIBRARY_FILE) \
-o $(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE) $^ ;\
(cd $(GNUSTEP_OBJ_DIR); \
rm -f $(LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
$(LN_S) $(VERSION_LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
$(LN_S) $(SONAME_LIBRARY_FILE) $(LIBRARY_FILE); \
)
AFTER_INSTALL_SHARED_LIB_COMMAND = \
(cd $(GNUSTEP_LIBRARIES); \
rm -f $(LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
$(LN_S) $(VERSION_LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
$(LN_S) $(SONAME_LIBRARY_FILE) $(LIBRARY_FILE); \
)
SHARED_CFLAGS += -fpic -fPIC
SHARED_LIBEXT = .so