diff options
| -rw-r--r-- | lib/Makefile.netware | 27 | ||||
| -rw-r--r-- | src/Makefile.netware | 20 |
2 files changed, 25 insertions, 22 deletions
diff --git a/lib/Makefile.netware b/lib/Makefile.netware index 41c95fd30..40613c862 100644 --- a/lib/Makefile.netware +++ b/lib/Makefile.netware @@ -99,9 +99,9 @@ ifeq ($(LIBARCH),LIBC) PRELUDE = $(SDK_LIBC)/imports/libcpre.o CFLAGS += -align 4 else + # PRELUDE = $(SDK_CLIB)/imports/clibpre.o + # to avoid the __init... whoes dont use prelude from NDK PRELUDE = "$(MWCW_PATH)/libraries/runtime/prelude.obj" - # PRELUDE += "$(MWCW_PATH)/libraries/runtime/mwcrtl.lib" - PRELUDE += "$(MWCW_PATH)/libraries/runtime/output/clib/mwcrtl.lib" CFLAGS += -include "$(MWCW_PATH)/headers/nlm_clib_prefix.h" CFLAGS += -align 1 endif @@ -117,8 +117,10 @@ CFLAGS += -Wall # -pedantic ifeq ($(LIBARCH),LIBC) PRELUDE = $(SDK_LIBC)/imports/libcpre.gcc.o else - PRELUDE = $(SDK_CLIB)/imports/clibpre.gcc.o - PRELUDE += c:/usr/lib/gcc-lib/i586-netware/3.2.3/libgcc.$(LIBEXT) + # PRELUDE = $(SDK_CLIB)/imports/clibpre.gcc.o + # to avoid the __init... whoes dont use prelude from NDK + # http://www.gknw.net/development/mk_nlm/gcc_pre.exe + PRELUDE = $(NDK_ROOT)/pre/prelude.o CFLAGS += -include $(NDKBASE)/nlmconv/genlm.h endif endif @@ -175,7 +177,6 @@ else # CFLAGS += -DNETDB_USE_INTERNET # for now disable LDAP unless we have coded a CLIB dynaloader. DISABLE_LDAP = 1 - endif CFLAGS += $(INCLUDES) @@ -345,28 +346,28 @@ config.h: Makefile.netware @echo $(DL)#define VERSION "$(LIBCURL_VERSION_STR)"$(DL) >> $@ @echo $(DL)#define PACKAGE_BUGREPORT "a suitable curl mailing list => http://curl.haxx.se/mail/"$(DL) >> $@ ifeq ($(LIBARCH),CLIB) - @echo $(DL)#define OS "i586-clib-NetWare"$(DL) >> $@ + @echo $(DL)#define OS "i586-pc-clib-NetWare"$(DL) >> $@ @echo $(DL)#define NETDB_USE_INTERNET 1$(DL) >> $@ - @echo $(DL)#define CURL_DISABLE_CRYPTO_AUTH 1$(DL) >> $@ - @echo $(DL)#define HAVE_INET_NTOA 1$(DL) >> $@ +# @echo $(DL)#define CURL_DISABLE_CRYPTO_AUTH 1$(DL) >> $@ # @echo $(DL)#define HAVE_INET_NTOA_R_DECL 1$(DL) >> $@ - @echo $(DL)#define HAVE_LL 1$(DL) >> $@ @echo $(DL)#define HAVE_STRICMP 1$(DL) >> $@ @echo $(DL)#define socklen_t int$(DL) >> $@ @echo $(DL)#define DL_LDAP_FILE "ldapsdk.nlm"$(DL) >> $@ else - @echo $(DL)#define OS "i586-libc-NetWare"$(DL) >> $@ + @echo $(DL)#define OS "i586-pc-libc-NetWare"$(DL) >> $@ @echo $(DL)#define HAVE_DLFCN_H 1$(DL) >> $@ @echo $(DL)#define HAVE_DLOPEN 1$(DL) >> $@ @echo $(DL)#define HAVE_FTRUNCATE 1$(DL) >> $@ @echo $(DL)#define HAVE_GETTIMEOFDAY 1$(DL) >> $@ @echo $(DL)#define HAVE_INET_PTON 1$(DL) >> $@ - @echo $(DL)#define HAVE_LIMITS_H 1$(DL) >> $@ @echo $(DL)#define HAVE_INTTYPES_H 1$(DL) >> $@ + @echo $(DL)#define HAVE_LIMITS_H 1$(DL) >> $@ + @echo $(DL)#define HAVE_LONGLONG 1$(DL) >> $@ @echo $(DL)#define HAVE_STDINT_H 1$(DL) >> $@ @echo $(DL)#define HAVE_STRCASECMP 1$(DL) >> $@ @echo $(DL)#define HAVE_STRLCAT 1$(DL) >> $@ @echo $(DL)#define HAVE_STRLCPY 1$(DL) >> $@ + @echo $(DL)#define HAVE_STRTOLL 1$(DL) >> $@ @echo $(DL)#define HAVE_SYS_PARAM_H 1$(DL) >> $@ @echo $(DL)#define HAVE_SYS_SELECT_H 1$(DL) >> $@ @echo $(DL)#define HAVE_TERMIOS_H 1$(DL) >> $@ @@ -376,6 +377,8 @@ else @echo $(DL)#define HAVE_STRUCT_SOCKADDR_IN6 1$(DL) >> $@ @echo $(DL)#define SIZEOF_STRUCT_IN6_ADDR 16$(DL) >> $@ @echo $(DL)#define DL_LDAP_FILE "lldapsdk.nlm"$(DL) >> $@ +# @echo $(DL)#define _FILE_OFFSET_BITS 64$(DL) >> $@ +# @echo $(DL)#define _LARGE_FILES 64$(DL) >> $@ endif @echo $(DL)#define HAVE_ARPA_INET_H 1$(DL) >> $@ @echo $(DL)#define HAVE_ASSERT_H 1$(DL) >> $@ @@ -388,8 +391,8 @@ endif @echo $(DL)#define HAVE_GMTIME_R 1$(DL) >> $@ @echo $(DL)#define HAVE_INET_ADDR 1$(DL) >> $@ @echo $(DL)#define HAVE_INET_NTOA 1$(DL) >> $@ + @echo $(DL)#define HAVE_LL 1$(DL) >> $@ @echo $(DL)#define HAVE_LOCALTIME_R 1$(DL) >> $@ - @echo $(DL)#define HAVE_LONGLONG 1$(DL) >> $@ @echo $(DL)#define HAVE_MALLOC_H 1$(DL) >> $@ @echo $(DL)#define HAVE_NETINET_IN_H 1$(DL) >> $@ @echo $(DL)#define HAVE_RECV 1$(DL) >> $@ diff --git a/src/Makefile.netware b/src/Makefile.netware index fe44b0f34..12a9244d0 100644 --- a/src/Makefile.netware +++ b/src/Makefile.netware @@ -96,9 +96,9 @@ ifeq ($(LIBARCH),LIBC) PRELUDE = $(SDK_LIBC)/imports/libcpre.o CFLAGS += -align 4 else + # PRELUDE = $(SDK_CLIB)/imports/clibpre.o + # to avoid the __init... whoes dont use prelude from NDK PRELUDE = "$(MWCW_PATH)/libraries/runtime/prelude.obj" - # PRELUDE += "$(MWCW_PATH)/libraries/runtime/mwcrtl.lib" - PRELUDE += "$(MWCW_PATH)/libraries/runtime/output/clib/mwcrtl.lib" CFLAGS += -include "$(MWCW_PATH)/headers/nlm_clib_prefix.h" CFLAGS += -align 1 endif @@ -111,8 +111,10 @@ CFLAGS += -Wall # -pedantic ifeq ($(LIBARCH),LIBC) PRELUDE = $(SDK_LIBC)/imports/libcpre.gcc.o else - PRELUDE = $(SDK_CLIB)/imports/clibpre.gcc.o - PRELUDE += c:/usr/lib/gcc-lib/i586-netware/3.2.3/libgcc.$(LIBEXT) + # PRELUDE = $(SDK_CLIB)/imports/clibpre.gcc.o + # to avoid the __init... whoes dont use prelude from NDK + # http://www.gknw.net/development/mk_nlm/gcc_pre.exe + PRELUDE = $(NDK_ROOT)/pre/prelude.o CFLAGS += -include $(NDKBASE)/nlmconv/genlm.h endif endif @@ -327,24 +329,23 @@ config.h: Makefile.netware @echo $(DL)#define VERSION "$(LIBCURL_VERSION_STR)"$(DL) >> $@ @echo $(DL)#define PACKAGE_BUGREPORT "a suitable curl mailing list => http://curl.haxx.se/mail/"$(DL) >> $@ ifeq ($(LIBARCH),CLIB) - @echo $(DL)#define OS "i586-clib-NetWare"$(DL) >> $@ + @echo $(DL)#define OS "i586-pc-clib-NetWare"$(DL) >> $@ @echo $(DL)#define NETDB_USE_INTERNET 1$(DL) >> $@ - @echo $(DL)#define CURL_DISABLE_CRYPTO_AUTH 1$(DL) >> $@ - @echo $(DL)#define HAVE_INET_NTOA 1$(DL) >> $@ # @echo $(DL)#define HAVE_INET_NTOA_R_DECL 1$(DL) >> $@ @echo $(DL)#define HAVE_LL 1$(DL) >> $@ @echo $(DL)#define HAVE_STRICMP 1$(DL) >> $@ @echo $(DL)#define socklen_t int$(DL) >> $@ @echo $(DL)#define pressanykey PressAnyKeyToContinue$(DL) >> $@ else - @echo $(DL)#define OS "i586-libc-NetWare"$(DL) >> $@ + @echo $(DL)#define OS "i586-pc-libc-NetWare"$(DL) >> $@ @echo $(DL)#define HAVE_DLFCN_H 1$(DL) >> $@ @echo $(DL)#define HAVE_DLOPEN 1$(DL) >> $@ @echo $(DL)#define HAVE_FTRUNCATE 1$(DL) >> $@ @echo $(DL)#define HAVE_GETTIMEOFDAY 1$(DL) >> $@ @echo $(DL)#define HAVE_INET_PTON 1$(DL) >> $@ - @echo $(DL)#define HAVE_LIMITS_H 1$(DL) >> $@ @echo $(DL)#define HAVE_INTTYPES_H 1$(DL) >> $@ + @echo $(DL)#define HAVE_LIMITS_H 1$(DL) >> $@ + @echo $(DL)#define HAVE_LONGLONG 1$(DL) >> $@ @echo $(DL)#define HAVE_STDINT_H 1$(DL) >> $@ @echo $(DL)#define HAVE_STRCASECMP 1$(DL) >> $@ @echo $(DL)#define HAVE_STRLCAT 1$(DL) >> $@ @@ -362,7 +363,6 @@ endif @echo $(DL)#define HAVE_GETHOSTBYADDR 1$(DL) >> $@ @echo $(DL)#define HAVE_INET_ADDR 1$(DL) >> $@ @echo $(DL)#define HAVE_INET_NTOA 1$(DL) >> $@ - @echo $(DL)#define HAVE_LONGLONG 1$(DL) >> $@ @echo $(DL)#define HAVE_MALLOC_H 1$(DL) >> $@ @echo $(DL)#define HAVE_NETINET_IN_H 1$(DL) >> $@ @echo $(DL)#define HAVE_RECV 1$(DL) >> $@ |