Makefile.mk: use Makefile.inc from example and tests

Instead of assembling the list using `$(wildcard ...)`.

Also split off a `tests/Makefile.inc` from `tests/Makefile.am`. With its
simpler syntax, this also allows to delete some complexity from the
CMake loader.

Cherry-picked from libssh2#1017

Author: vszakats

CMakeLists.txt

@@ -384,15 +384,7 @@ endif()
 
 # Convert GNU Make assignments into CMake ones.
 function(transform_makefile_inc INPUT_FILE OUTPUT_FILE)
-  file(STRINGS ${INPUT_FILE} LINES)
-
-  unset(MAKEFILE_INC_CMAKE)
-  foreach(LINE IN LISTS LINES)
-    if(NOT LINE MATCHES " \\+= " AND
-       NOT LINE MATCHES "^(if|endif)")
-      set(MAKEFILE_INC_CMAKE "${MAKEFILE_INC_CMAKE}\n${LINE}")
-    endif()
-  endforeach()
+  file(READ ${INPUT_FILE} MAKEFILE_INC_CMAKE)
 
   string(REGEX REPLACE "\\\\\n" "" MAKEFILE_INC_CMAKE ${MAKEFILE_INC_CMAKE})
   string(REGEX REPLACE "([A-Za-z_]+) *= *([^\n]*)" "set(\\1 \\2)" MAKEFILE_INC_CMAKE ${MAKEFILE_INC_CMAKE})

Makefile.mk

@@ -194,6 +194,8 @@ ifdef WIN32
   LIBSSH2_LDFLAGS_DYN += -Wl,--output-def,$(libssh2_def_LIBRARY),--out-implib,$(libssh2_dyn_a_LIBRARY)
 endif
 
+# Get noinst_PROGRAMS define
+include example/Makefile.am
 TARGETS_EXAMPLES := $(patsubst %.c,%$(BIN_EXT),$(strip $(wildcard example/*.c)))
 
 all: lib dyn
@@ -209,9 +211,11 @@ prebuild: $(OBJ_DIR) $(OBJ_DIR)/version.inc
 
 example: $(TARGETS_EXAMPLES)
 
+# Get DOCKER_TESTS, STANDALONE_TESTS, SSHD_TESTS, librunner_la_SOURCES defines
+include tests/Makefile.inc
 TARGETS_RUNNER := $(TARGET)-runner.a
-TARGETS_RUNNER_OBJS := $(addprefix $(OBJ_DIR)/,$(patsubst %.c,%.o,runner.c session_fixture.c openssh_fixture.c))
-TARGETS_TESTS := $(patsubst %.c,%$(BIN_EXT),$(strip $(wildcard tests/test_*.c)))
+TARGETS_RUNNER_OBJS := $(addprefix $(OBJ_DIR)/,$(patsubst %.c,%.o,$(filter %.c,$(librunner_la_SOURCES))))
+TARGETS_TESTS := $(patsubst %.c,%$(BIN_EXT),$(addprefix tests/,$(addsuffix .c,$(DOCKER_TESTS) $(STANDALONE_TESTS) $(SSHD_TESTS))))
 
 test: $(TARGETS_RUNNER) $(TARGETS_TESTS)
 

tests/.gitignore

@@ -4,4 +4,4 @@
 *.gcda
 Makefile
 Makefile.in
-Makefile.am.cmake
+Makefile.inc.cmake

tests/CMakeLists.txt

@@ -37,9 +37,9 @@ include(CopyRuntimeDependencies)
 
 list(APPEND LIBRARIES ${SOCKET_LIBRARIES})
 
-transform_makefile_inc("Makefile.am" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.am.cmake")
+transform_makefile_inc("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
 # Get 'DOCKER_TESTS', 'STANDALONE_TESTS', 'SSHD_TESTS', 'librunner_la_SOURCES' variables
-include(${CMAKE_CURRENT_BINARY_DIR}/Makefile.am.cmake)
+include(${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake)
 
 if(CMAKE_COMPILER_IS_GNUCC)
   find_program(GCOV_PATH gcov)

tests/Makefile.am

@@ -2,41 +2,8 @@ SUBDIRS = ossfuzz
 
 AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src -I$(top_srcdir)/include
 
-# Keep this list sorted
-#
-# NOTE: test_auth_keyboard_info_request does not use the network, but when
-#       run as Windows standalone test, it intermittently fails on GHA with:
-#         `Terminate batch job (Y/N)?`
-DOCKER_TESTS = \
-  test_aa_warmup \
-  test_agent_forward_ok \
-  test_auth_keyboard_fail \
-  test_auth_keyboard_info_request \
-  test_auth_keyboard_ok \
-  test_auth_password_fail_password \
-  test_auth_password_fail_username \
-  test_auth_password_ok \
-  test_auth_pubkey_fail \
-  test_auth_pubkey_ok_dsa \
-  test_auth_pubkey_ok_ecdsa \
-  test_auth_pubkey_ok_ecdsa_signed \
-  test_auth_pubkey_ok_ed25519 \
-  test_auth_pubkey_ok_ed25519_encrypted \
-  test_auth_pubkey_ok_ed25519_mem \
-  test_auth_pubkey_ok_rsa \
-  test_auth_pubkey_ok_rsa_encrypted \
-  test_auth_pubkey_ok_rsa_openssh \
-  test_auth_pubkey_ok_rsa_signed \
-  test_hostkey \
-  test_hostkey_hash \
-  test_read
-
-STANDALONE_TESTS = \
-  test_simple
-
-SSHD_TESTS = \
-  test_ssh2 \
-  test_auth_pubkey_ok_ed25519
+# Get DOCKER_TESTS, STANDALONE_TESTS, SSHD_TESTS, librunner_la_SOURCES defines
+include Makefile.inc
 
 # FIXME: Exported by autotools with the same value by default anyway?
 TESTS_ENVIRONMENT = srcdir=$(top_srcdir)/tests builddir=$(top_builddir)/tests
@@ -66,10 +33,6 @@ TESTS += test_read_algos.test
 check_PROGRAMS = $(DOCKER_TESTS) $(STANDALONE_TESTS) $(SSHD_TESTS)
 
 # Internal library used by tests
-librunner_la_SOURCES = \
-  runner.c runner.h \
-  session_fixture.c session_fixture.h \
-  openssh_fixture.c openssh_fixture.h
 LDADD = librunner.la
 check_LTLIBRARIES = librunner.la
 
@@ -81,44 +44,3 @@ test_simple_LDFLAGS = -static
 
 # This must be last in the list so it resolves symbols in previous libraries
 LDADD += ../src/libssh2.la
-
-EXTRA_DIST = \
-  CMakeLists.txt \
-  key_dsa \
-  key_dsa.pub \
-  key_dsa_wrong \
-  key_dsa_wrong.pub \
-  key_ecdsa \
-  key_ecdsa.pub \
-  key_ecdsa_signed \
-  key_ecdsa_signed-cert.pub \
-  key_ecdsa_signed.pub \
-  key_ed25519 \
-  key_ed25519.pub \
-  key_ed25519_encrypted \
-  key_ed25519_encrypted.pub \
-  key_rsa \
-  key_rsa.pub \
-  key_rsa_encrypted \
-  key_rsa_encrypted.pub \
-  key_rsa_openssh \
-  key_rsa_openssh.pub \
-  key_rsa_signed \
-  key_rsa_signed-cert.pub \
-  key_rsa_signed.pub \
-  mansyntax.sh \
-  openssh_server/Dockerfile \
-  openssh_server/authorized_keys \
-  openssh_server/ca_ecdsa \
-  openssh_server/ca_ecdsa.pub \
-  openssh_server/ca_rsa \
-  openssh_server/ca_rsa.pub \
-  openssh_server/ca_user_keys.pub \
-  openssh_server/ssh_host_ecdsa_key \
-  openssh_server/ssh_host_ed25519_key \
-  openssh_server/ssh_host_rsa_key \
-  openssh_server/sshd_config \
-  test_read_algos.test \
-  test_read_algos.txt \
-  test_sshd.test \
-  sshd_fixture.sh

tests/Makefile.inc

@@ -0,0 +1,81 @@
+# Keep this list sorted
+#
+# NOTE: test_auth_keyboard_info_request does not use the network, but when
+#       run as Windows standalone test, it intermittently fails on GHA with:
+#         `Terminate batch job (Y/N)?`
+DOCKER_TESTS = \
+  test_aa_warmup \
+  test_agent_forward_ok \
+  test_auth_keyboard_fail \
+  test_auth_keyboard_info_request \
+  test_auth_keyboard_ok \
+  test_auth_password_fail_password \
+  test_auth_password_fail_username \
+  test_auth_password_ok \
+  test_auth_pubkey_fail \
+  test_auth_pubkey_ok_dsa \
+  test_auth_pubkey_ok_ecdsa \
+  test_auth_pubkey_ok_ecdsa_signed \
+  test_auth_pubkey_ok_ed25519 \
+  test_auth_pubkey_ok_ed25519_encrypted \
+  test_auth_pubkey_ok_ed25519_mem \
+  test_auth_pubkey_ok_rsa \
+  test_auth_pubkey_ok_rsa_encrypted \
+  test_auth_pubkey_ok_rsa_openssh \
+  test_auth_pubkey_ok_rsa_signed \
+  test_hostkey \
+  test_hostkey_hash \
+  test_read
+
+STANDALONE_TESTS = \
+  test_simple
+
+SSHD_TESTS = \
+  test_ssh2 \
+  test_auth_pubkey_ok_ed25519
+
+librunner_la_SOURCES = \
+  runner.c runner.h \
+  session_fixture.c session_fixture.h \
+  openssh_fixture.c openssh_fixture.h
+
+EXTRA_DIST = \
+  CMakeLists.txt \
+  key_dsa \
+  key_dsa.pub \
+  key_dsa_wrong \
+  key_dsa_wrong.pub \
+  key_ecdsa \
+  key_ecdsa.pub \
+  key_ecdsa_signed \
+  key_ecdsa_signed-cert.pub \
+  key_ecdsa_signed.pub \
+  key_ed25519 \
+  key_ed25519.pub \
+  key_ed25519_encrypted \
+  key_ed25519_encrypted.pub \
+  key_rsa \
+  key_rsa.pub \
+  key_rsa_encrypted \
+  key_rsa_encrypted.pub \
+  key_rsa_openssh \
+  key_rsa_openssh.pub \
+  key_rsa_signed \
+  key_rsa_signed-cert.pub \
+  key_rsa_signed.pub \
+  mansyntax.sh \
+  openssh_server/Dockerfile \
+  openssh_server/authorized_keys \
+  openssh_server/ca_ecdsa \
+  openssh_server/ca_ecdsa.pub \
+  openssh_server/ca_rsa \
+  openssh_server/ca_rsa.pub \
+  openssh_server/ca_user_keys.pub \
+  openssh_server/ssh_host_ecdsa_key \
+  openssh_server/ssh_host_ed25519_key \
+  openssh_server/ssh_host_rsa_key \
+  openssh_server/sshd_config \
+  test_read_algos.test \
+  test_read_algos.txt \
+  test_sshd.test \
+  sshd_fixture.sh

tests/test_sshd.test

@@ -8,7 +8,7 @@ set -u
 d="$(dirname "$0")"
 uname="$(uname)"
 
-# Load list of SSHD tests from Makefile.am
+# Load list of SSHD tests from Makefile.inc
 tests=''
 load=0
 while read -r l; do
@@ -20,7 +20,7 @@ while read -r l; do
     # On Windows, subsequent tests may be flaky
     [[ "${uname}" = *'_NT'* ]] && break
   fi
-done <<< "$(tr -d $"\r" < "${d}/Makefile.am")"
+done <<< "$(tr -d $"\r" < "${d}/Makefile.inc")"
 
 count=1
 total="$(echo "${tests}" | wc -w | tr -d ' ')"