Commit d532369b authored by gbazin's avatar gbazin
Browse files

* extras/contrib/bootstrap, extras/contrib/src/Makefile: cleanup (hopefully...

* extras/contrib/bootstrap, extras/contrib/src/Makefile: cleanup (hopefully without breaking anything).
parent 22a94562
......@@ -46,42 +46,69 @@ echo -e "# Automatically generated by bootstrap.\n# Make changes if you know wha
echo "BUILD = $BUILD" >> config.mak
echo "HOST = $HOST" >> config.mak
echo "PREFIX = `pwd`" >> config.mak
case $HOST in
ppc-darwin)
# Mac OS X < 10.4
echo "EXTRA_CPPFLAGS = -no-cpp-precomp" >> config.mak
echo "HAVE_DARWIN_OS = 1" >> config.mak
echo "EXTRA_CFLAGS =" >> config.mak
echo "EXTRA_CPPFLAGS = -no-cpp-precomp" >> config.mak
echo "EXTRA_LDLAGS =" >> config.mak
echo "PATH = /bin:/usr/bin" >> config.mak
;;
powerpc-apple-darwin8)
# Mac OS X 10.4
# Makefile cross compiling is only supported with gcc-4.0
# ENVP defines the oldest environment on which the program will be able to run
# SDK 10.2.8 requires gcc-3.3 (so we cannot use that SDK)
echo "HAVE_DARWIN_OS = 1" >> config.mak
echo "ENVP = MACOSX_DEPLOYMENT_TARGET=10.3" >> config.mak
echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.3.0.sdk" >> config.mak
# echo "EXTRA_CFLAGS = -D\${ENVP} -isysroot \${MACOSX_SDK}" >> config.mak
echo "EXTRA_CPPFLAGS = -no-cpp-precomp" >> config.mak
# echo "EXTRA_LDFLAGS = -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}" >> config.mak
echo "HAVE_DARWIN_OS = 1" >> config.mak
echo "PATH = /bin:/usr/bin" >> config.mak
;;
i586-pc-beos)
echo "HAVE_BEOS = 1" >> config.mak
echo "EXTRA_CFLAGS =" >> config.mak
echo "EXTRA_CPPFLAGS =" >> config.mak
if test -f /boot/beos/system/lib/libbind.so; then
echo "EXTRA_LDFLAGS = -lbind -lsocket" >> config.mak
else
echo "EXTRA_LDFLAGS = -lnet" >> config.mak
fi
if test "$HOST" = "$BUILD"; then
# Compiling on BeOS
echo "PATH = .:/boot/home/config/bin:/bin:/boot/apps:/boot/preferences:/boot/beos/apps:/boot/beos/preferences:/boot/develop/tools/gnupro/bin" >> config.mak
echo "LIBRARY_PATH = %A/lib:/boot/home/config/lib:/boot/beos/system/lib" >> config.mak
else
# Cross compiling from Linux
echo "PATH = /opt/beos-tools/bin:/opt/cross-tools/bin:/usr/bin:/bin" >> config.mak
fi
;;
i586-mingw32msvc)
echo "HAVE_WIN32 = 1" >> config.mak
echo "EXTRA_CFLAGS =" >> config.mak
echo "EXTRA_CPPFLAGS =" >> config.mak
echo "EXTRA_LDFLAGS =" >> config.mak
echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
echo "EXTRA_PATH =" >> config.mak
;;
i686-pc-cygwin)
echo "HAVE_WIN32 = 1" >> config.mak
echo "EXTRA_CFLAGS = -mno-cygwin" >> config.mak
echo "EXTRA_CPPFLAGS = -mno-cygwin" >> config.mak
echo "EXTRA_LDFLAGS = -mno-cygwin" >> config.mak
echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
echo "EXTRA_PATH =" >> config.mak
;;
*)
echo "EXTRA_CFLAGS =" >> config.mak
echo "EXTRA_CPPFLAGS =" >> config.mak
echo "EXTRA_LDFLAGS =" >> config.mak
echo "EXTRA_PATH =" >> config.mak
;;
esac
......@@ -103,5 +130,3 @@ elif svn help >/dev/null 2>&1; then
else
echo "You do not have a subversion client installed." >&2
fi
echo "PREFIX = `pwd`" >> config.mak
......@@ -32,29 +32,10 @@ include ./packages.mak
# Set a clean environment
# ***************************************************************************
ifdef HAVE_DARWIN_OS
export PATH = $(PREFIX)/bin:/bin:/usr/bin
export PATH := $(PREFIX)/bin:$(EXTRA_PATH):$(PATH)
export PKG_CONFIG_PATH
export DYLD_LIBRARY_PATH = $(PREFIX)/lib
endif
ifdef HAVE_BEOS
ifeq ($(HOST),$(BUILD))
# Compiling on BeOS
export PATH = $(PREFIX)/bin:.:/boot/home/config/bin:/bin:/boot/apps:/boot/preferences:/boot/beos/apps:/boot/beos/preferences:/boot/develop/tools/gnupro/bin
export LIBRARY_PATH = $(PREFIX)/lib:%A/lib:/boot/home/config/lib:/boot/beos/system/lib
else
# Cross compiling from Linux
export PATH = $(PREFIX)/bin:/opt/beos-tools/bin:/opt/cross-tools/bin:/usr/bin:/bin
endif
endif
ifdef HAVE_WIN32
export PATH := $(PREFIX)/bin:$(PATH)
export PKG_CONFIG_PATH = $(PREFIX)/lib/pkgconfig
#EXTRA_CPPFLAGS = /usr/win32/include
#EXTRA_LDFLAGS = /usr/win32/lib
endif
export LIBRARY_PATH := $(PREFIX)/lib:$(LIBRARY_PATH)
export CFLAGS = -I$(PREFIX)/include $(EXTRA_CFLAGS) $(EXTRA_CPPFLAGS)
export CPPFLAGS = -I$(PREFIX)/include $(EXTRA_CFLAGS) $(EXTRA_CPPFLAGS)
export CXXFLAGS = -I$(PREFIX)/include $(EXTRA_CFLAGS) $(EXTRA_CPPFLAGS)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment