Makefile.dist: delete

It had shorthand aliases to launch `./configure` and
`./configure --with-openssl`. The former hasn't worked for a long while
because of missing TLS.

Its `ca-bundle` and `ca-firefox` targets have been broken for 2.5 years
till recently. These targets also exist in `./configure` and have been
working all along.

Also:
- cmake: add support `curl-ca-bundle` and `curl-ca-firefox` targets.
- tests/testcurl.pl: drop obsolete build logic.

Closes #16094

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 70d9426d47ca94ae13c7c0771fdf7cd130aab482..2d869882fe2b9f3da17d0b8626213ca2b91f2258 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -515,6 +515,19 @@ endif()
 
 find_package(Perl)
 
+if(PERL_EXECUTABLE)
+  add_custom_target(curl-ca-bundle
+    COMMENT "Generating a fresh ca-bundle.crt" VERBATIM USES_TERMINAL
+    COMMAND "${PERL_EXECUTABLE}" "${PROJECT_SOURCE_DIR}/scripts/mk-ca-bundle.pl" -b -l -u "lib/ca-bundle.crt"
+    DEPENDS "${PROJECT_SOURCE_DIR}/scripts/mk-ca-bundle.pl"
+  )
+  add_custom_target(curl-ca-firefox
+    COMMENT "generating a fresh ca-bundle.crt" VERBATIM USES_TERMINAL
+    COMMAND "${PERL_EXECUTABLE}" "${PROJECT_SOURCE_DIR}/scripts/firefox-db2pem.sh" "lib/ca-bundle.crt"
+    DEPENDS "${PROJECT_SOURCE_DIR}/scripts/firefox-db2pem.sh"
+  )
+endif()
+
 option(BUILD_LIBCURL_DOCS "Build libcurl man pages" ON)
 option(BUILD_MISC_DOCS "Build misc man pages (e.g. curl-config and mk-ca-bundle)" ON)
 option(ENABLE_CURL_MANUAL "Build the man page for curl and enable its -M/--manual option" ON)

diff --git a/Makefile.am b/Makefile.am
index d5832c41bd13888227b7fd5f494d654039c25d45..2a130a7e4eee5f4fada0dcfe872c204261efc8e5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -81,9 +81,8 @@ PLAN9_DIST = plan9/include/mkfile \
  plan9/src/mkfile.inc             \
  plan9/src/mkfile
 
-EXTRA_DIST = CHANGES.md COPYING Makefile.dist             \
- RELEASE-NOTES $(CMAKE_DIST) $(VC_DIST) $(WINBUILD_DIST)  \
- $(PLAN9_DIST) Dockerfile
+EXTRA_DIST = CHANGES.md COPYING RELEASE-NOTES Dockerfile \
+ $(CMAKE_DIST) $(VC_DIST) $(WINBUILD_DIST) $(PLAN9_DIST)
 
 DISTCLEANFILES = buildinfo.txt
 
@@ -97,7 +96,7 @@ pkgconfig_DATA = libcurl.pc
 
 dist-hook:
        rm -rf $(top_builddir)/tests/log
-       find $(distdir) -name "*.dist" -a \! -name Makefile.dist -exec rm {} \;
+       find $(distdir) -name "*.dist" -exec rm {} \;
        (distit=`find $(srcdir) -name "*.dist" | grep -v Makefile`; \
        for file in $$distit; do \
          strip=`echo $$file | sed -e s/^$(srcdir)// -e s/\.dist//`; \

diff --git a/Makefile.dist b/Makefile.dist
deleted file mode 100644 (file)
index 61ba795..0000000
--- a/Makefile.dist
+++ /dev/null
@@ -1,48 +0,0 @@
-#***************************************************************************
-#                                  _   _ ____  _
-#  Project                     ___| | | |  _ \| |
-#                             / __| | | | |_) | |
-#                            | (__| |_| |  _ <| |___
-#                             \___|\___/|_| \_\_____|
-#
-# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
-#
-# This software is licensed as described in the file COPYING, which
-# you should have received as part of this distribution. The terms
-# are also available at https://curl.se/docs/copyright.html.
-#
-# You may opt to use, copy, modify, merge, publish, distribute and/or sell
-# copies of the Software, and permit persons to whom the Software is
-# furnished to do so, under the terms of the COPYING file.
-#
-# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-# KIND, either express or implied.
-#
-# SPDX-License-Identifier: curl
-#
-###########################################################################
-
-all:
-       ./configure
-       make
-
-ssl:
-       ./configure --with-openssl
-       make
-
-cygwin: all
-cygwin-ssl: ssl
-
-unix: all
-unix-ssl: ssl
-
-linux: all
-linux-ssl: ssl
-
-ca-bundle: scripts/mk-ca-bundle.pl
-       @echo "generate a fresh ca-bundle.crt"
-       @perl $< -b -l -u lib/ca-bundle.crt
-
-ca-firefox: scripts/firefox-db2pem.sh
-       @echo "generate a fresh ca-bundle.crt"
-       ./scripts/firefox-db2pem.sh lib/ca-bundle.crt

diff --git a/scripts/maketgz b/scripts/maketgz
index af62708bc1c92570fd5c74b13cdffee1cef75040..d7059554d34b8c68660985cfac6ff1836d19ecdc 100755 (executable)
--- a/scripts/maketgz
+++ b/scripts/maketgz
@@ -68,10 +68,9 @@ fi
 
 #
 # As a precaution, remove all *.dist files that may be lying around, to reduce
-# the risk of old leftovers getting shipped. The root 'Makefile.dist' is the
-# exception.
+# the risk of old leftovers getting shipped.
 echo "removing all old *.dist files"
-find . -name "*.dist" -a ! -name Makefile.dist -exec rm {} \;
+find . -name "*.dist" -exec rm {} \;
 
 numeric="$(printf "%02x%02x%02x\n" "$major" "$minor" "$patch")"
 

diff --git a/tests/testcurl.pl b/tests/testcurl.pl
index 12ca212e05d7ece6df796770766ba378107d8bc0..096944b86c080b1fef8cd9973dbe3a2fccb74b07 100755 (executable)
--- a/tests/testcurl.pl
+++ b/tests/testcurl.pl
@@ -567,16 +567,6 @@ if ($configurebuild) {
   if ($^O eq 'MSWin32') {
     system("xcopy /s /q \"$CURLDIR\" .");
   }
-  elsif ($^O eq 'linux') {
-    system("cp -afr $CURLDIR/* .");
-    system("cp -af $CURLDIR/Makefile.dist Makefile");
-    system("$make -i -C lib -f Makefile.$targetos prebuild");
-    system("$make -i -C src -f Makefile.$targetos prebuild");
-    if (-d "$CURLDIR/ares") {
-      system("cp -af $CURLDIR/ares/ares_build.h.dist ./ares/ares_build.h");
-      system("$make -i -C ares -f Makefile.$targetos prebuild");
-    }
-  }
 }
 
 if(-f "./libcurl.pc") {