From 2a39b32b1aa90a15132785e652f64b44bf8c90f0 Mon Sep 17 00:00:00 2001 From: Guenter Knauf Date: Thu, 9 Apr 2009 03:13:51 +0000 Subject: [PATCH] some minor Makefile tweaks; mainly for crosscompiling. --- nw/Makefile.netware | 12 ++++++------ nw/test/Makefile.netware | 8 ++++---- win32/Makefile.win32 | 14 +++++++------- win32/test/Makefile.win32 | 17 +++++++++-------- 4 files changed, 26 insertions(+), 25 deletions(-) diff --git a/nw/Makefile.netware b/nw/Makefile.netware index 63d2306..270211b 100644 --- a/nw/Makefile.netware +++ b/nw/Makefile.netware @@ -5,7 +5,7 @@ ## ## Comments to: Guenter Knauf ## -## $Id: Makefile.netware,v 1.13 2009/03/06 07:25:37 gknauf Exp $ +## $Id: Makefile.netware,v 1.14 2009/04/09 03:13:51 gknauf Exp $ # ######################################################################### @@ -21,7 +21,7 @@ endif # Edit the path below to point to the base of your OpenSSL package. ifndef OPENSSL_PATH -OPENSSL_PATH = ../../openssl-0.9.8j +OPENSSL_PATH = ../../openssl-0.9.8k endif # Edit the path below to point to your Distribution folder. @@ -76,7 +76,7 @@ ifdef METROWERKS MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support/Metrowerks Support CC = mwccnlm else - CC = gcc + CC = $(CROSSPREFIX)gcc endif CP = cp -afv # RM = rm -f @@ -119,12 +119,12 @@ else CFLAGS += -align 1 endif else -LD = nlmconv +LD = $(CROSSPREFIX)nlmconv LDFLAGS = -T -AR = ar +AR = $(CROSSPREFIX)ar ARFLAGS = -cq LIBEXT = a -RANLIB = ranlib +RANLIB = $(CROSSPREFIX)ranlib CFLAGS += -fno-builtin -fpcc-struct-return -fno-strict-aliasing CFLAGS += -Wall # -pedantic #CFLAGS += -Wno-pointer-sign diff --git a/nw/test/Makefile.netware b/nw/test/Makefile.netware index 5f9115e..09614e7 100644 --- a/nw/test/Makefile.netware +++ b/nw/test/Makefile.netware @@ -5,7 +5,7 @@ ## ## Comments to: Guenter Knauf ## -## $Id: Makefile.netware,v 1.9 2009/03/06 07:25:37 gknauf Exp $ +## $Id: Makefile.netware,v 1.10 2009/04/09 03:13:52 gknauf Exp $ # ######################################################################### @@ -21,7 +21,7 @@ endif # Edit the path below to point to the base of your OpenSSL package. ifndef OPENSSL_PATH -OPENSSL_PATH = ../../../openssl-0.9.8j +OPENSSL_PATH = ../../../openssl-0.9.8k endif # Edit the var below to enable static linking of libssh2 and libz @@ -70,7 +70,7 @@ ifdef METROWERKS MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support/Metrowerks Support CC = mwccnlm else - CC = gcc + CC = $(CROSSPREFIX)gcc endif CP = cp -afv # RM = rm -f @@ -131,7 +131,7 @@ SDK_CLIB = $(NDK_ROOT)/nwsdk SDK_LIBC = $(NDK_ROOT)/libc SNPRINTF = $(NDKBASE)/snprintf -INCLUDES = -I. -I../../include +INCLUDES = -I.. -I../../include LDLIBS = diff --git a/win32/Makefile.win32 b/win32/Makefile.win32 index c4c7878..b6e394b 100644 --- a/win32/Makefile.win32 +++ b/win32/Makefile.win32 @@ -5,7 +5,7 @@ ## ## Comments to: Guenter Knauf ## -## $Id: Makefile.win32,v 1.10 2009/03/06 07:25:37 gknauf Exp $ +## $Id: Makefile.win32,v 1.11 2009/04/09 03:13:52 gknauf Exp $ # ######################################################################### @@ -18,7 +18,7 @@ WITH_ZLIB = 1 # Edit the path below to point to the base of your OpenSSL package. ifndef OPENSSL_PATH -OPENSSL_PATH = ../../openssl-0.9.8j +OPENSSL_PATH = ../../openssl-0.9.8k endif # Edit the path below to point to your Distribution folder. @@ -63,7 +63,7 @@ endif ifdef METROWERKS CC = mwcc else - CC = $(CRPREFIX)gcc + CC = $(CROSSPREFIX)gcc endif CP = cp -afv # RM = rm -f @@ -91,13 +91,13 @@ CFLAGS += -nostdinc -gccinc -msgstyle gcc -inline off -opt nointrinsics -proc 58 CFLAGS += -ir "$(METROWERKS)/MSL" -ir "$(METROWERKS)/Win32-x86 Support" CFLAGS += -w on,nounused,nounusedexpr # -ansi strict else -LD = $(CRPREFIX)gcc -RC = $(CRPREFIX)windres +LD = $(CROSSPREFIX)gcc +RC = $(CROSSPREFIX)windres LDFLAGS = -s -shared -Wl,--out-implib,$(TARGET)dll.a -AR = $(CRPREFIX)ar +AR = $(CROSSPREFIX)ar ARFLAGS = -cq LIBEXT = a -RANLIB = $(CRPREFIX)ranlib +RANLIB = $(CROSSPREFIX)ranlib #LDLIBS += -lwsock32 LDLIBS += -lws2_32 RCFLAGS = -O coff -i diff --git a/win32/test/Makefile.win32 b/win32/test/Makefile.win32 index 7c5f628..f9ac1b5 100644 --- a/win32/test/Makefile.win32 +++ b/win32/test/Makefile.win32 @@ -5,7 +5,7 @@ ## ## Comments to: Guenter Knauf ## -## $Id: Makefile.win32,v 1.7 2009/03/06 07:25:49 gknauf Exp $ +## $Id: Makefile.win32,v 1.8 2009/04/09 03:14:05 gknauf Exp $ # ######################################################################### @@ -16,7 +16,7 @@ endif # Edit the path below to point to the base of your OpenSSL package. ifndef OPENSSL_PATH -OPENSSL_PATH = ../../../openssl-0.9.8j +OPENSSL_PATH = ../../../openssl-0.9.8k endif # Edit the var below to enable static linking of libssh2 and libz @@ -51,7 +51,7 @@ endif ifdef METROWERKS CC = mwcc else - CC = gcc + CC = $(CROSSPREFIX)gcc endif CP = cp -afv # RM = rm -f @@ -79,19 +79,20 @@ CFLAGS += -nostdinc -gccinc -msgstyle gcc -inline off -opt nointrinsics -proc 58 CFLAGS += -ir "$(METROWERKS)/MSL" -ir "$(METROWERKS)/Win32-x86 Support" CFLAGS += -w on,nounused,nounusedexpr # -ansi strict else -LD = gcc -RC = windres +LD = $(CROSSPREFIX)gcc +RC = $(CROSSPREFIX)windres LDFLAGS = -s -AR = ar +AR = $(CROSSPREFIX)ar ARFLAGS = -cq LIBEXT = a #LDLIBS += -lwsock32 LDLIBS += -lws2_32 RCFLAGS = -O coff -i -CFLAGS += -fno-strict-aliasing -Wall -Wno-unused # -pedantic +CFLAGS += -fno-strict-aliasing +CFLAGS += -Wall #-Wno-unused #-pedantic endif -INCLUDES = -I. -I.. -I../../include +INCLUDES = -I.. -I../../include INCLUDES += -I$(OPENSSL_PATH)/outinc -I$(OPENSSL_PATH)/outinc/openssl #LIBPATH += -L$(OPENSSL_PATH)/out LIBPATH += -L..