Fixed build error

[platform/upstream/c-ares.git] / Makefile.dj

diff --git a/Makefile.dj b/Makefile.dj
index c215abf..799611f 100644 (file)
--- a/Makefile.dj
+++ b/Makefile.dj
@@ -1,32 +1,25 @@
 #
 # c-ares Makefile for djgpp/gcc/Watt-32.
-#   By Gisle Vanem <giva@bgnett.no> 2004.
+#   By Gisle Vanem <gvanem@broadpark.no> 2004.
 #
-# $Id$
+
 
 TOPDIR = ..
 
-include ../packages/DOS/common.dj
+DEPEND_PREREQ = ares_config.h
 
+include ../packages/DOS/common.dj
 include Makefile.inc
 
-CFLAGS += -DWATT32 -DHAVE_AF_INET6 -DHAVE_PF_INET6 -DHAVE_FIONBIO \
-          -DHAVE_STRUCT_IN6_ADDR -DHAVE_SOCKADDR_IN6_SIN6_SCOPE_ID \
-          -DHAVE_SYS_TIME_H -DHAVE_STRUCT_SOCKADDR_IN6 -DHAVE_STRUCT_ADDRINFO \
-          -DHAVE_SIGNAL_H -DHAVE_SIG_ATOMIC_T -DRETSIGTYPE='void' -DHAVE_PROCESS_H \
-          -DHAVE_ARPA_NAMESER_H -DNS_INADDRSZ=4 -DHAVE_RECV -DHAVE_SEND \
-          -DSEND_TYPE_ARG1='int'   -DSEND_QUAL_ARG2='const' \
-          -DSEND_TYPE_ARG2='void*' -DSEND_TYPE_ARG3='int' \
-          -DSEND_TYPE_ARG4='int'   -DSEND_TYPE_RETV='int' \
-          -DRECV_TYPE_ARG1='int'   -DRECV_TYPE_ARG2='void*' \
-          -DRECV_TYPE_ARG3='int'   -DRECV_TYPE_ARG4='int' \
-          -DRECV_TYPE_RETV='int'   -DHAVE_STRUCT_TIMEVAL \
-          -UHAVE_CONFIG_H
+CFLAGS += -DWATT32 -Dselect=select_s
 
 LDFLAGS = -s
 
-ifeq ($(USE_DEBUG),1)
-  EX_LIBS = ../lib/libcurl.a
+ifeq ($(USE_CURLDEBUG),1)
+  EX_LIBS  = ../lib/libcurl.a
+  OBJ_HACK = $(OBJECTS)
+else
+  OBJ_HACK = libcares.a
 endif
 
 ifeq ($(USE_SSL),1)
@@ -35,7 +28,6 @@ endif
 
 ifeq ($(USE_ZLIB),1)
   EX_LIBS += $(ZLIB_ROOT)/libz.a
-  CFLAGS  += -DUSE_MANUAL
 endif
 
 ifeq ($(USE_IDNA),1)
@@ -46,24 +38,48 @@ EX_LIBS += $(WATT32_ROOT)/lib/libwatt.a
 
 OBJECTS = $(addprefix $(OBJ_DIR)/, $(CSOURCES:.c=.o))
 
-all: $(OBJ_DIR) libcares.a ahost.exe adig.exe
+all: $(OBJ_DIR) ares_config.h libcares.a ahost.exe adig.exe acountry.exe
        @echo Welcome to c-ares.
 
 libcares.a: $(OBJECTS)
        ar rs $@ $?
 
-ahost.exe: ahost.c libcares.a
+ares_config.h: config-dos.h
+       $(COPY) $^ $@
+
+ahost.exe: ahost.c $(OBJ_DIR)/ares_getopt.o $(OBJ_HACK)
+       $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(EX_LIBS)
+
+adig.exe: adig.c $(OBJ_DIR)/ares_getopt.o $(OBJ_HACK)
        $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(EX_LIBS)
 
-adig.exe: adig.c libcares.a
+acountry.exe: acountry.c $(OBJ_DIR)/ares_getopt.o $(OBJ_HACK)
        $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(EX_LIBS)
 
-clean:
-       rm -f $(OBJECTS) libcares.a
+# clean generated files
+#
+genclean:
+       - $(DELETE) ares_config.h
+
+# clean object files and subdir
+#
+objclean: genclean
+       - $(DELETE) $(OBJ_DIR)$(DS)*.o
+       - $(RMDIR) $(OBJ_DIR)
 
-vclean realclean: clean
-       rm -f ahost.exe adig.exe depend.dj
-       - rmdir $(OBJ_DIR)
+# clean without removing built library and programs
+#
+clean: objclean
+       - $(DELETE) depend.dj
+
+# clean everything
+#
+realclean vclean: clean
+       - $(DELETE) libcares.a
+       - $(DELETE) acountry.exe
+       - $(DELETE) adig.exe
+       - $(DELETE) ahost.exe
+       - $(DELETE) libcares.a
 
 -include depend.dj