diff options
| author | Gunter Knauf <gk@gknw.de> | 2009-07-14 13:25:14 +0000 |
|---|---|---|
| committer | Gunter Knauf <gk@gknw.de> | 2009-07-14 13:25:14 +0000 |
| commit | f671d0513ccc9cdcd7516c732c719b2f31a9578e (patch) | |
| tree | e419c483393ab20caaf0e93f1d236edb08743670 /src/Makefile.am | |
| parent | 100f6b7703ff9a45340c0b27122806952f243ab8 (diff) | |
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.
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
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 \ |