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

Makefile changes, etc

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@3464 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 1998-12-15 19:20:50 +00:00
parent 16b8484677
commit 56f43dcd4d
5 changed files with 29 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
Tue Dec 15 12:36:52 1998 Adam Fedor <fedor@ultra.doc.com>
* target.make (BUNDLE_LD): Change to $(CC).
(SHARED_LIB_LINK_CMD): Set shared name using major version num.
* library.make (VERSION_MAJOR_LIBRARY_FILE): name using major
version number.
* configure.in (ac_cv_objc_threaded): Put the result of
objc_threaded conftest in config.cache file (patch from Matthias
Klose <doko@cs.tu-berlin.de>).
Mon Dec 7 09:58:01 1998 Adam Fedor <fedor@ultra.doc.com>
* target.make: Add FreeBSD target for shared libs.

3
configure vendored
View file

@ -1639,6 +1639,8 @@ if test x"$objc_threaded" = x""; then
else
echo "$ac_t""yes" 1>&6
fi
ac_cv_objc_threaded=$objc_threaded
#--------------------------------------------------------------------
@ -1804,6 +1806,7 @@ s%@X_LIBS@%$X_LIBS%g
s%@DPS_DEFINE@%$DPS_DEFINE%g
s%@ac_cv_library_combo@%$ac_cv_library_combo%g
s%@objc_threaded@%$objc_threaded%g
s%@ac_cv_objc_threaded@%$ac_cv_objc_threaded%g
CEOF
EOF

2
configure.in
View file

@ -178,7 +178,9 @@ if test x"$objc_threaded" = x""; then
else
AC_MSG_RESULT(yes)
fi
ac_cv_objc_threaded=$objc_threaded
AC_SUBST(objc_threaded)
AC_SUBST(ac_cv_objc_threaded)
#--------------------------------------------------------------------
# Produce the output files

2
library.make
View file

@ -66,10 +66,12 @@ 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}'`
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)
endif
ifeq ($(strip $(HEADER_FILES_DIR)),)

20
target.make
View file

@ -242,17 +242,19 @@ endif
ifeq ($(GNUSTEP_TARGET_OS), linux-gnu)
HAVE_SHARED_LIBS = yes
SHARED_LIB_LINK_CMD = \
$(CC) -shared -Wl,-soname,$(VERSION_LIBRARY_FILE) \
$(CC) -shared -Wl,-soname,$(VERSION_MAJOR_LIBRARY_FILE) \
-o $(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE) $^ ;\
(cd $(GNUSTEP_OBJ_DIR); \
rm -f $(LIBRARY_FILE); \
$(LN_S) $(VERSION_LIBRARY_FILE) $(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); \
)
SHARED_CFLAGS += -fPIC
SHARED_LIBEXT = .so
HAVE_BUNDLES = yes
BUNDLE_LD = gcc
BUNDLE_LD = $(CC)
BUNDLE_CFLAGS += -fPIC
BUNDLE_LDFLAGS += -shared
ADDITIONAL_LDFLAGS += -rdynamic
@ -311,7 +313,7 @@ SHARED_CFLAGS += -shared
SHARED_LIBEXT = .so
HAVE_BUNDLES = yes
BUNDLE_LD = gcc
BUNDLE_LD = $(CC)
#BUNDLE_CFLAGS +=
BUNDLE_LDFLAGS += -shared
#ADDITIONAL_LDFLAGS += -rdynamic
@ -338,7 +340,7 @@ SHARED_CFLAGS += -fpic -fPIC
SHARED_LIBEXT = .so
HAVE_BUNDLES = yes
BUNDLE_LD = gcc
BUNDLE_LD = $(CC)
BUNDLE_CFLAGS += -fPIC
#BUNDLE_LDFLAGS += -shared -mimpure-text
BUNDLE_LDFLAGS += -nodefaultlibs -Xlinker -r
@ -366,7 +368,7 @@ SHARED_CFLAGS += -fpic -fPIC
SHARED_LIBEXT = .so
HAVE_BUNDLES = yes
BUNDLE_LD = gcc
BUNDLE_LD = $(CC)
BUNDLE_CFLAGS += -fPIC
#BUNDLE_LDFLAGS += -shared -mimpure-text
BUNDLE_LDFLAGS += -nodefaultlibs -Xlinker -r
@ -392,7 +394,7 @@ SHARED_CFLAGS += -fPIC
SHARED_LIBEXT = .sl
HAVE_BUNDLES = yes
BUNDLE_LD = gcc
BUNDLE_LD = $(CC)
BUNDLE_CFLAGS += -fPIC
BUNDLE_LDFLAGS += -nodefaultlibs -Xlinker -r
endif