Revert "Update to 7.44.0"

[platform/upstream/curl.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8365ae7..3b91e83 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,11 +24,10 @@ AUTOMAKE_OPTIONS = foreign
 
 ACLOCAL_AMFLAGS = -I m4
 
-CMAKE_DIST = CMakeLists.txt CMake/CMakeConfigurableFile.in             \
-CMake/CurlCheckCSourceCompiles.cmake CMake/CurlCheckCSourceRuns.cmake  \
-CMake/CurlTests.c CMake/FindOpenSSL.cmake CMake/FindZLIB.cmake         \
-CMake/OtherTests.cmake CMake/Platforms/WindowsCache.cmake              \
-CMake/Utilities.cmake include/curl/curlbuild.h.cmake
+CMAKE_DIST = CMakeLists.txt CMake/CMakeConfigurableFile.in     \
+ CMake/CurlTests.c CMake/FindGSS.cmake CMake/OtherTests.cmake  \
+ CMake/Platforms/WindowsCache.cmake CMake/Utilities.cmake      \
+ include/curl/curlbuild.h.cmake CMake/Macros.cmake
 
 VC6_LIBTMPL = projects/Windows/VC6/lib/libcurl.tmpl
 VC6_LIBDSP = projects/Windows/VC6/lib/libcurl.dsp
@@ -88,6 +87,7 @@ VC12_SRCVCXPROJ_DEPS = $(VC12_SRCTMPL) Makefile.am src/Makefile.inc
 
 VC_DIST = projects/README      \
  projects/build-openssl.bat    \
+ projects/checksrc.bat \
  projects/Windows/VC6/curl.dsw \
  projects/Windows/VC6/lib/libcurl.dsw $(VC6_LIBDSP)    \
  projects/Windows/VC6/src/curlsrc.dsw $(VC6_SRCDSP)    \
@@ -248,11 +248,11 @@ uninstall-hook:
        cd docs && $(MAKE) uninstall
 
 ca-bundle: lib/mk-ca-bundle.pl
-       @echo "generate a fresh ca-bundle.crt"
+       @echo "generating a fresh ca-bundle.crt"
        @perl $< -b -l -u lib/ca-bundle.crt
 
 ca-firefox: lib/firefox-db2pem.sh
-       @echo "generate a fresh ca-bundle.crt"
+       @echo "generating a fresh ca-bundle.crt"
        ./lib/firefox-db2pem.sh lib/ca-bundle.crt
 
 checksrc:
@@ -267,14 +267,16 @@ 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)'; \
+       win32_src_x_srcs='$(CURLX_CFILES)'; \
+       win32_src_x_hdrs='$(CURLX_HFILES) ../lib/config-win32.h'; \
        \
        sorted_lib_srcs=`for file in $$win32_lib_srcs; do echo $$file; done | sort`; \
        sorted_lib_hdrs=`for file in $$win32_lib_hdrs; do echo $$file; done | sort`; \
@@ -282,6 +284,8 @@ vc-ide: $(VC6_LIBDSP_DEPS) $(VC6_SRCDSP_DEPS) $(VC7_LIBVCPROJ_DEPS) \
        sorted_lib_vtls_hdrs=`for file in $$win32_lib_vtls_hdrs; do echo $$file; done | sort`; \
        sorted_src_srcs=`for file in $$win32_src_srcs; do echo $$file; done | sort`; \
        sorted_src_hdrs=`for file in $$win32_src_hdrs; do echo $$file; done | sort`; \
+       sorted_src_x_srcs=`for file in $$win32_src_x_srcs; do echo $$file; done | sort`; \
+       sorted_src_x_hdrs=`for file in $$win32_src_x_hdrs; do echo $$file; done | sort`; \
        \
        awk_code='\
 function gen_element(type, dir, file)\
@@ -324,7 +328,7 @@ function gen_element(type, dir, file)\
       printf("%s<ClInclude Include=\"..\\..\\..\\..\\%s\\%s\" />\r\n",\
              spaces, dir, file);\
     else if(ext == "rc")\
-      printf("%s<ResourceCompile Include=\"..\\..\\..\\..\\%s\\%s\" >\r\n",\
+      printf("%s<ResourceCompile Include=\"..\\..\\..\\..\\%s\\%s\" />\r\n",\
       spaces, dir, file);\
   }\
 }\
@@ -363,6 +367,20 @@ function gen_element(type, dir, file)\
     split(src_rc, arr);\
     for(val in arr) gen_element(proj_type, "src", arr[val]);\
   }\
+  else if($$0 == "CURL_SRC_X_C_FILES") {\
+    split(src_x_srcs, arr);\
+    for(val in arr) {\
+      sub(/..\/lib\//, "", arr[val]);\
+      gen_element(proj_type, "lib", arr[val]);\
+    }\
+  }\
+  else if($$0 == "CURL_SRC_X_H_FILES") {\
+    split(src_x_hdrs, arr);\
+    for(val in arr) {\
+      sub(/..\/lib\//, "", arr[val]);\
+      gen_element(proj_type, "lib", arr[val]);\
+    }\
+  }\
   else\
     printf("%s\r\n", $$0);\
 }';\
@@ -381,6 +399,8 @@ function gen_element(type, dir, file)\
                -v src_srcs="$$sorted_src_srcs" \
                -v src_hdrs="$$sorted_src_hdrs" \
                -v src_rc="$$win32_src_rc" \
+               -v src_x_srcs="$$sorted_src_x_srcs" \
+               -v src_x_hdrs="$$sorted_src_x_hdrs" \
                "$$awk_code" $(srcdir)/$(VC6_SRCTMPL) > $(VC6_SRCDSP) || { exit 1; }; \
        \
        echo "generating '$(VC7_LIBVCPROJ)'"; \
@@ -397,6 +417,8 @@ function gen_element(type, dir, file)\
                -v src_srcs="$$sorted_src_srcs" \
                -v src_hdrs="$$sorted_src_hdrs" \
                -v src_rc="$$win32_src_rc" \
+               -v src_x_srcs="$$sorted_src_x_srcs" \
+               -v src_x_hdrs="$$sorted_src_x_hdrs" \
                "$$awk_code" $(srcdir)/$(VC7_SRCTMPL) > $(VC7_SRCVCPROJ) || { exit 1; }; \
        \
        echo "generating '$(VC71_LIBVCPROJ)'"; \
@@ -413,6 +435,8 @@ function gen_element(type, dir, file)\
                -v src_srcs="$$sorted_src_srcs" \
                -v src_hdrs="$$sorted_src_hdrs" \
                -v src_rc="$$win32_src_rc" \
+               -v src_x_srcs="$$sorted_src_x_srcs" \
+               -v src_x_hdrs="$$sorted_src_x_hdrs" \
                "$$awk_code" $(srcdir)/$(VC71_SRCTMPL) > $(VC71_SRCVCPROJ) || { exit 1; }; \
        \
        echo "generating '$(VC8_LIBVCPROJ)'"; \
@@ -429,6 +453,8 @@ function gen_element(type, dir, file)\
                -v src_srcs="$$sorted_src_srcs" \
                -v src_hdrs="$$sorted_src_hdrs" \
                -v src_rc="$$win32_src_rc" \
+               -v src_x_srcs="$$sorted_src_x_srcs" \
+               -v src_x_hdrs="$$sorted_src_x_hdrs" \
                "$$awk_code" $(srcdir)/$(VC8_SRCTMPL) > $(VC8_SRCVCPROJ) || { exit 1; }; \
        \
        echo "generating '$(VC9_LIBVCPROJ)'"; \
@@ -445,6 +471,8 @@ function gen_element(type, dir, file)\
                -v src_srcs="$$sorted_src_srcs" \
                -v src_hdrs="$$sorted_src_hdrs" \
                -v src_rc="$$win32_src_rc" \
+               -v src_x_srcs="$$sorted_src_x_srcs" \
+               -v src_x_hdrs="$$sorted_src_x_hdrs" \
                "$$awk_code" $(srcdir)/$(VC9_SRCTMPL) > $(VC9_SRCVCPROJ) || { exit 1; }; \
        \
        echo "generating '$(VC10_LIBVCXPROJ)'"; \
@@ -461,6 +489,8 @@ function gen_element(type, dir, file)\
                -v src_srcs="$$sorted_src_srcs" \
                -v src_hdrs="$$sorted_src_hdrs" \
                -v src_rc="$$win32_src_rc" \
+               -v src_x_srcs="$$sorted_src_x_srcs" \
+               -v src_x_hdrs="$$sorted_src_x_hdrs" \
                "$$awk_code" $(srcdir)/$(VC10_SRCTMPL) > $(VC10_SRCVCXPROJ) || { exit 1; }; \
        \
        echo "generating '$(VC11_LIBVCXPROJ)'"; \
@@ -477,6 +507,8 @@ function gen_element(type, dir, file)\
                -v src_srcs="$$sorted_src_srcs" \
                -v src_hdrs="$$sorted_src_hdrs" \
                -v src_rc="$$win32_src_rc" \
+               -v src_x_srcs="$$sorted_src_x_srcs" \
+               -v src_x_hdrs="$$sorted_src_x_hdrs" \
                "$$awk_code" $(srcdir)/$(VC11_SRCTMPL) > $(VC11_SRCVCXPROJ) || { exit 1; }; \
        \
        echo "generating '$(VC12_LIBVCXPROJ)'"; \
@@ -493,4 +525,6 @@ function gen_element(type, dir, file)\
                -v src_srcs="$$sorted_src_srcs" \
                -v src_hdrs="$$sorted_src_hdrs" \
                -v src_rc="$$win32_src_rc" \
+               -v src_x_srcs="$$sorted_src_x_srcs" \
+               -v src_x_hdrs="$$sorted_src_x_hdrs" \
                "$$awk_code" $(srcdir)/$(VC12_SRCTMPL) > $(VC12_SRCVCXPROJ) || { exit 1; };)