target.make: Set thread library in AUXILIARY_OBJC_LIBS. Set

reentrant flags for all targets if threaded. Remove duplicates.
Update docs


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@17284 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2003-07-22 03:03:27 +00:00
parent 1f24f55031
commit 85750bd41e
5 changed files with 38 additions and 73 deletions

View file

@ -1,3 +1,13 @@
2003-07-21 Adam Fedor <fedor@gnu.org>
* target.make: Set thread library in AUXILIARY_OBJC_LIBS. Set
reentrant flags for all targets if threaded. Remove duplicates.
* Documentation/README.MinGW: Updated for default flattened
structure.
* Documentation/gnustep-howto.texi: Idem.
Mon Jul 21 10:42:42 2003 Nicola Pero <n.pero@mi.flashnet.it>
* debugapp.in: Detect core files with name core.xxx, not just

View file

@ -194,8 +194,8 @@ First, in the shell window in which you have set up your GNUstep
environment, type
./configure --prefix=$GNUSTEP_SYSTEM_ROOT \
--libdir=$GNUSTEP_SYSTEM_ROOT/Libraries/ix86/mingw32 \
--includedir=$GNUSTEP_SYSTEM_ROOT/Headers
--libdir=$GNUSTEP_SYSTEM_ROOT/Library/Libraries \
--includedir=$GNUSTEP_SYSTEM_ROOT/Library/Headers
Now you can now build and install it simply by typing:
@ -218,9 +218,9 @@ libiconv
Get the binary package from
http://www.zlatkovic.com/projects/libxml/index.html
Unpack this and
cp include/iconv.h $GNUSTEP_SYSTEM_ROOT/Headers
cp lib/iconv.lib $GNUSTEP_SYSTEM_ROOT/Libraries/ix86/mingw32/libiconv.a
cp lib/iconv.dll $GNUSTEP_SYSTEM_ROOT/Tools/ix86/mingw32/iconv.dll
cp include/iconv.h $GNUSTEP_SYSTEM_ROOT/Library/Headers
cp lib/iconv.lib $GNUSTEP_SYSTEM_ROOT/Library/Libraries/libiconv.a
cp lib/iconv.dll $GNUSTEP_SYSTEM_ROOT/Tools/iconv.dll
libtiff, libjpeg, and zlib
Needed for image handling support in the GNUstep gui libary
@ -235,9 +235,9 @@ libtiff, libjpeg, and zlib
http://prdownloads.sourceforge.net/gnuwin32/zlib-1.1.4-bin.zip
Unpack and install
the header (.h) files in $GNUSTEP_SYSTEM_ROOT/Headers
the library (.lib) files in $GNUSTEP_SYSTEM_ROOT/Libraries/ix86/mingw32
the dll files in $GNUSTEP_SYSTEM_ROOT/Tools/ix86/mingw32
the header (.h) files in $GNUSTEP_SYSTEM_ROOT/Library/Headers
the library (.lib) files in $GNUSTEP_SYSTEM_ROOT/Library/Libraries
the dll files in $GNUSTEP_SYSTEM_ROOT/Tools
Be sure to rename the .lib files to .a!
@ -256,10 +256,10 @@ libxml2
http://www.zlatkovic.com/projects/libxml/binaries.html
Unpack this and
cd include
tar -cf - libxml | (cd $GNUSTEP_SYSTEM_ROOT/Headers; tar -xvf -)
tar -cf - libxml | (cd $GNUSTEP_SYSTEM_ROOT/Library/Headers; tar -xvf -)
cd ../lib
cp libxml2.lib $GNUSTEP_SYSTEM_ROOT/Libraries/ix86/mingw32/libxml2.a
cp libxml2.dll $GNUSTEP_SYSTEM_ROOT/Tools/ix86/mingw32
cp libxml2.lib $GNUSTEP_SYSTEM_ROOT/Library/Libraries/libxml2.a
cp libxml2.dll $GNUSTEP_SYSTEM_ROOT/Tools
openssl
Needed for the SSL bundle, providing HTTPS support for NSURL.
@ -268,9 +268,9 @@ openssl
Get the binary package from
http://www.kix.or.jp/~fujino/openssl
Unpack this and
tar -cf - openssl | (cd $GNUSTEP_SYSTEM_ROOT/Headers; tar -xvf -)
cp *.lib $GNUSTEP_SYSTEM_ROOT/Libraries/ix86/mingw32
cp *.dll *.exe $GNUSTEP_SYSTEM_ROOT/Tools/ix86/mingw32
tar -cf - openssl | (cd $GNUSTEP_SYSTEM_ROOT/Library/Headers; tar -xvf -)
cp *.lib $GNUSTEP_SYSTEM_ROOT/Library/Libraries
cp *.dll *.exe $GNUSTEP_SYSTEM_ROOT/Tools

View file

@ -357,7 +357,7 @@ time and priority to get this done. You can ask about or lobby for this -
see @url{http://sources.redhat.com/gdb/}.
There are patches available on the gnustep web site if you want
to compile your own gdb (see @url{http://www.gnustep.org/pub/gnustep/patches}).
to compile your own gdb (see @url{ftp://ftp.gnustep.org/pub/gnustep/patches}).
@c -------------------------------------------------------------------

View file

@ -344,8 +344,8 @@ app:
@item gdomap - Put this in a system startup file, like @file{/etc/rc.local} or @file{/etc/rc.d/rc.local} (customize for your system)
@example
GNUSTEP_SYSTEM_ROOT=/usr/GNUstep/System
if [ -f $GNUSTEP_SYSTEM_ROOT/Tools/ix86/linux-gnu/gdomap ]; then
$GNUSTEP_SYSTEM_ROOT/Tools/ix86/linux-gnu/gdomap
if [ -f $GNUSTEP_SYSTEM_ROOT/Tools/gdomap ]; then
$GNUSTEP_SYSTEM_ROOT/Tools/gdomap
fi
@end example
@item gdnc - Start after sourcing @file{GNUstep.sh} (e.g. in .profile)

View file

@ -34,7 +34,15 @@ endif
#
# 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)
ifeq ($(shared), no)
TARGET_SYSTEM_LIBS += $(objc_threaded)
endif
endif
ifeq ($(findstring mingw32, $(GNUSTEP_TARGET_OS)), mingw32)
TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) \
@ -44,64 +52,11 @@ endif
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
#