mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Remove/move duplicate setup
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@14992 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor
parent
9b636b8db2
commit
46a8a070e8
4 changed files with 27 additions and 57 deletions
11
ChangeLog
11
ChangeLog
|
|
@ -1,3 +1,14 @@
|
|||
2002-11-15 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* common.make: Remove duplicate OBJC_RUNTIME_LIB and FOUNDATION_LIB
|
||||
setup
|
||||
* library-combo.make (GNUSTEP_FND_DIR, RUNTIME_FLAG): Extra flags
|
||||
moved from common.make
|
||||
(FOUNDAION_LIB=gnu): setup moved from common.make.
|
||||
|
||||
* target.make (darwin5/NeXT cc) (DYLIB_EXTRA_FLAGS,
|
||||
DYLIB_DEF_FRAMEWORKS, DYLIB_DEF_LIBS): Comment out or remove.
|
||||
|
||||
Wed Nov 6 15:26:07 2002 Nicola Pero <n.pero@mi.flashnet.it>
|
||||
|
||||
* GNUmakefile.in (install): Fixed typo - was installing
|
||||
|
|
|
|||
51
common.make
51
common.make
|
|
@ -277,36 +277,6 @@ endif
|
|||
#
|
||||
# Determine Foundation header subdirectory based upon library combo
|
||||
#
|
||||
ifeq ($(FOUNDATION_LIB),gnu)
|
||||
GNUSTEP_FND_DIR = gnustep
|
||||
FOUNDATION_LIBRARY_NAME = gnustep-base
|
||||
FOUNDATION_LIBRARY_DEFINE = -DGNUSTEP_BASE_LIBRARY=1
|
||||
endif
|
||||
|
||||
ifeq ($(FOUNDATION_LIB),fd)
|
||||
GNUSTEP_FND_DIR = libFoundation
|
||||
FOUNDATION_LIBRARY_NAME = Foundation
|
||||
FOUNDATION_LIBRARY_DEFINE = -DLIB_FOUNDATION_LIBRARY=1
|
||||
ifeq ($(gc),yes)
|
||||
ifneq ($(leak),yes)
|
||||
FOUNDATION_LIBRARY_DEFINE += -DLIB_FOUNDATION_BOEHM_GC=1
|
||||
else
|
||||
FOUNDATION_LIBRARY_DEFINE += -DLIB_FOUNDATION_LEAK_GC=1
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(FOUNDATION_LIB),nx)
|
||||
GNUSTEP_FND_DIR = NeXT
|
||||
FOUNDATION_LIBRARY_NAME =
|
||||
FOUNDATION_LIBRARY_DEFINE = -DNeXT_Foundation_LIBRARY=1
|
||||
endif
|
||||
|
||||
ifeq ($(FOUNDATION_LIB),sun)
|
||||
GNUSTEP_FND_DIR = sun
|
||||
FOUNDATION_LIBRARY_DEFINE = -DSun_Foundation_LIBRARY=1
|
||||
endif
|
||||
|
||||
GNUSTEP_HEADERS_FND_DIRS = \
|
||||
$(GNUSTEP_USER_ROOT)/Headers/$(GNUSTEP_FND_DIR) \
|
||||
$(GNUSTEP_LOCAL_ROOT)/Headers/$(GNUSTEP_FND_DIR) \
|
||||
|
|
@ -338,27 +308,6 @@ OBJCFLAGS = $(OBJC_NO_IMPORT_FLAGS)
|
|||
CFLAGS =
|
||||
OBJ_DIR_PREFIX =
|
||||
|
||||
ifeq ($(OBJC_RUNTIME_LIB),gnu)
|
||||
RUNTIME_FLAG = -fgnu-runtime
|
||||
RUNTIME_DEFINE = -DGNU_RUNTIME=1
|
||||
endif
|
||||
|
||||
# GNU runtime compiled with Boehm GC
|
||||
ifeq ($(OBJC_RUNTIME_LIB),gnugc)
|
||||
RUNTIME_FLAG = -fgnu-runtime
|
||||
RUNTIME_DEFINE = -DGNU_RUNTIME=1 -DOBJC_WITH_GC=1
|
||||
ifeq ($(debug),yes)
|
||||
RUNTIME_DEFINE += -DGC_DEBUG
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(OBJC_RUNTIME_LIB),nx)
|
||||
ifneq ($(OBJC_COMPILER), NeXT)
|
||||
RUNTIME_FLAG = -fnext-runtime
|
||||
endif
|
||||
RUNTIME_DEFINE = -DNeXT_RUNTIME=1
|
||||
endif
|
||||
|
||||
#
|
||||
# Now decide whether to build shared objects or not. Nothing depending
|
||||
# on the value of the shared variable is allowed before this point!
|
||||
|
|
|
|||
|
|
@ -91,6 +91,7 @@ ifeq ($(OBJC_RUNTIME_LIB), gnu)
|
|||
OBJC_LIB_DIR =
|
||||
OBJC_LIBS = -lobjc
|
||||
OBJC_RUNTIME = GNU
|
||||
RUNTIME_FLAG = -fgnu-runtime
|
||||
RUNTIME_DEFINE = -DGNU_RUNTIME=1
|
||||
endif
|
||||
|
||||
|
|
@ -99,11 +100,18 @@ ifeq ($(OBJC_RUNTIME_LIB), gnugc)
|
|||
OBJC_LIB_DIR =
|
||||
OBJC_LIBS = -lobjc_gc -lgc
|
||||
OBJC_RUNTIME = GNU
|
||||
RUNTIME_DEFINE = -DGNU_RUNTIME=1
|
||||
RUNTIME_FLAG = -fgnu-runtime
|
||||
RUNTIME_DEFINE = -DGNU_RUNTIME=1 -DOBJC_WITH_GC=1
|
||||
ifeq ($(debug),yes)
|
||||
RUNTIME_DEFINE += -DGC_DEBUG
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(OBJC_RUNTIME_LIB), nx)
|
||||
OBJC_RUNTIME = NeXT
|
||||
ifneq ($(OBJC_COMPILER), NeXT)
|
||||
RUNTIME_FLAG = -fnext-runtime
|
||||
endif
|
||||
RUNTIME_DEFINE = -DNeXT_RUNTIME=1
|
||||
ifeq ($(FOUNDATION_LIB),gnu)
|
||||
OBJC_LIBS = -lobjc
|
||||
|
|
@ -120,6 +128,11 @@ FND_LIBS =
|
|||
#
|
||||
# Set the appropriate Foundation library
|
||||
#
|
||||
ifeq ($(FOUNDATION_LIB),gnu)
|
||||
GNUSTEP_FND_DIR = gnustep
|
||||
FOUNDATION_LIBRARY_NAME = gnustep-base
|
||||
FOUNDATION_LIBRARY_DEFINE = -DGNUSTEP_BASE_LIBRARY=1
|
||||
endif
|
||||
|
||||
#
|
||||
# Third-party foundations not using make package
|
||||
|
|
@ -143,6 +156,7 @@ endif
|
|||
ifeq ($(FOUNDATION_LIB),fd)
|
||||
-include $(GNUSTEP_MAKEFILES)/libFoundation.make
|
||||
|
||||
GNUSTEP_FND_DIR = libFoundation
|
||||
FND_DEFINE = -DLIB_FOUNDATION_LIBRARY=1
|
||||
FND_LDFLAGS =
|
||||
FND_LIBS = -lFoundation
|
||||
|
|
|
|||
|
|
@ -424,9 +424,7 @@ BUNDLE_LDFLAGS += -dynamic -flat_namespace -undefined warning $(ARCH_FLAGS)
|
|||
else
|
||||
# NeXT Compiler
|
||||
|
||||
DYLIB_EXTRA_FLAGS = -read_only_relocs warning -undefined warning -fno-common
|
||||
#DYLIB_DEF_FRAMEWORKS += -framework Foundation
|
||||
DYLIB_DEF_LIBS = -lobjc
|
||||
#DYLIB_EXTRA_FLAGS = -read_only_relocs warning -undefined warning -fno-common
|
||||
|
||||
SHARED_LIB_LINK_CMD = \
|
||||
$(CC) $(SHARED_LD_PREFLAGS) \
|
||||
|
|
@ -437,8 +435,6 @@ SHARED_LIB_LINK_CMD = \
|
|||
-install_name $(DYLIB_INSTALL_NAME) \
|
||||
-o $@ \
|
||||
$(INTERNAL_LIBRARIES_DEPEND_UPON) $(LIBRARIES_FOUNDATION_DEPEND_UPON) \
|
||||
$(DYLIB_DEF_FRAMEWORKS) \
|
||||
$(DYLIB_DEF_LIBS) \
|
||||
$^ $(SHARED_LD_POSTFLAGS); \
|
||||
(cd $(LIB_LINK_OBJ_DIR); rm -f $(LIB_LINK_FILE); \
|
||||
$(LN_S) $(LIB_LINK_VERSION_FILE) $(LIB_LINK_FILE))
|
||||
|
|
|
|||
Loading…
Reference in a new issue