[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnurl] 08/10: adjust buildsystem to make make distcheck almost pass.
|
From: |
gnunet |
|
Subject: |
[gnurl] 08/10: adjust buildsystem to make make distcheck almost pass. |
|
Date: |
Mon, 18 Nov 2019 18:33:40 +0100 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit a25fba3757fdd4cd2e6b1f24b204c62ed97d3ba9
Author: ng0 <address@hidden>
AuthorDate: Mon Nov 18 13:10:42 2019 +0000
adjust buildsystem to make make distcheck almost pass.
---
Makefile.am | 479 +-----------------------------------------
docs/Makefile.am | 3 +-
docs/cmdline-opts/Makefile.am | 2 +-
docs/libcurl/Makefile.am | 2 +-
docs/libcurl/opts/Makefile.am | 2 +-
lib/Makefile.am | 4 +-
src/Makefile.am | 2 +-
tests/Makefile.am | 2 +-
tests/data/Makefile.am | 2 +-
tests/libtest/Makefile.am | 2 +-
tests/server/Makefile.am | 2 +-
tests/unit/Makefile.am | 2 +-
12 files changed, 13 insertions(+), 491 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index a61f9e6ce..50994764c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,142 +20,13 @@
#
###########################################################################
-AM_DISTCHECK_CONFIGURE_FLAGS = --disable-ftp --disable-file --disable-ldap
--disable-rtsp --disable-dict --disable-telnet --disable-tftp --disable-pop3
--disable-imap --disable-smb --disable-smtp --disable-gopher --without-ssl
--disable-libpsl --without-libpsl --without-librtmp --disable-ntlm-wb
+AM_DISTCHECK_CONFIGURE_FLAGS = --enable-ipv6 --with-gnutls --without-libssh2
--without-libmetalink --without-winidn --without-librtmp --without-nghttp2
--without-nss --without-cyassl --without-polarssl --without-ssl
--without-winssl --without-darwinssl --disable-sspi --disable-ntlm-wb
--disable-ldap --disable-rtsp --disable-dict --disable-telnet --disable-tftp
--disable-pop3 --disable-imap --disable-smtp --disable-gopher --disable-file
--disable-ftp --disable-smb --without-libpsl --disab [...]
+# --disable-ftp --disable-file --disable-ldap --disable-rtsp --disable-dict
--disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb
--disable-smtp --disable-gopher --without-ssl --disable-libpsl --without-libpsl
--without-librtmp --disable-ntlm-wb
AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I m4
-CMAKE_DIST = CMakeLists.txt CMake/CMakeConfigurableFile.in \
- CMake/CurlTests.c CMake/FindGSS.cmake CMake/OtherTests.cmake \
- CMake/Platforms/WindowsCache.cmake CMake/Utilities.cmake \
- CMake/Macros.cmake \
- CMake/CurlSymbolHiding.cmake CMake/FindCARES.cmake \
- CMake/FindLibSSH2.cmake CMake/FindNGHTTP2.cmake \
- CMake/FindMbedTLS.cmake CMake/cmake_uninstall.cmake.in \
- CMake/curl-config.cmake.in
-
-VC6_LIBTMPL = projects/Windows/VC6/lib/libcurl.tmpl
-VC6_LIBDSP = projects/Windows/VC6/lib/libcurl.dsp.dist
-VC6_LIBDSP_DEPS = $(VC6_LIBTMPL) Makefile.am lib/Makefile.inc
-VC6_SRCTMPL = projects/Windows/VC6/src/curl.tmpl
-VC6_SRCDSP = projects/Windows/VC6/src/curl.dsp.dist
-VC6_SRCDSP_DEPS = $(VC6_SRCTMPL) Makefile.am src/Makefile.inc
-
-VC7_LIBTMPL = projects/Windows/VC7/lib/libcurl.tmpl
-VC7_LIBVCPROJ = projects/Windows/VC7/lib/libcurl.vcproj.dist
-VC7_LIBVCPROJ_DEPS = $(VC7_LIBTMPL) Makefile.am lib/Makefile.inc
-VC7_SRCTMPL = projects/Windows/VC7/src/curl.tmpl
-VC7_SRCVCPROJ = projects/Windows/VC7/src/curl.vcproj.dist
-VC7_SRCVCPROJ_DEPS = $(VC7_SRCTMPL) Makefile.am src/Makefile.inc
-
-VC71_LIBTMPL = projects/Windows/VC7.1/lib/libcurl.tmpl
-VC71_LIBVCPROJ = projects/Windows/VC7.1/lib/libcurl.vcproj.dist
-VC71_LIBVCPROJ_DEPS = $(VC71_LIBTMPL) Makefile.am lib/Makefile.inc
-VC71_SRCTMPL = projects/Windows/VC7.1/src/curl.tmpl
-VC71_SRCVCPROJ = projects/Windows/VC7.1/src/curl.vcproj.dist
-VC71_SRCVCPROJ_DEPS = $(VC71_SRCTMPL) Makefile.am src/Makefile.inc
-
-VC8_LIBTMPL = projects/Windows/VC8/lib/libcurl.tmpl
-VC8_LIBVCPROJ = projects/Windows/VC8/lib/libcurl.vcproj.dist
-VC8_LIBVCPROJ_DEPS = $(VC8_LIBTMPL) Makefile.am lib/Makefile.inc
-VC8_SRCTMPL = projects/Windows/VC8/src/curl.tmpl
-VC8_SRCVCPROJ = projects/Windows/VC8/src/curl.vcproj.dist
-VC8_SRCVCPROJ_DEPS = $(VC8_SRCTMPL) Makefile.am src/Makefile.inc
-
-VC9_LIBTMPL = projects/Windows/VC9/lib/libcurl.tmpl
-VC9_LIBVCPROJ = projects/Windows/VC9/lib/libcurl.vcproj.dist
-VC9_LIBVCPROJ_DEPS = $(VC9_LIBTMPL) Makefile.am lib/Makefile.inc
-VC9_SRCTMPL = projects/Windows/VC9/src/curl.tmpl
-VC9_SRCVCPROJ = projects/Windows/VC9/src/curl.vcproj.dist
-VC9_SRCVCPROJ_DEPS = $(VC9_SRCTMPL) Makefile.am src/Makefile.inc
-
-VC10_LIBTMPL = projects/Windows/VC10/lib/libcurl.tmpl
-VC10_LIBVCXPROJ = projects/Windows/VC10/lib/libcurl.vcxproj.dist
-VC10_LIBVCXPROJ_DEPS = $(VC10_LIBTMPL) Makefile.am lib/Makefile.inc
-VC10_SRCTMPL = projects/Windows/VC10/src/curl.tmpl
-VC10_SRCVCXPROJ = projects/Windows/VC10/src/curl.vcxproj.dist
-VC10_SRCVCXPROJ_DEPS = $(VC10_SRCTMPL) Makefile.am src/Makefile.inc
-
-VC11_LIBTMPL = projects/Windows/VC11/lib/libcurl.tmpl
-VC11_LIBVCXPROJ = projects/Windows/VC11/lib/libcurl.vcxproj.dist
-VC11_LIBVCXPROJ_DEPS = $(VC11_LIBTMPL) Makefile.am lib/Makefile.inc
-VC11_SRCTMPL = projects/Windows/VC11/src/curl.tmpl
-VC11_SRCVCXPROJ = projects/Windows/VC11/src/curl.vcxproj.dist
-VC11_SRCVCXPROJ_DEPS = $(VC11_SRCTMPL) Makefile.am src/Makefile.inc
-
-VC12_LIBTMPL = projects/Windows/VC12/lib/libcurl.tmpl
-VC12_LIBVCXPROJ = projects/Windows/VC12/lib/libcurl.vcxproj.dist
-VC12_LIBVCXPROJ_DEPS = $(VC12_LIBTMPL) Makefile.am lib/Makefile.inc
-VC12_SRCTMPL = projects/Windows/VC12/src/curl.tmpl
-VC12_SRCVCXPROJ = projects/Windows/VC12/src/curl.vcxproj.dist
-VC12_SRCVCXPROJ_DEPS = $(VC12_SRCTMPL) Makefile.am src/Makefile.inc
-
-VC14_LIBTMPL = projects/Windows/VC14/lib/libcurl.tmpl
-VC14_LIBVCXPROJ = projects/Windows/VC14/lib/libcurl.vcxproj.dist
-VC14_LIBVCXPROJ_DEPS = $(VC14_LIBTMPL) Makefile.am lib/Makefile.inc
-VC14_SRCTMPL = projects/Windows/VC14/src/curl.tmpl
-VC14_SRCVCXPROJ = projects/Windows/VC14/src/curl.vcxproj.dist
-VC14_SRCVCXPROJ_DEPS = $(VC14_SRCTMPL) Makefile.am src/Makefile.inc
-
-VC15_LIBTMPL = projects/Windows/VC15/lib/libcurl.tmpl
-VC15_LIBVCXPROJ = projects/Windows/VC15/lib/libcurl.vcxproj.dist
-VC15_LIBVCXPROJ_DEPS = $(VC15_LIBTMPL) Makefile.am lib/Makefile.inc
-VC15_SRCTMPL = projects/Windows/VC15/src/curl.tmpl
-VC15_SRCVCXPROJ = projects/Windows/VC15/src/curl.vcxproj.dist
-VC15_SRCVCXPROJ_DEPS = $(VC15_SRCTMPL) Makefile.am src/Makefile.inc
-
-VC_DIST = projects/README \
- projects/build-openssl.bat \
- projects/build-wolfssl.bat \
- projects/checksrc.bat \
- projects/Windows/VC6/curl-all.dsw \
- projects/Windows/VC6/lib/libcurl.dsw \
- projects/Windows/VC6/src/curl.dsw \
- projects/Windows/VC7/curl-all.sln \
- projects/Windows/VC7/lib/libcurl.sln \
- projects/Windows/VC7/src/curl.sln \
- projects/Windows/VC7.1/curl-all.sln \
- projects/Windows/VC7.1/lib/libcurl.sln \
- projects/Windows/VC7.1/src/curl.sln \
- projects/Windows/VC8/curl-all.sln \
- projects/Windows/VC8/lib/libcurl.sln \
- projects/Windows/VC8/src/curl.sln \
- projects/Windows/VC9/curl-all.sln \
- projects/Windows/VC9/lib/libcurl.sln \
- projects/Windows/VC9/src/curl.sln \
- projects/Windows/VC10/curl-all.sln \
- projects/Windows/VC10/lib/libcurl.sln \
- projects/Windows/VC10/lib/libcurl.vcxproj.filters \
- projects/Windows/VC10/src/curl.sln \
- projects/Windows/VC10/src/curl.vcxproj.filters \
- projects/Windows/VC11/curl-all.sln \
- projects/Windows/VC11/lib/libcurl.sln \
- projects/Windows/VC11/lib/libcurl.vcxproj.filters \
- projects/Windows/VC11/src/curl.sln \
- projects/Windows/VC11/src/curl.vcxproj.filters \
- projects/Windows/VC12/curl-all.sln \
- projects/Windows/VC12/lib/libcurl.sln \
- projects/Windows/VC12/lib/libcurl.vcxproj.filters \
- projects/Windows/VC12/src/curl.sln \
- projects/Windows/VC12/src/curl.vcxproj.filters \
- projects/Windows/VC14/curl-all.sln \
- projects/Windows/VC14/lib/libcurl.sln \
- projects/Windows/VC14/lib/libcurl.vcxproj.filters \
- projects/Windows/VC14/src/curl.sln \
- projects/Windows/VC14/src/curl.vcxproj.filters \
- projects/Windows/VC15/curl-all.sln \
- projects/Windows/VC15/lib/libcurl.sln \
- projects/Windows/VC15/lib/libcurl.vcxproj.filters \
- projects/Windows/VC15/src/curl.sln \
- projects/Windows/VC15/src/curl.vcxproj.filters \
- projects/generate.bat \
- projects/wolfssl_options.h \
- projects/wolfssl_override.props
-
-WINBUILD_DIST = winbuild/BUILD.WINDOWS.txt winbuild/gen_resp_file.bat \
- winbuild/MakefileBuild.vc winbuild/Makefile.vc
-
PLAN9_DIST = plan9/include/mkfile \
plan9/include/mkfile \
plan9/mkfile.proto \
@@ -172,12 +43,6 @@ EXTRA_DIST = CHANGES COPYING maketgz Makefile.dist
gnurl-config.in \
$(VC_DIST) $(WINBUILD_DIST) $(PLAN9_DIST) \
lib/libcurl.vers.in buildconf.bat scripts/coverage.sh scripts/completion.pl
-CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) $(VC7_LIBVCPROJ) $(VC7_SRCVCPROJ) \
- $(VC71_LIBVCPROJ) $(VC71_SRCVCPROJ) $(VC8_LIBVCPROJ) $(VC8_SRCVCPROJ) \
- $(VC9_LIBVCPROJ) $(VC9_SRCVCPROJ) $(VC10_LIBVCXPROJ) $(VC10_SRCVCXPROJ) \
- $(VC11_LIBVCXPROJ) $(VC11_SRCVCXPROJ) $(VC12_LIBVCXPROJ) $(VC12_SRCVCXPROJ) \
- $(VC14_LIBVCXPROJ) $(VC14_SRCVCXPROJ) $(VC15_LIBVCXPROJ) $(VC15_SRCVCXPROJ)
-
bin_SCRIPTS = gnurl-config
SUBDIRS = lib src
@@ -316,346 +181,6 @@ checksrc:
cd include/gnurl && $(MAKE) checksrc
cd docs/examples && $(MAKE) checksrc
-.PHONY: vc-ide
-
-vc-ide: $(VC6_LIBDSP_DEPS) $(VC6_SRCDSP_DEPS) $(VC7_LIBVCPROJ_DEPS) \
- $(VC7_SRCVCPROJ_DEPS) $(VC71_LIBVCPROJ_DEPS) $(VC71_SRCVCPROJ_DEPS) \
- $(VC8_LIBVCPROJ_DEPS) $(VC8_SRCVCPROJ_DEPS) $(VC9_LIBVCPROJ_DEPS) \
- $(VC9_SRCVCPROJ_DEPS) $(VC10_LIBVCXPROJ_DEPS) $(VC10_SRCVCXPROJ_DEPS) \
- $(VC11_LIBVCXPROJ_DEPS) $(VC11_SRCVCXPROJ_DEPS) $(VC12_LIBVCXPROJ_DEPS) \
- $(VC12_SRCVCXPROJ_DEPS) $(VC14_LIBVCXPROJ_DEPS) $(VC14_SRCVCXPROJ_DEPS) \
- $(VC15_LIBVCXPROJ_DEPS) $(VC15_SRCVCXPROJ_DEPS)
- @(win32_lib_srcs='$(LIB_CFILES)'; \
- win32_lib_hdrs='$(LIB_HFILES) config-win32.h'; \
- win32_lib_rc='$(LIB_RCFILES)'; \
- win32_lib_vauth_srcs='$(LIB_VAUTH_CFILES)'; \
- win32_lib_vauth_hdrs='$(LIB_VAUTH_HFILES)'; \
- 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`; \
- sorted_lib_vauth_srcs=`for file in $$win32_lib_vauth_srcs; do echo
$$file; done | sort`; \
- sorted_lib_vauth_hdrs=`for file in $$win32_lib_vauth_hdrs; do echo
$$file; done | sort`; \
- sorted_lib_vtls_srcs=`for file in $$win32_lib_vtls_srcs; do echo
$$file; done | sort`; \
- 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)\
-{\
- sub(/vauth\//, "", file);\
- sub(/vtls\//, "", file);\
-\
- spaces=" ";\
- if(dir == "lib\\vauth" || dir == "lib\\vtls")\
- tabs=" ";\
- else\
- tabs=" ";\
-\
- if(type == "dsp") {\
- printf("# Begin Source File\r\n");\
- printf("\r\n");\
- printf("SOURCE=..\\..\\..\\..\\%s\\%s\r\n", dir, file);\
- printf("# End Source File\r\n");\
- }\
- else if(type == "vcproj1") {\
- printf("%s<File\r\n", tabs);\
- printf("%s RelativePath=\"..\\..\\..\\..\\%s\\%s\">\r\n",\
- tabs, dir, file);\
- printf("%s</File>\r\n", tabs);\
- }\
- else if(type == "vcproj2") {\
- printf("%s<File\r\n", tabs);\
- printf("%s RelativePath=\"..\\..\\..\\..\\%s\\%s\"\r\n",\
- tabs, dir, file);\
- printf("%s>\r\n", tabs);\
- printf("%s</File>\r\n", tabs);\
- }\
- else if(type == "vcxproj") {\
- i = index(file, ".");\
- ext = substr(file, i == 0 ? 0 : i + 1);\
-\
- if(ext == "c")\
- printf("%s<ClCompile Include=\"..\\..\\..\\..\\%s\\%s\" />\r\n",\
- spaces, dir, file);\
- else if(ext == "h")\
- printf("%s<ClInclude Include=\"..\\..\\..\\..\\%s\\%s\" />\r\n",\
- spaces, dir, file);\
- else if(ext == "rc")\
- printf("%s<ResourceCompile Include=\"..\\..\\..\\..\\%s\\%s\" />\r\n",\
- spaces, dir, file);\
- }\
-}\
-\
-{\
-\
- if($$0 == "CURL_LIB_C_FILES") {\
- split(lib_srcs, arr);\
- for(val in arr) gen_element(proj_type, "lib", arr[val]);\
- }\
- else if($$0 == "CURL_LIB_H_FILES") {\
- split(lib_hdrs, arr);\
- for(val in arr) gen_element(proj_type, "lib", arr[val]);\
- }\
- else if($$0 == "CURL_LIB_RC_FILES") {\
- split(lib_rc, arr);\
- for(val in arr) gen_element(proj_type, "lib", arr[val]);\
- }\
- else if($$0 == "CURL_LIB_VAUTH_C_FILES") {\
- split(lib_vauth_srcs, arr);\
- for(val in arr) gen_element(proj_type, "lib\\vauth", arr[val]);\
- }\
- else if($$0 == "CURL_LIB_VAUTH_H_FILES") {\
- split(lib_vauth_hdrs, arr);\
- for(val in arr) gen_element(proj_type, "lib\\vauth", arr[val]);\
- }\
- else if($$0 == "CURL_LIB_VTLS_C_FILES") {\
- split(lib_vtls_srcs, arr);\
- for(val in arr) gen_element(proj_type, "lib\\vtls", arr[val]);\
- }\
- else if($$0 == "CURL_LIB_VTLS_H_FILES") {\
- split(lib_vtls_hdrs, arr);\
- for(val in arr) gen_element(proj_type, "lib\\vtls", arr[val]);\
- }\
- else if($$0 == "CURL_SRC_C_FILES") {\
- split(src_srcs, arr);\
- for(val in arr) gen_element(proj_type, "src", arr[val]);\
- }\
- else if($$0 == "CURL_SRC_H_FILES") {\
- split(src_hdrs, arr);\
- for(val in arr) gen_element(proj_type, "src", arr[val]);\
- }\
- else if($$0 == "CURL_SRC_RC_FILES") {\
- 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);\
-}';\
- \
- echo "generating '$(VC6_LIBDSP)'"; \
- awk -v proj_type=dsp \
- -v lib_srcs="$$sorted_lib_srcs" \
- -v lib_hdrs="$$sorted_lib_hdrs" \
- -v lib_rc="$$win32_lib_rc" \
- -v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \
- -v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \
- -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \
- -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \
- "$$awk_code" $(srcdir)/$(VC6_LIBTMPL) > $(VC6_LIBDSP) || { exit
1; }; \
- \
- echo "generating '$(VC6_SRCDSP)'"; \
- awk -v proj_type=dsp \
- -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)'"; \
- awk -v proj_type=vcproj1 \
- -v lib_srcs="$$sorted_lib_srcs" \
- -v lib_hdrs="$$sorted_lib_hdrs" \
- -v lib_rc="$$win32_lib_rc" \
- -v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \
- -v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \
- -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \
- -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \
- "$$awk_code" $(srcdir)/$(VC7_LIBTMPL) > $(VC7_LIBVCPROJ) || {
exit 1; }; \
- \
- echo "generating '$(VC7_SRCVCPROJ)'"; \
- awk -v proj_type=vcproj1 \
- -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)'"; \
- awk -v proj_type=vcproj1 \
- -v lib_srcs="$$sorted_lib_srcs" \
- -v lib_hdrs="$$sorted_lib_hdrs" \
- -v lib_rc="$$win32_lib_rc" \
- -v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \
- -v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \
- -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \
- -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \
- "$$awk_code" $(srcdir)/$(VC71_LIBTMPL) > $(VC71_LIBVCPROJ) || {
exit 1; }; \
- \
- echo "generating '$(VC71_SRCVCPROJ)'"; \
- awk -v proj_type=vcproj1 \
- -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)'"; \
- awk -v proj_type=vcproj2 \
- -v lib_srcs="$$sorted_lib_srcs" \
- -v lib_hdrs="$$sorted_lib_hdrs" \
- -v lib_rc="$$win32_lib_rc" \
- -v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \
- -v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \
- -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \
- -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \
- "$$awk_code" $(srcdir)/$(VC8_LIBTMPL) > $(VC8_LIBVCPROJ) || {
exit 1; }; \
- \
- echo "generating '$(VC8_SRCVCPROJ)'"; \
- awk -v proj_type=vcproj2 \
- -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)'"; \
- awk -v proj_type=vcproj2 \
- -v lib_srcs="$$sorted_lib_srcs" \
- -v lib_hdrs="$$sorted_lib_hdrs" \
- -v lib_rc="$$win32_lib_rc" \
- -v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \
- -v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \
- -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \
- -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \
- "$$awk_code" $(srcdir)/$(VC9_LIBTMPL) > $(VC9_LIBVCPROJ) || {
exit 1; }; \
- \
- echo "generating '$(VC9_SRCVCPROJ)'"; \
- awk -v proj_type=vcproj2 \
- -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)'"; \
- awk -v proj_type=vcxproj \
- -v lib_srcs="$$sorted_lib_srcs" \
- -v lib_hdrs="$$sorted_lib_hdrs" \
- -v lib_rc="$$win32_lib_rc" \
- -v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \
- -v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \
- -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \
- -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \
- "$$awk_code" $(srcdir)/$(VC10_LIBTMPL) > $(VC10_LIBVCXPROJ) ||
{ exit 1; }; \
- \
- echo "generating '$(VC10_SRCVCXPROJ)'"; \
- awk -v proj_type=vcxproj \
- -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)'"; \
- awk -v proj_type=vcxproj \
- -v lib_srcs="$$sorted_lib_srcs" \
- -v lib_hdrs="$$sorted_lib_hdrs" \
- -v lib_rc="$$win32_lib_rc" \
- -v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \
- -v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \
- -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \
- -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \
- "$$awk_code" $(srcdir)/$(VC11_LIBTMPL) > $(VC11_LIBVCXPROJ) ||
{ exit 1; }; \
- \
- echo "generating '$(VC11_SRCVCXPROJ)'"; \
- awk -v proj_type=vcxproj \
- -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)'"; \
- awk -v proj_type=vcxproj \
- -v lib_srcs="$$sorted_lib_srcs" \
- -v lib_hdrs="$$sorted_lib_hdrs" \
- -v lib_rc="$$win32_lib_rc" \
- -v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \
- -v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \
- -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \
- -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \
- "$$awk_code" $(srcdir)/$(VC12_LIBTMPL) > $(VC12_LIBVCXPROJ) ||
{ exit 1; }; \
- \
- echo "generating '$(VC12_SRCVCXPROJ)'"; \
- awk -v proj_type=vcxproj \
- -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; }; \
- \
- echo "generating '$(VC14_LIBVCXPROJ)'"; \
- awk -v proj_type=vcxproj \
- -v lib_srcs="$$sorted_lib_srcs" \
- -v lib_hdrs="$$sorted_lib_hdrs" \
- -v lib_rc="$$win32_lib_rc" \
- -v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \
- -v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \
- -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \
- -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \
- "$$awk_code" $(srcdir)/$(VC14_LIBTMPL) > $(VC14_LIBVCXPROJ) ||
{ exit 1; }; \
- \
- echo "generating '$(VC14_SRCVCXPROJ)'"; \
- awk -v proj_type=vcxproj \
- -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)/$(VC14_SRCTMPL) > $(VC14_SRCVCXPROJ) ||
{ exit 1; }; \
- \
- echo "generating '$(VC15_LIBVCXPROJ)'"; \
- awk -v proj_type=vcxproj \
- -v lib_srcs="$$sorted_lib_srcs" \
- -v lib_hdrs="$$sorted_lib_hdrs" \
- -v lib_rc="$$win32_lib_rc" \
- -v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \
- -v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \
- -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \
- -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \
- "$$awk_code" $(srcdir)/$(VC15_LIBTMPL) > $(VC15_LIBVCXPROJ) ||
{ exit 1; }; \
- \
- echo "generating '$(VC15_SRCVCXPROJ)'"; \
- awk -v proj_type=vcxproj \
- -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)/$(VC15_SRCTMPL) > $(VC15_SRCVCXPROJ) ||
{ exit 1; };)
-
tidy:
(cd src && $(MAKE) tidy)
(cd lib && $(MAKE) tidy)
diff --git a/docs/Makefile.am b/docs/Makefile.am
index e0e3f7bfd..fccdd8784 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -44,7 +44,6 @@ EXTRA_DIST = \
BUGS \
CHECKSRC.md \
CIPHERS.md \
- CMakeLists.txt \
CODE_OF_CONDUCT.md \
CODE_STYLE.md \
CONTRIBUTE.md \
@@ -95,7 +94,7 @@ SUFFIXES = .1
$(abs_builddir)/gnurl.1:
if test "$(top_builddir)x" != "$(top_srcdir)x" -a -e
"$(srcdir)/gnurl.1"; then \
$(INSTALL_DATA) "$(srcdir)/gnurl.1" $@; fi
- cd cmdline-opts && $(MAKE)
+# cd cmdline-opts && $(MAKE)
distclean:
rm -f $(CLEANFILES)
diff --git a/docs/cmdline-opts/Makefile.am b/docs/cmdline-opts/Makefile.am
index 4d49b2b94..edc585538 100644
--- a/docs/cmdline-opts/Makefile.am
+++ b/docs/cmdline-opts/Makefile.am
@@ -26,7 +26,7 @@ MANPAGE = $(top_builddir)/docs/gnurl.1
include Makefile.inc
-EXTRA_DIST = $(DPAGES) MANPAGE.md gen.pl $(OTHERPAGES) CMakeLists.txt
+EXTRA_DIST = $(DPAGES) MANPAGE.md gen.pl $(OTHERPAGES)
all:
@echo man page generation no longer required
diff --git a/docs/libcurl/Makefile.am b/docs/libcurl/Makefile.am
index f828db2b4..54c3e7e6f 100644
--- a/docs/libcurl/Makefile.am
+++ b/docs/libcurl/Makefile.am
@@ -39,7 +39,7 @@ CLEANFILES = $(HTMLPAGES) $(PDFPAGES) $(TESTS)
$(man_DISTMANS) \
libgnurl-symbols.3
EXTRA_DIST = $(man_MANS) ABI symbols-in-versions symbols.pl \
- mksymbolsmanpage.pl CMakeLists.txt
+ mksymbolsmanpage.pl
MAN2HTML= roffit --mandir=. $< >$@
SUFFIXES = .3 .html
diff --git a/docs/libcurl/opts/Makefile.am b/docs/libcurl/opts/Makefile.am
index 2ed94e6fb..35fd619fc 100644
--- a/docs/libcurl/opts/Makefile.am
+++ b/docs/libcurl/opts/Makefile.am
@@ -28,6 +28,6 @@ man_DISTMANS = $(man_MANS:.3=.3.dist)
CLEANFILES = $(man_DISTMANS)
-EXTRA_DIST = $(man_MANS) CMakeLists.txt
+EXTRA_DIST = $(man_MANS)
SUFFIXES = .3
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 7003f99cc..4501e5002 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -21,14 +21,12 @@
###########################################################################
AUTOMAKE_OPTIONS = foreign nostdinc
-CMAKE_DIST = CMakeLists.txt curl_config.h.cmake
-
EXTRA_DIST = Makefile.m32 config-win32.h config-win32ce.h \
config-plan9.h config-riscos.h config-mac.h curl_config.h.in \
makefile.dj config-dos.h libgnurl.plist libcurl.rc config-amigaos.h \
makefile.amiga Makefile.netware nwlib.c nwos.c config-win32ce.h \
config-os400.h setup-os400.h config-symbian.h Makefile.Watcom \
- config-tpf.h mk-ca-bundle.pl mk-ca-bundle.vbs $(CMAKE_DIST) \
+ config-tpf.h mk-ca-bundle.pl mk-ca-bundle.vbs \
firefox-db2pem.sh config-vxworks.h Makefile.vxworks checksrc.pl
lib_LTLIBRARIES = libgnurl.la
diff --git a/src/Makefile.am b/src/Makefile.am
index 1350f6025..5710fb4d4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -87,7 +87,7 @@ NROFF=env LC_ALL=C @NROFF@ @MANOPT@ # figured out by the
configure script
EXTRA_DIST = mkhelp.pl makefile.dj \
Makefile.m32 macos/curl.mcp.xml.sit.hqx macos/MACINSTALL.TXT \
macos/src/curl_GUSIConfig.cpp macos/src/macos_main.cpp makefile.amiga \
- curl.rc Makefile.netware Makefile.inc Makefile.Watcom CMakeLists.txt
+ curl.rc Makefile.netware Makefile.inc Makefile.Watcom
# Use absolute directory to disable VPATH
MANPAGE=$(abs_top_builddir)/docs/gnurl.1
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 764e7daac..937111669 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -33,7 +33,7 @@ EXTRA_DIST = ftpserver.pl httpserver.pl secureserver.pl
runtests.pl \
getpart.pm FILEFORMAT README stunnel.pem memanalyze.pl testcurl.pl \
valgrind.pm ftp.pm sshserver.pl sshhelp.pm pathhelp.pm testcurl.1 runtests.1 \
serverhelp.pm tftpserver.pl rtspserver.pl directories.pm symbol-scan.pl \
- CMakeLists.txt mem-include-scan.pl valgrind.supp extern-scan.pl \
+ mem-include-scan.pl valgrind.supp extern-scan.pl \
manpage-scan.pl nroff-scan.pl http2-server.pl dictserver.py.in
\
negtelnetserver.py.in $(SMBDEPS) objnames-test08.sh objnames-test10.sh
\
objnames.inc disable-scan.pl
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 4ec0364ba..a4b281f3c 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -5,7 +5,7 @@ test:
# TESTCASES are taken from Makefile.inc
include Makefile.inc
-EXTRA_DIST = $(TESTCASES) DISABLED CMakeLists.txt
+EXTRA_DIST = $(TESTCASES) DISABLED
filecheck:
@mkdir test-place; \
diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am
index a2281c456..ff347e977 100644
--- a/tests/libtest/Makefile.am
+++ b/tests/libtest/Makefile.am
@@ -45,7 +45,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include \
endif
EXTRA_DIST = test75.pl test307.pl test610.pl test613.pl test1013.pl \
- test1022.pl Makefile.inc notexists.pl CMakeLists.txt mk-lib1521.pl
+ test1022.pl Makefile.inc notexists.pl mk-lib1521.pl
CFLAG_CURL_SYMBOL_HIDING = @CFLAG_CURL_SYMBOL_HIDING@
diff --git a/tests/server/Makefile.am b/tests/server/Makefile.am
index ef3303ec1..177e0215e 100644
--- a/tests/server/Makefile.am
+++ b/tests/server/Makefile.am
@@ -54,7 +54,7 @@ endif
# Makefile.inc provides neat definitions
include Makefile.inc
-EXTRA_DIST = base64.pl Makefile.inc CMakeLists.txt
+EXTRA_DIST = base64.pl Makefile.inc
CHECKSRC = $(CS_$(V))
CS_0 = @echo " RUN " $@;
diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index 6996cad6a..c390c57da 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -48,7 +48,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include \
-I$(top_srcdir)/tests/libtest
endif
-EXTRA_DIST = Makefile.inc CMakeLists.txt
+EXTRA_DIST = Makefile.inc
CFLAGS += @CURL_CFLAG_EXTRAS@
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [gnurl] branch master updated (d95c29a1a -> 6e99438e3), gnunet, 2019/11/18
- [gnurl] 04/10: remove more CMake, gnunet, 2019/11/18
- [gnurl] 03/10: remove .github, gnunet, 2019/11/18
- [gnurl] 02/10: remove CMake, gnunet, 2019/11/18
- [gnurl] 10/10: makefile, gnunet, 2019/11/18
- [gnurl] 07/10: rename, gnunet, 2019/11/18
- [gnurl] 06/10: remove more CMake, remove unused personal pubkey, rewrite perl SHaline, gnunet, 2019/11/18
- [gnurl] 09/10: syntax, gnunet, 2019/11/18
- [gnurl] 08/10: adjust buildsystem to make make distcheck almost pass.,
gnunet <=
- [gnurl] 01/10: remove windows ide files., gnunet, 2019/11/18
- [gnurl] 05/10: remove winbuild and more CMake, gnunet, 2019/11/18