[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC]: target.make simplification
From: |
Adam Fedor |
Subject: |
[RFC]: target.make simplification |
Date: |
Sat, 19 Jul 2003 21:49:03 -0600 |
User-agent: |
Mozilla/5.0 (X11; U; Linux ppc; en-US; rv:1.1) Gecko/20020905 |
I've tried to simplify the TARGET_SYTEM_LIBS here since almost every
system uses the same thing. Looks ok?
2003-07-19 Adam Fedor <fedor@gnu.org>
* target.make: Set thread library in AUXILIARY_OBJC_LIBS. Set
reentrant flags for all targets if threaded. Remove duplicates.
Index: target.make
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/target.make,v
retrieving revision 1.146
diff -u -r1.146 target.make
--- target.make 16 Jul 2003 08:43:06 -0000 1.146
+++ target.make 20 Jul 2003 03:43:46 -0000
@@ -34,7 +34,12 @@
#
# Target specific libraries
#
-TARGET_SYSTEM_LIBS = $(CONFIG_SYSTEM_LIBS)
+TARGET_SYSTEM_LIBS = $(CONFIG_SYSTEM_LIBS) -lm
+ifneq ("$(objc_threaded)","")
+ INTERNAL_CFLAGS = -D_REENTRANT
+ INTERNAL_OBJCFLAGS = -D_REENTRANT
+ AUXILIARY_OBJC_LIBS += $(objc_threaded)
+endif
ifeq ($(findstring mingw32, $(GNUSTEP_TARGET_OS)), mingw32)
TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) \
@@ -44,64 +49,11 @@
ifeq ($(findstring cygwin, $(GNUSTEP_TARGET_OS)), cygwin)
TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) -lm -I.
endif
-ifeq ($(GNUSTEP_TARGET_OS),linux-gnu)
- ifeq ("$(objc_threaded)","")
- TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) -lm
- else
- INTERNAL_CFLAGS = -D_REENTRANT
- INTERNAL_OBJCFLAGS = -D_REENTRANT
- TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) $(objc_threaded) -lm
- endif
-endif
ifeq ($(findstring solaris, $(GNUSTEP_TARGET_OS)), solaris)
- ifeq ("$(objc_threaded)","")
- TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) -lsocket -lnsl -lm
- else
- INTERNAL_CFLAGS = -D_REENTRANT
- INTERNAL_OBJCFLAGS = -D_REENTRANT
- TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) $(objc_threaded) -lsocket
-lnsl -lm
- endif
-endif
-ifeq ($(findstring irix, $(GNUSTEP_TARGET_OS)), irix)
- ifeq ("$(objc_threaded)","")
- TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) -lm
- else
- INTERNAL_CFLAGS = -D_REENTRANT
- INTERNAL_OBJCFLAGS = -D_REENTRANT
- TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) $(objc_threaded) -lm
- endif
-endif
-ifeq ($(findstring hpux, $(GNUSTEP_TARGET_OS)), hpux)
-TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) -lm
+ TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) -lsocket -lnsl -lm
endif
ifeq ($(findstring sysv4.2, $(GNUSTEP_TARGET_OS)), sysv4.2)
- TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) -lsocket -lnsl -lm
-endif
-ifeq ($(findstring aix4.1, $(GNUSTEP_TARGET_OS)), aix4.1)
-TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) -lm
-endif
-ifeq ($(findstring freebsd, $(GNUSTEP_TARGET_OS)), freebsd)
- ifeq ("$(objc_threaded)","")
- TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) -lm
- else
- INTERNAL_CFLAGS = -D_REENTRANT
- INTERNAL_OBJCFLAGS = -D_REENTRANT
- TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) $(objc_threaded) -lm
- endif
-endif
-ifeq ($(findstring netbsd, $(GNUSTEP_TARGET_OS)), netbsd)
- TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) -lm
- ifneq ("$(objc_threaded)","")
- INTERNAL_CFLAGS = -D_REENTRANT
- INTERNAL_OBJCFLAGS = -D_REENTRANT
- AUXILIARY_OBJC_LIBS += $(objc_threaded)
- endif
-endif
-ifeq ($(findstring openbsd, $(GNUSTEP_TARGET_OS)), openbsd)
-TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) -lm
-endif
-ifeq ($(findstring osf, $(GNUSTEP_TARGET_OS)), osf)
-TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) -lm
+ TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) -lsocket -lnsl -lm
endif
#
- [RFC]: target.make simplification,
Adam Fedor <=