diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2014-05-18 21:43:40 +0100 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2014-05-18 22:16:54 +0100 |
| commit | 6f6646d6e96f1bd8bb9d2cee9b06390e6bb7fc61 (patch) | |
| tree | 5cbd4375a9d68d6abdbf0ac58e30a49041de25e5 | |
| parent | 29d790fe6053ba8bb0b4ade48a6fe8b98ab189d9 (diff) | |
| download | curl-6f6646d6e96f1bd8bb9d2cee9b06390e6bb7fc61.tar.gz | |
build: Slight rename of new LIB_* makefile file variables
In order to try and be consistent between curl and libcurl renamed the
recently introduced LIB_* makefile file variables.
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | lib/Makefile.inc | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index 67d364401..617c30b2c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -267,11 +267,11 @@ vc-ide: $(VC6_LIBDSP_DEPS) $(VC6_SRCDSP_DEPS) $(VC7_LIBVCPROJ_DEPS) \ $(VC9_SRCVCPROJ_DEPS) $(VC10_LIBVCXPROJ_DEPS) $(VC10_SRCVCXPROJ_DEPS) \ $(VC11_LIBVCXPROJ_DEPS) $(VC11_SRCVCXPROJ_DEPS) $(VC12_LIBVCXPROJ_DEPS) \ $(VC12_SRCVCXPROJ_DEPS) - @(win32_lib_srcs='$(LIB_CSOURCES)'; \ - win32_lib_hdrs='$(LIB_HHEADERS) config-win32.h'; \ - win32_lib_rc='$(LIB_RC)'; \ - win32_lib_vtls_srcs='$(LIB_VTLS_CSOURCES)'; \ - win32_lib_vtls_hdrs='$(LIB_VTLS_HHEADERS)'; \ + @(win32_lib_srcs='$(LIB_CFILES)'; \ + win32_lib_hdrs='$(LIB_HFILES) config-win32.h'; \ + win32_lib_rc='$(LIB_RCFILES)'; \ + win32_lib_vtls_srcs='$(LIB_VTLS_CFILES)'; \ + win32_lib_vtls_hdrs='$(LIB_VTLS_HFILES)'; \ win32_src_srcs='$(CURL_CFILES)'; \ win32_src_hdrs='$(CURL_HFILES)'; \ win32_src_rc='$(CURL_RCFILES)'; \ diff --git a/lib/Makefile.inc b/lib/Makefile.inc index 48f129d59..462d72a5f 100644 --- a/lib/Makefile.inc +++ b/lib/Makefile.inc @@ -20,15 +20,15 @@ # ########################################################################### -LIB_VTLS_CSOURCES = vtls/openssl.c vtls/gtls.c vtls/vtls.c vtls/nss.c \ +LIB_VTLS_CFILES = vtls/openssl.c vtls/gtls.c vtls/vtls.c vtls/nss.c \ vtls/qssl.c vtls/polarssl.c vtls/polarssl_threadlock.c vtls/axtls.c \ vtls/cyassl.c vtls/curl_schannel.c vtls/curl_darwinssl.c vtls/gskit.c -LIB_VTLS_HHEADERS = vtls/qssl.h vtls/openssl.h vtls/vtls.h vtls/gtls.h \ +LIB_VTLS_HFILES = vtls/qssl.h vtls/openssl.h vtls/vtls.h vtls/gtls.h \ vtls/nssg.h vtls/polarssl.h vtls/polarssl_threadlock.h vtls/axtls.h \ vtls/cyassl.h vtls/curl_schannel.h vtls/curl_darwinssl.h vtls/gskit.h -LIB_CSOURCES = file.c timeval.c base64.c hostip.c progress.c formdata.c \ +LIB_CFILES = file.c timeval.c base64.c hostip.c progress.c formdata.c \ cookie.c http.c sendf.c ftp.c url.c dict.c if2ip.c speedcheck.c \ ldap.c version.c getenv.c escape.c mprintf.c telnet.c netrc.c \ getinfo.c transfer.c strequal.c easy.c security.c curl_fnmatch.c \ @@ -47,7 +47,7 @@ LIB_CSOURCES = file.c timeval.c base64.c hostip.c progress.c formdata.c \ hostcheck.c bundles.c conncache.c pipeline.c dotdot.c x509asn1.c \ http2.c curl_sasl_sspi.c -LIB_HHEADERS = arpa_telnet.h netrc.h file.h timeval.h hostip.h progress.h \ +LIB_HFILES = arpa_telnet.h netrc.h file.h timeval.h hostip.h progress.h \ formdata.h cookie.h http.h sendf.h ftp.h url.h dict.h if2ip.h \ speedcheck.h urldata.h curl_ldap.h escape.h telnet.h getinfo.h \ strequal.h curl_sec.h memdebug.h http_chunks.h curl_fnmatch.h \ @@ -65,7 +65,7 @@ LIB_HHEADERS = arpa_telnet.h netrc.h file.h timeval.h hostip.h progress.h \ conncache.h curl_setup_once.h multihandle.h setup-vms.h pipeline.h \ dotdot.h x509asn1.h http2.h sigpipe.h -LIB_RC = libcurl.rc +LIB_RCFILES = libcurl.rc -CSOURCES = $(LIB_CSOURCES) $(LIB_VTLS_CSOURCES) -HHEADERS = $(LIB_HHEADERS) $(LIB_VTLS_HHEADERS) +CSOURCES = $(LIB_CFILES) $(LIB_VTLS_CFILES) +HHEADERS = $(LIB_HFILES) $(LIB_VTLS_HFILES) |