diff options
| author | Andreas Baumann <abaumann@yahoo.com> | 2009-02-18 13:46:20 +0100 |
|---|---|---|
| committer | Andreas Baumann <abaumann@yahoo.com> | 2009-02-18 13:46:20 +0100 |
| commit | a8641ba2d12b073089db0c042c57e2393e42cec0 (patch) | |
| tree | 0f55b6dfa74659e086a1130ed0d0372d898286ef | |
| parent | d288a0228398b789a4b33a50db5262d72af90dde (diff) | |
| download | wolfbones-a8641ba2d12b073089db0c042c57e2393e42cec0.tar.gz wolfbones-a8641ba2d12b073089db0c042c57e2393e42cec0.tar.bz2 | |
fixed extensions for binares on Cygwin
| -rwxr-xr-x | makefiles/guess_env | 20 | ||||
| -rw-r--r-- | makefiles/platform.mk | 4 | ||||
| -rw-r--r-- | tests/daemon/GNUmakefile | 2 | ||||
| -rw-r--r-- | tests/port/GNUmakefile | 4 |
4 files changed, 25 insertions, 5 deletions
diff --git a/makefiles/guess_env b/makefiles/guess_env index 81900e5..f503a3c 100755 --- a/makefiles/guess_env +++ b/makefiles/guess_env @@ -12,6 +12,8 @@ case "$UNAME_SYSTEM.$UNAME_RELEASE" in OS_MINOR_VERSION=`echo $UNAME_RELEASE | cut -d . -f 2` INSTALL='install' LIBS_DL='-ldl' + BIN_EXTENSION='' + SHLIB_EXTENSION='.so' ;; FreeBSD*) PLATFORM=FREEBSD @@ -20,6 +22,8 @@ case "$UNAME_SYSTEM.$UNAME_RELEASE" in INSTALL='install' LIBS_DL= LIBS_SSP= + BIN_EXTENSION='' + SHLIB_EXTENSION='.so' ;; OpenBSD*) PLATFORM=OPENBSD @@ -28,6 +32,8 @@ case "$UNAME_SYSTEM.$UNAME_RELEASE" in INSTALL='install' LIBS_DL= LIBS_SSP= + BIN_EXTENSION='' + SHLIB_EXTENSION='.so' ;; NetBSD*) PLATFORM=NETBSD @@ -36,6 +42,8 @@ case "$UNAME_SYSTEM.$UNAME_RELEASE" in INSTALL='install' LIBS_DL= LIBS_SSP= + BIN_EXTENSION='' + SHLIB_EXTENSION='.so' ;; SunOS*) PLATFORM=SUNOS @@ -44,6 +52,8 @@ case "$UNAME_SYSTEM.$UNAME_RELEASE" in INSTALL='/usr/ucb/install' LIBS_DL='-ldl' LIBS_SSP= + BIN_EXTENSION='' + SHLIB_EXTENSION='.so' ;; CYGWIN_NT*) PLATFORM=CYGWIN @@ -52,6 +62,8 @@ case "$UNAME_SYSTEM.$UNAME_RELEASE" in OS_MINOR_VERSION=`echo $_tmp | cut -d . -f 2` INSTALL='install' LIBS_SSP= + BIN_EXTENSION='.exe' + SHLIB_EXTENSION='.so' ;; *) @@ -97,6 +109,12 @@ case "$1" in --libs-ssl) echo $LIBS_SSL ;; + + --bin-extension) echo $BIN_EXTENSION + ;; + + --shlib-extension) echo $SHLIB_EXTENSION + ;; --gcc-major-version) echo $GCC_MAJOR_VERSION ;; @@ -115,6 +133,8 @@ OS_MAJOR_VERSION = $OS_MAJOR_VERSION OS_MINOR_VERSION = $OS_MINOR_VERSION LIBS_DL = $LIBS_DL LIBS_SSL = $LIBS_SSL +BIN_EXTENSION = $BIN_EXTENSION +SHLIB_EXTENSION = $SHLIB_EXTENSION GCC_MAJOR_VERSION = $GCC_MAJOR_VERSION GCC_MINOR_VERSION = $GCC_MINOR_VERSION INSTALL = $INSTALL diff --git a/makefiles/platform.mk b/makefiles/platform.mk index f759cf7..ba96ee5 100644 --- a/makefiles/platform.mk +++ b/makefiles/platform.mk @@ -28,8 +28,8 @@ PLATFORM_COMPILE_FLAGS = \ LIBS_DL = $(shell $(TOPDIR)/makefiles/guess_env --libs-dl) LIBS_SSP = $(shell $(TOPDIR)/makefiles/guess_env --libs-ssl) -EXE = -SO = .so +EXE = $(shell $(TOPDIR)/makefiles/guess_env --bin-extension) +SO = $(shell $(TOPDIR)/makefiles/guess_env --shlib-extension) GCC_MAJOR_VERSION = $(shell $(TOPDIR)/makefiles/guess_env --gcc-major-version) GCC_MINOR_VERSION = $(shell $(TOPDIR)/makefiles/guess_env --gcc-minor-version) diff --git a/tests/daemon/GNUmakefile b/tests/daemon/GNUmakefile index 9141db6..1c88a31 100644 --- a/tests/daemon/GNUmakefile +++ b/tests/daemon/GNUmakefile @@ -8,7 +8,7 @@ INCLUDE_LIBS = \ INCLUDE_DIRS = -I$(TOPDIR)/include/wolf -I. BINS = \ - testd + testd$(EXE) OBJS = \ testd_cmdline.o diff --git a/tests/port/GNUmakefile b/tests/port/GNUmakefile index 74e16cf..228fe92 100644 --- a/tests/port/GNUmakefile +++ b/tests/port/GNUmakefile @@ -7,8 +7,8 @@ INCLUDE_DIRS = \ -I$(TOPDIR)/include/wolf -I. -I$(TOPDIR)/src BINS = \ - test_strdup \ - test_strerror_r + test_strdup$(EXE) \ + test_strerror_r$(EXE) -include $(TOPDIR)/makefiles/sub.mk |