X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Makefile.netware;h=e1a8a5523ca07bdabb345699e254b7b648d7f494;hb=refs%2Fheads%2Ftizen_6.5_base;hp=1eeca1e9023262f62692698c64a0ceb0c7dc5e01;hpb=63627fa5ab35fde4c98bfaa6c423bbed52d2f9d5;p=platform%2Fupstream%2Fc-ares.git

diff --git a/Makefile.netware b/Makefile.netware
index 1eeca1e..e1a8a55 100644
--- a/Makefile.netware
+++ b/Makefile.netware
@@ -20,7 +20,7 @@ endif
 TARGETS = adig.nlm ahost.nlm acountry.nlm
 LTARGET = libcares.$(LIBEXT)
 VERSION	= $(LIBCARES_VERSION)
-COPYR	= Copyright (C) 1996 - 2008, Daniel Stenberg, <daniel@haxx.se>
+COPYR	= $(LIBCARES_COPYRIGHT_STR)
 DESCR	= cURL $(subst .def,,$(notdir $@)) $(LIBCARES_VERSION_STR) - http://curl.haxx.se
 MTSAFE	= YES
 STACK	= 64000
@@ -34,7 +34,7 @@ ifndef LIBARCH
 LIBARCH = LIBC
 endif
 
-# must be equal to NDEBUG or DEBUG, CURLDEBUG
+# must be equal to NDEBUG or DEBUG
 ifndef DB
 DB	= NDEBUG
 endif
@@ -103,8 +103,12 @@ AR	= ar
 ARFLAGS	= -cq
 LIBEXT	= a
 RANLIB	= ranlib
-CFLAGS	+= -fno-builtin -fpcc-struct-return -fno-strict-aliasing
-CFLAGS	+= -Wall -Wno-format -Wno-uninitialized # -pedantic
+CFLAGS  += -m32
+CFLAGS  += -fno-builtin -fno-strict-aliasing
+ifeq ($(findstring gcc,$(CC)),gcc)
+CFLAGS  += -fpcc-struct-return
+endif
+CFLAGS  += -Wall # -pedantic
 ifeq ($(LIBARCH),LIBC)
 	PRELUDE = $(SDK_LIBC)/imports/libcpre.gcc.o
 else
@@ -130,9 +134,7 @@ else
 	# INCLUDES += -I$(SDK_CLIB)/include/nlm/obsolete
 	# INCLUDES += -I$(SDK_CLIB)/include
 endif
-ifeq ($(DB),CURLDEBUG)
-INCLUDES += -I../include
-endif
+
 CFLAGS	+= -I. $(INCLUDES)
 
 ifeq ($(MTSAFE),YES)
@@ -142,7 +144,7 @@ ifeq ($(MTSAFE),NO)
 	XDCOPT = -u
 endif
 
-ifeq ($(findstring linux,$(OSTYPE)),linux)
+ifeq ($(findstring /sh,$(SHELL)),/sh)
 DL	= '
 #-include $(NDKBASE)/nlmconv/ncpfs.inc
 endif
@@ -344,12 +346,13 @@ else
 	@echo $(DL)#define SEND_TYPE_ARG3 size_t$(DL) >> $@
 	@echo $(DL)#define SEND_TYPE_ARG4 int$(DL) >> $@
 	@echo $(DL)#define SEND_TYPE_RETV ssize_t$(DL) >> $@
-	@echo $(DL)#define SIZEOF_STRUCT_IN6_ADDR 16$(DL) >> $@
 endif
 	@echo $(DL)#define HAVE_ARPA_INET_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_ASSERT_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_ERRNO_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_ERR_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_FCNTL_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_GETENV 1$(DL) >> $@
 	@echo $(DL)#define HAVE_GETHOSTBYADDR 1$(DL) >> $@
 	@echo $(DL)#define HAVE_GETHOSTBYNAME 1$(DL) >> $@
 	@echo $(DL)#define HAVE_GETHOSTNAME 1$(DL) >> $@
@@ -389,8 +392,6 @@ endif
 	@echo $(DL)#define HAVE_UTIME_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_WRITEV 1$(DL) >> $@
 	@echo $(DL)#define RETSIGTYPE void$(DL) >> $@
-	@echo $(DL)#define SIZEOF_INT 4$(DL) >> $@
-	@echo $(DL)#define SIZEOF_STRUCT_IN_ADDR 4$(DL) >> $@
 	@echo $(DL)#define STDC_HEADERS 1$(DL) >> $@
 	@echo $(DL)#define TIME_WITH_SYS_TIME 1$(DL) >> $@
 ifdef NW_WINSOCK
@@ -415,15 +416,15 @@ ares_build.h: Makefile.netware FORCE
 	@echo $(DL)** Do not edit this file - it is created by make!$(DL) >> $@
 	@echo $(DL)** All your changes will be lost!!$(DL) >> $@
 	@echo $(DL)*/$(DL) >> $@
+	@echo $(DL)#ifndef NETWARE$(DL) >> $@
+	@echo $(DL)#error This $(notdir $@) is created for NetWare platform!$(DL) >> $@
+	@echo $(DL)#endif$(DL) >> $@
 	@echo $(DL)#ifndef __CARES_BUILD_H$(DL) >> $@
 	@echo $(DL)#define __CARES_BUILD_H$(DL) >> $@
 ifeq ($(LIBARCH),CLIB)
 	@echo $(DL)#define CARES_TYPEOF_ARES_SOCKLEN_T int$(DL) >> $@
-	@echo $(DL)#define CARES_SIZEOF_ARES_SOCKLEN_T 4$(DL) >> $@
 else
 	@echo $(DL)#define CARES_TYPEOF_ARES_SOCKLEN_T unsigned int$(DL) >> $@
-	@echo $(DL)#define CARES_SIZEOF_ARES_SOCKLEN_T 4$(DL) >> $@
 endif
-	@echo $(DL)#define CARES_SIZEOF_LONG 4$(DL) >> $@
 	@echo $(DL)typedef CARES_TYPEOF_ARES_SOCKLEN_T ares_socklen_t;$(DL) >> $@
 	@echo $(DL)#endif /* __CARES_BUILD_H */$(DL) >> $@