From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 20 Dec 2023 22:10:38 +0000 (+0100)
Subject: Makefile.am: fix the MSVC project generation
X-Git-Tag: curl-8_6_0~188
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3cd153d21ab1b5c4d02596469fd295c3186f9ebd;p=thirdparty%2Fcurl.git

Makefile.am: fix the MSVC project generation

It made the vcxproj files not get included in dist tarballs.

Regression since 74423b5df4c8117891eb89 (8.5.0)

Reported-by: iAroc on github
Fixes #12564
Closes #12567
---

diff --git a/Makefile.am b/Makefile.am
index c8afcb505a..d0b1fef59a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -127,8 +127,9 @@ EXTRA_DIST = CHANGES COPYING maketgz Makefile.dist curl-config.in            \
  $(VC_DIST) $(WINBUILD_DIST) $(PLAN9_DIST) lib/libcurl.vers.in buildconf.bat \
  libcurl.def
 
-CLEANFILES = $(VC14_LIBVCXPROJ) \
- $(VC14_SRCVCXPROJ) $(VC14_10_LIBVCXPROJ) $(VC14_10_SRCVCXPROJ)              \
+CLEANFILES = $(VC14_LIBVCXPROJ) $(VC14_SRCVCXPROJ) \
+ $(VC14_10_LIBVCXPROJ) $(VC14_10_SRCVCXPROJ)       \
+ $(VC14_20_LIBVCXPROJ) $(VC14_20_SRCVCXPROJ)       \
  $(VC14_30_LIBVCXPROJ) $(VC14_30_SRCVCXPROJ)
 
 bin_SCRIPTS = curl-config
@@ -509,7 +510,8 @@ function gen_element(type, dir, file)\
 		-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_20_SRCTMPL) > $(VC14_20_SRCVCXPROJ) || { exit 1; };) \
+		"$$awk_code" $(srcdir)/$(VC14_20_SRCTMPL) > $(VC14_20_SRCVCXPROJ) || { exit 1; }; \
+	\
 	echo "generating '$(VC14_30_LIBVCXPROJ)'"; \
 	awk -v proj_type=vcxproj \
 		-v lib_srcs="$$sorted_lib_srcs" \