syntax

3 files changed, 31 insertions, 37 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 4501e5002..a6c361414 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -21,13 +21,15 @@
 ###########################################################################
 AUTOMAKE_OPTIONS = foreign nostdinc
 
-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                      \
- firefox-db2pem.sh config-vxworks.h Makefile.vxworks checksrc.pl
+ED_1 = Makefile.m32 config-win32.h config-win32ce.h
+ED_2 = config-plan9.h config-riscos.h config-mac.h curl_config.h.in
+ED_3 = makefile.dj config-dos.h libgnurl.plist libcurl.rc config-amigaos.h
+ED_4 = makefile.amiga Makefile.netware nwlib.c nwos.c config-win32ce.h
+ED_5 = config-os400.h setup-os400.h config-symbian.h Makefile.Watcom
+ED_6 = config-tpf.h mk-ca-bundle.pl mk-ca-bundle.vbs
+ED_7 = firefox-db2pem.sh config-vxworks.h Makefile.vxworks checksrc.pl
+
+EXTRA_DIST = $(ED_1) $(ED_2) $(ED_3) $(ED_4) $(ED_5) $(ED_6) $(ED_7)
 
 lib_LTLIBRARIES = libgnurl.la
 
@@ -51,13 +53,10 @@ CFLAGS += @CURL_CFLAG_EXTRAS@
 # $(top_builddir)/ares is for in-tree c-ares's generated ares_build.h file
 # $(top_srcdir)/ares is for in-tree c-ares's external include files
 
-AM_CPPFLAGS = -I$(top_srcdir)/include        \
-              -I$(top_builddir)/lib          \
-              -I$(top_srcdir)/lib
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/lib -I$(top_srcdir)/lib
 
 if USE_EMBEDDED_ARES
-AM_CPPFLAGS += -I$(top_builddir)/ares        \
-               -I$(top_srcdir)/ares
+AM_CPPFLAGS += -I$(top_builddir)/ares -I$(top_srcdir)/ares
 endif
 
 # Prevent LIBS from being used for all link targets
@@ -135,8 +134,7 @@ CS_1 =
 CS_ = $(CS_0)
 
 checksrc:
-	$(CHECKSRC)(@PERL@ $(srcdir)/checksrc.pl -D$(srcdir) -W$(srcdir)/curl_config.h \
-	$(srcdir)/*.[ch] $(srcdir)/vauth/*.[ch] $(srcdir)/vtls/*.[ch] $(srcdir)/vquic/*.[ch] $(srcdir)/vssh/*.[ch])
+	$(CHECKSRC)(@PERL@ $(srcdir)/checksrc.pl -D$(srcdir) -W$(srcdir)/curl_config.h $(srcdir)/*.[ch] $(srcdir)/vauth/*.[ch] $(srcdir)/vtls/*.[ch] $(srcdir)/vquic/*.[ch] $(srcdir)/vssh/*.[ch])
 
 if CURLDEBUG
 # for debug builds, we scan the sources on all regular make invokes
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 937111669..3a3a921bb 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -24,19 +24,22 @@ MANDISTPAGES = runtests.1.dist testcurl.1.dist
 
 # the path to the impacket python lib used for SMB tests
 IMP = python_dependencies/impacket
-SMBDEPS = $(IMP)/__init__.py $(IMP)/nmb.py $(IMP)/nt_errors.py          \
- $(IMP)/ntlm.py $(IMP)/smb.py $(IMP)/smb3.py $(IMP)/smb3structs.py      \
- $(IMP)/smbserver.py $(IMP)/spnego.py $(IMP)/structure.py               \
- $(IMP)/uuid.py $(IMP)/version.py smbserver.py.in curl_test_data.py.in
-
-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      \
- 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
+SMB_1 = $(IMP)/__init__.py $(IMP)/nmb.py $(IMP)/nt_errors.py
+SMB_2 = $(IMP)/ntlm.py $(IMP)/smb.py $(IMP)/smb3.py $(IMP)/smb3structs.py
+SMB_3 = $(IMP)/smbserver.py $(IMP)/spnego.py $(IMP)/structure.py
+SMB_4 = $(IMP)/uuid.py $(IMP)/version.py smbserver.py.in curl_test_data.py.in
+SMBDEPS = $(SMB_1) $(SMB_2) $(SMB_3) $(SMB_4)
+
+ED_1 = ftpserver.pl httpserver.pl secureserver.pl runtests.pl
+ED_2 = getpart.pm FILEFORMAT README stunnel.pem memanalyze.pl testcurl.pl
+ED_3 = valgrind.pm ftp.pm sshserver.pl sshhelp.pm pathhelp.pm testcurl.1 runtests.1
+ED_4 = serverhelp.pm tftpserver.pl rtspserver.pl directories.pm symbol-scan.pl
+ED_5 = mem-include-scan.pl valgrind.supp extern-scan.pl
+ED_6 = manpage-scan.pl nroff-scan.pl http2-server.pl dictserver.py.in
+ED_7 = negtelnetserver.py.in $(SMBDEPS) objnames-test08.sh objnames-test10.sh
+ED_8 = objnames.inc disable-scan.pl
+
+EXTRA_DIST = $(ED_1) $(ED_2) $(ED_3) $(ED_4) $(ED_5) $(ED_6) $(ED_7) $(ED_8)
 
 check_SCRIPTS = smbserver.py curl_test_data.py negtelnetserver.py dictserver.py
 
diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am
index ff347e977..3d113c7ed 100644
--- a/tests/libtest/Makefile.am
+++ b/tests/libtest/Makefile.am
@@ -33,19 +33,12 @@ AUTOMAKE_OPTIONS = foreign nostdinc
 # $(top_srcdir)/ares is for in-tree c-ares's external include files
 
 if USE_EMBEDDED_ARES
-AM_CPPFLAGS = -I$(top_srcdir)/include        \
-              -I$(top_builddir)/lib          \
-              -I$(top_srcdir)/lib            \
-              -I$(top_builddir)/ares         \
-              -I$(top_srcdir)/ares
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/lib -I$(top_srcdir)/lib -I$(top_builddir)/ares -I$(top_srcdir)/ares
 else
-AM_CPPFLAGS = -I$(top_srcdir)/include        \
-              -I$(top_builddir)/lib          \
-              -I$(top_srcdir)/lib
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/lib -I$(top_srcdir)/lib
 endif
 
-EXTRA_DIST = test75.pl test307.pl test610.pl test613.pl test1013.pl \
-  test1022.pl Makefile.inc notexists.pl mk-lib1521.pl
+EXTRA_DIST = test75.pl test307.pl test610.pl test613.pl test1013.pl test1022.pl Makefile.inc notexists.pl mk-lib1521.pl
 
 CFLAG_CURL_SYMBOL_HIDING = @CFLAG_CURL_SYMBOL_HIDING@