From f671d0513ccc9cdcd7516c732c719b2f31a9578e Mon Sep 17 00:00:00 2001 From: Gunter Knauf Date: Tue, 14 Jul 2009 13:25:14 +0000 Subject: renamed generated config.h to curl_config.h in order to avoid clashes when libcurl is used with other projects which also have a config.h. --- src/makefile.dj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/makefile.dj') diff --git a/src/makefile.dj b/src/makefile.dj index 4a460bad9..6534dd11f 100644 --- a/src/makefile.dj +++ b/src/makefile.dj @@ -5,7 +5,7 @@ # Gisle Vanem # -DEPEND_PREREQ = config.h hugehelp.c +DEPEND_PREREQ = curl_config.h hugehelp.c top_srcdir = .. TOPDIR = .. @@ -39,13 +39,13 @@ CFLAGS += -DUSE_ENVIRONMENT PROGRAM = curl.exe OBJECTS += $(addprefix $(OBJ_DIR)/, $(CSOURCES:.c=.o)) -all: $(OBJ_DIR) config.h $(PROGRAM) +all: $(OBJ_DIR) curl_config.h $(PROGRAM) @echo Welcome to cURL $(PROGRAM): $(OBJECTS) ../lib/libcurl.a $(CC) -o $@ $^ $(LDFLAGS) $(EX_LIBS) -config.h: +curl_config.h: ifeq ($(IS_UNIX_SHELL),1) @echo '#include "../lib/config.dos"' > $@ else @@ -62,7 +62,7 @@ hugehelp.c: ../docs/MANUAL ../docs/curl.1 mkhelp.pl # clean generated files # genclean: - - $(DELETE) config.h + - $(DELETE) curl_config.h - $(DELETE) hugehelp.c # clean object files and subdir -- cgit v1.2.3