From 16edb1560061074175b4a63af678e357a163f0e8 Mon Sep 17 00:00:00 2001 From: Gisle Vanem Date: Mon, 15 Nov 2004 10:38:34 +0000 Subject: Added revision id, test for USE_ARES. Uses Makefile.inc. --- src/makefile.dj | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/makefile.dj b/src/makefile.dj index de2e8fbc6..d3167a5c1 100644 --- a/src/makefile.dj +++ b/src/makefile.dj @@ -1,4 +1,6 @@ # +# $Id$ +# # Adapted for djgpp2 / Watt-32 / DOS by # Gisle Vanem # @@ -6,22 +8,28 @@ DEPEND_PREREQ = config.h hugehelp.c include ../packages/DOS/common.dj +include Makefile.inc ifeq ($(USE_SSL),1) EX_LIBS += $(OPENSSL_ROOT)/lib/libssl.a $(OPENSSL_ROOT)/lib/libcrypt.a endif +ifeq ($(USE_ARES),1) + EX_LIBS += $(ARES_ROOT)/libcares.a +endif + ifeq ($(USE_ZLIB),1) EX_LIBS += $(ZLIB_ROOT)/libz.a + CFLAGS += -DUSE_MANUAL endif EX_LIBS += $(WATT32_ROOT)/lib/libwatt.a -CFLAGS += -DUSE_MANUAL -DUSE_ENVIRONMENT +CFLAGS += -DUSE_ENVIRONMENT -PROGRAM = ../curl.exe -SOURCES = getpass.c homedir.c hugehelp.c main.c urlglob.c writeenv.c writeout.c -OBJECTS = $(addprefix $(OBJ_DIR)/, $(SOURCES:.c=.o)) +PROGRAM = curl.exe +CSOURCES = $(CURL_SOURCES) +OBJECTS = $(addprefix $(OBJ_DIR)/, $(CURL_SOURCES:.c=.o)) all: $(OBJ_DIR) config.h $(PROGRAM) @@ -68,4 +76,4 @@ djgpp/writeenv.o: writeenv.c setup.h config.h ../lib/config.dj ../lib/setup.h \ djgpp/writeout.o: writeout.c setup.h config.h ../lib/config.dj ../lib/setup.h \ ../lib/config.h ../include/curl/curl.h ../include/curl/curlver.h \ ../include/curl/easy.h ../include/curl/multi.h \ - ../include/curl/mprintf.h writeout.h + ../include/curl/mprintf.h writeout.h \ No newline at end of file -- cgit v1.2.3