X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.am;h=69976bf8ec38681e2d26e833ea542b4b472b8c22;hb=239fab3e3bb2f06a19db3cd1c3e91c93c7141891;hp=1f649acf5bf961b7466c265bad2a0dc093022358;hpb=d568459fc424175df73779da8cae92fee466abf6;p=miniexpect.git

diff --git a/Makefile.am b/Makefile.am
index 1f649ac..69976bf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,8 +24,8 @@ EXTRA_DIST = miniexpect.3
 lib_LTLIBRARIES = libminiexpect.la
 
 libminiexpect_la_SOURCES = miniexpect.c miniexpect.h
-libminiexpect_la_CFLAGS = $(PCRE_CFLAGS) -Wall
-libminiexpect_la_LIBADD = $(PCRE_LIBS)
+libminiexpect_la_CFLAGS = $(PCRE2_CFLAGS) -Wall
+libminiexpect_la_LIBADD = $(PCRE2_LIBS)
 libminiexpect_la_LDFLAGS = -version-info 0:0:0
 
 # Examples.
@@ -33,18 +33,38 @@ libminiexpect_la_LDFLAGS = -version-info 0:0:0
 noinst_PROGRAMS = example-sshpass
 
 example_sshpass_SOURCES = example-sshpass.c
-example_sshpass_CFLAGS = $(PCRE_CFLAGS) -Wall
+example_sshpass_CFLAGS = $(PCRE2_CFLAGS) -Wall
 example_sshpass_LDADD = libminiexpect.la
 
 # Tests.
 
 TESTS = $(check_PROGRAMS)
-check_PROGRAMS = test-spawn
+check_PROGRAMS = \
+	test-spawn \
+	test-ls-version \
+	test-multi-match
 
 test_spawn_SOURCES = test-spawn.c tests.h miniexpect.h
-test_spawn_CFLAGS = $(PCRE_CFLAGS) -Wall
+test_spawn_CFLAGS = $(PCRE2_CFLAGS) -Wall
 test_spawn_LDADD = libminiexpect.la
 
+test_ls_version_SOURCES = test-ls-version.c tests.h miniexpect.h
+test_ls_version_CFLAGS = $(PCRE2_CFLAGS) -Wall
+test_ls_version_LDADD = libminiexpect.la
+
+test_multi_match_SOURCES = test-multi-match.c tests.h miniexpect.h
+test_multi_match_CFLAGS = $(PCRE2_CFLAGS) -Wall
+test_multi_match_LDADD = libminiexpect.la
+
+# parallel-tests breaks the ability to put 'valgrind' into
+# TESTS_ENVIRONMENT.  Hence we have to work around it:
+check-valgrind: $(TESTS)
+	for t in $(TESTS); do \
+	  $(LIBTOOL) --mode=execute $(VG) ./$$t; \
+	  r=$$?; \
+	  if [ $$r -ne 0 ]; then exit $$r; fi; \
+	done
+
 # Clean.
 
 CLEANFILES = *~
@@ -59,6 +79,7 @@ CLEANFILES += miniexpect.3
 
 miniexpect.3: miniexpect.pod
 	$(POD2MAN) \
+	  -u \
 	  --section 3 \
 	  --release "$(PACKAGE)-$(VERSION)" \
 	  -c "Library functions" \