summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2016-04-18 14:58:11 +0200
committerDaniel Stenberg <daniel@haxx.se>2016-04-18 14:58:11 +0200
commitab493af731a55ca0c7936f277bfb2a24a1b723d9 (patch)
tree04d622790cd646cefeb743285e7f792e03419290
parent743fa106709cc391077ceb6237e42f6bed65cd4a (diff)
downloadgnurl-ab493af731a55ca0c7936f277bfb2a24a1b723d9.tar.gz
gnurl-ab493af731a55ca0c7936f277bfb2a24a1b723d9.tar.bz2
gnurl-ab493af731a55ca0c7936f277bfb2a24a1b723d9.zip
checksrc/makefile.am: use $top_srcdir to find source files
... to properly support out of source tree builds.
-rw-r--r--docs/examples/Makefile.am2
-rw-r--r--lib/Makefile.am3
-rw-r--r--src/Makefile.am2
-rw-r--r--tests/libtest/Makefile.am2
-rw-r--r--tests/server/Makefile.am2
-rw-r--r--tests/unit/Makefile.am2
6 files changed, 7 insertions, 6 deletions
diff --git a/docs/examples/Makefile.am b/docs/examples/Makefile.am
index dec53f528..402d0fb4e 100644
--- a/docs/examples/Makefile.am
+++ b/docs/examples/Makefile.am
@@ -63,4 +63,4 @@ include Makefile.inc
all: $(check_PROGRAMS)
checksrc:
- @@PERL@ $(top_srcdir)/lib/checksrc.pl -D$(top_srcdir)/docs/examples *.c
+ @PERL@ $(top_srcdir)/lib/checksrc.pl $(top_srcdir)/docs/examples/*.c
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0e56aec27..1e0fda387 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -146,7 +146,8 @@ libcurl_la_SOURCES = $(CSOURCES) $(HHEADERS)
libcurlu_la_SOURCES = $(CSOURCES) $(HHEADERS)
checksrc:
- @@PERL@ $(top_srcdir)/lib/checksrc.pl -D$(top_srcdir)/lib -Wcurl_config.h *.[ch] vauth/*.[ch] vtls/*.[ch]
+ @PERL@ $(top_srcdir)/lib/checksrc.pl -W$(top_srcdir)/lib/curl_config.h \
+ $(top_srcdir)/lib/*.[ch] $(top_srcdir)/lib/vauth/*.[ch] $(top_srcdir)/lib/vtls/*.[ch]
if CURLDEBUG
# for debug builds, we scan the sources on all regular make invokes
diff --git a/src/Makefile.am b/src/Makefile.am
index fa6833167..28df6709e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -130,7 +130,7 @@ endif
# ignore tool_hugehelp.c since it is generated source code and it plays
# by slightly different rules!
checksrc:
- @@PERL@ $(top_srcdir)/lib/checksrc.pl -D$(top_srcdir)/src -Wtool_hugehelp.c *.[ch]
+ @PERL@ $(top_srcdir)/lib/checksrc.pl -W$(top_srcdir)/src/tool_hugehelp.c $(top_srcdir)/src/*.[ch]
if CURLDEBUG
# for debug builds, we scan the sources on all regular make invokes
diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am
index de83fcd23..a22e9610f 100644
--- a/tests/libtest/Makefile.am
+++ b/tests/libtest/Makefile.am
@@ -117,4 +117,4 @@ libhostname_la_LIBADD =
libhostname_la_DEPENDENCIES =
checksrc:
- @@PERL@ $(top_srcdir)/lib/checksrc.pl $(top_srcdir)/tests/libtest/*.c
+ @PERL@ $(top_srcdir)/lib/checksrc.pl $(top_srcdir)/tests/libtest/*.c
diff --git a/tests/server/Makefile.am b/tests/server/Makefile.am
index 48c91d87c..42efd7762 100644
--- a/tests/server/Makefile.am
+++ b/tests/server/Makefile.am
@@ -63,4 +63,4 @@ include Makefile.inc
EXTRA_DIST = base64.pl Makefile.inc CMakeLists.txt
checksrc:
- @@PERL@ $(top_srcdir)/lib/checksrc.pl $(top_srcdir)/tests/libtest/*.c
+ @PERL@ $(top_srcdir)/lib/checksrc.pl $(top_srcdir)/tests/libtest/*.c
diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index f44d623be..1ce798bee 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -72,7 +72,7 @@ AM_CPPFLAGS += -DCURL_STATICLIB -DUNITTESTS
include Makefile.inc
checksrc:
- @@PERL@ $(top_srcdir)/lib/checksrc.pl $(top_srcdir)/tests/unit/*.c
+ @PERL@ $(top_srcdir)/lib/checksrc.pl $(top_srcdir)/tests/unit/*.c
if BUILD_UNITTESTS
noinst_PROGRAMS = $(UNITPROGS)