romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 13:43:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

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.

Browse source
This commit is contained in:
Gunter Knauf 2009-07-14 13:25:14 +00:00
parent 100f6b7703
commit f671d0513c
33 changed files with 68 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/.cvsignore
View file

@ -9,7 +9,7 @@ DLL-Release
LIB-Debug
LIB-Release
Makefile
config.h
curl_config.h
getdate.c
libcurl.dsp
libcurl.vcproj

6
lib/CMakeLists.txt
View file

@ -2,15 +2,15 @@ set(LIB_NAME libcurl)
configure_file(${CURL_SOURCE_DIR}/include/curl/curlbuild.h.cmake
${CURL_BINARY_DIR}/include/curl/curlbuild.h)
configure_file(config.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/config.h)
configure_file(curl_config.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/curl_config.h)
transform_makefile_inc("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
include(${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake)
list(APPEND HHEADERS
${CMAKE_CURRENT_BINARY_DIR}/config.h
${CMAKE_CURRENT_BINARY_DIR}/curl_config.h
${CURL_BINARY_DIR}/include/curl/curlbuild.h
)

6
lib/Makefile.am
View file

@ -29,11 +29,11 @@ DOCS = README.encoding README.memoryleak README.ares README.curlx \
README.hostip README.multi_socket README.httpauth README.pipelining \
README.NSS README.curl_off_t
CMAKE_DIST = CMakeLists.txt config.h.cmake
CMAKE_DIST = CMakeLists.txt curl_config.h.cmake
EXTRA_DIST = Makefile.b32 Makefile.m32 Makefile.vc6 Makefile.riscos $(DSP) \
vc6libcurl.dsw config-win32.h config-win32ce.h config-riscos.h \
config-mac.h config.h.in makefile.dj config.dos libcurl.plist \
config-mac.h curl_config.h.in makefile.dj config.dos libcurl.plist \
libcurl.rc config-amigaos.h amigaos.c amigaos.h makefile.amiga \
Makefile.netware nwlib.c nwos.c libcurl.imp msvcproj.head msvcproj.foot \
config-win32ce.h config-os400.h setup-os400.h config-symbian.h \
@ -52,7 +52,7 @@ LIBCURL_LIBS = @LIBCURL_LIBS@
#
# $(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)/lib is for libcurl's generated lib/curl_config.h file
# $(top_srcdir)/lib is for libcurl's lib/setup.h and other "private" files
# $(top_builddir)/ares is for in-tree c-ares's generated ares_build.h file
# $(top_srcdir)/ares is for in-tree c-ares's external include files

6
lib/Makefile.netware
View file

@ -241,7 +241,7 @@ nlm: prebuild $(TARGET).nlm
lib: prebuild $(TARGET).$(LIBEXT)
prebuild: $(OBJDIR) $(CURL_INC)/curl/curlbuild.h $(OBJDIR)/version.inc config.h
prebuild: $(OBJDIR) $(CURL_INC)/curl/curlbuild.h $(OBJDIR)/version.inc curl_config.h
$(OBJDIR)/%.o: %.c
# @echo Compiling $<
@ -263,7 +263,7 @@ ifdef WITH_SSL
endif
clean:
-$(RM) config.h
-$(RM) curl_config.h
-$(RM) -r $(OBJDIR)
distclean: clean
@ -373,7 +373,7 @@ ifeq ($(findstring nlmconv,$(LD)),nlmconv)
@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) >> $@

10
lib/config-mac.h
View file

@ -1,11 +1,11 @@
#ifndef __LIB_CONFIG_MAC_H
#define __LIB_CONFIG_MAC_H
/* ================================================================ */
/* lib/config-mac.h - Hand crafted config file for Mac OS 9 */
/* ================================================================ */
/* On Mac OS X you must run configure to generate config.h file */
/* ================================================================ */
/* =================================================================== */
/* lib/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 OS "mac"

2
lib/config-riscos.h
View file

@ -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

2
lib/config.h.cmake
View file

@ -1,4 +1,4 @@
/* lib/config.h.in. Generated from configure.ac by autoheader. */
/* lib/curl_config.h.in. Generated from configure.ac by autoheader. */
/* Define to 1 if you have the $func function. */
#cmakedefine AS_TR_CPP ${AS_TR_CPP}

8
lib/makefile.dj
View file

@ -4,7 +4,7 @@
#
# $Id$
DEPEND_PREREQ = config.h
DEPEND_PREREQ = curl_config.h
TOPDIR = ..
include ../packages/DOS/common.dj
@ -17,18 +17,18 @@ CURL_LIB = libcurl.a
# NOTE: if ../include/curl/curlbuild.h is missing, you're probably building
# this from a CVS checkout and then you need to run buildconf.bat first.
all: $(OBJ_DIR) config.h $(CURL_LIB)
all: $(OBJ_DIR) curl_config.h $(CURL_LIB)
$(CURL_LIB): $(OBJECTS)
ar rs $@ $?
config.h: config.dos
curl_config.h: config.dos
$(COPY) $^ $@
# clean generated files
#
genclean:
- $(DELETE) config.h
- $(DELETE) curl_config.h
# clean object files and subdir
#

2
lib/setup.h
View file

@ -38,7 +38,7 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "curl_config.h"
#else /* HAVE_CONFIG_H */