diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/.cvsignore | 4 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/Makefile.netware | 6 | ||||
| -rw-r--r-- | src/config-mac.h | 10 | ||||
| -rw-r--r-- | src/config-riscos.h | 2 | ||||
| -rw-r--r-- | src/makefile.dj | 8 | ||||
| -rw-r--r-- | src/setup.h | 2 |
8 files changed, 20 insertions, 20 deletions
diff --git a/src/.cvsignore b/src/.cvsignore index 36e937719..c4504626c 100644 --- a/src/.cvsignore +++ b/src/.cvsignore @@ -7,8 +7,8 @@ LIB-Debug LIB-Release Makefile Makefile.in -config.h -config.h.in +curl_config.h +curl_config.h.in curl hugehelp.c stamp-h* diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c6871787c..9db5fd79a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -26,7 +26,7 @@ source_group("cURL header files" FILES ${CURL_HFILES}) include_directories( ${CURL_SOURCE_DIR}/lib # To be able to reach "setup_once.h" - ${CURL_BINARY_DIR}/lib # To be able to reach "config.h" + ${CURL_BINARY_DIR}/lib # To be able to reach "curl_config.h" ${CURL_BINARY_DIR}/include # To be able to reach "curl/curlbuild.h" ) diff --git a/src/Makefile.am b/src/Makefile.am index ea648a001..9d89131fb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,8 +29,8 @@ AUTOMAKE_OPTIONS = foreign nostdinc # # $(top_builddir)/include is for libcurl's generated curl/curlbuild.h file # $(top_srcdir)/include is for libcurl's external include files -# $(top_builddir)/lib is for libcurl's generated lib/config.h file -# $(top_builddir)/src is for curl's generated src/config.h file +# $(top_builddir)/lib is for libcurl's generated lib/curl_config.h file +# $(top_builddir)/src is for curl's generated src/curl_config.h file # $(top_srcdir)/lib is for libcurl's lib/setup.h and other "borrowed" files # $(top_srcdir)/src is for curl's src/setup.h and "curl-private" files @@ -54,7 +54,7 @@ CLEANFILES = hugehelp.c NROFF=env LC_ALL=C @NROFF@ @MANOPT@ # figured out by the configure script EXTRA_DIST = mkhelp.pl makefile.dj Makefile.vc6 Makefile.b32 Makefile.m32 \ - Makefile.riscos config.h.in macos/curl.mcp.xml.sit.hqx \ + Makefile.riscos curl_config.h.in macos/curl.mcp.xml.sit.hqx \ macos/MACINSTALL.TXT macos/src/curl_GUSIConfig.cpp vc6curlsrc.dsp \ macos/src/macos_main.cpp config-amigaos.h makefile.amiga curl.rc \ Makefile.netware Makefile.inc Makefile.Watcom vc6curlsrc.dsw \ diff --git a/src/Makefile.netware b/src/Makefile.netware index b044105f8..56a35852a 100644 --- a/src/Makefile.netware +++ b/src/Makefile.netware @@ -235,7 +235,7 @@ vpath %.c $(CURL_LIB) all: prebuild $(TARGET).nlm -prebuild: $(OBJDIR) $(OBJDIR)/version.inc config.h +prebuild: $(OBJDIR) $(OBJDIR)/version.inc curl_config.h $(OBJDIR)/%.o: %.c # @echo Compiling $< @@ -254,7 +254,7 @@ clean: ifeq "$(wildcard hugehelp.c.cvs)" "hugehelp.c.cvs" -$(RM) hugehelp.c endif - -$(RM) config.h + -$(RM) curl_config.h -$(RM) -r $(OBJDIR) distclean: clean @@ -361,7 +361,7 @@ endif @echo $(DL)output $(TARGET).nlm$(DL) >> $@ endif -config.h: Makefile.netware +curl_config.h: Makefile.netware @echo Creating $@ @echo $(DL)/* $@ for NetWare target.$(DL) > $@ @echo $(DL)** Do not edit this file - it is created by make!$(DL) >> $@ diff --git a/src/config-mac.h b/src/config-mac.h index a3a57c262..8f54512f2 100644 --- a/src/config-mac.h +++ b/src/config-mac.h @@ -1,11 +1,11 @@ #ifndef __SRC_CONFIG_MAC_H #define __SRC_CONFIG_MAC_H -/* ================================================================ */ -/* src/config-mac.h - Hand crafted config file for Mac OS 9 */ -/* ================================================================ */ -/* On Mac OS X you must run configure to generate config.h file */ -/* ================================================================ */ +/* =================================================================== */ +/* src/config-mac.h - Hand crafted config file for Mac OS 9 */ +/* =================================================================== */ +/* On Mac OS X you must run configure to generate curl_config.h file */ +/* =================================================================== */ /* Define to 1 if you want the built-in manual */ #define USE_MANUAL 1 diff --git a/src/config-riscos.h b/src/config-riscos.h index ab898230b..b397e0dd8 100644 --- a/src/config-riscos.h +++ b/src/config-riscos.h @@ -1,4 +1,4 @@ -/* config.h.in. Generated automatically from configure.in by autoheader. */ +/* curl_config.h.in. Generated automatically from configure.in by autoheader. */ /* Name of this package! */ #undef PACKAGE 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 <giva@bgnett.no> # -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 diff --git a/src/setup.h b/src/setup.h index 75c771ecd..30ebebd3b 100644 --- a/src/setup.h +++ b/src/setup.h @@ -39,7 +39,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "curl_config.h" #else #ifdef WIN32 |