X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.am;h=69976bf8ec38681e2d26e833ea542b4b472b8c22;hb=fcf73607913050d246dbcc4f39e7717d0960763f;hp=6139816918b197d2101af9d83f312a175b3b847f;hpb=f5d365ec44b9e04c03c7e97e94080bcd134f319a;p=miniexpect.git

diff --git a/Makefile.am b/Makefile.am
index 6139816..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,32 +33,57 @@ 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
-test_spawn_CFLAGS = $(PCRE_CFLAGS) -Wall
+test_spawn_SOURCES = test-spawn.c tests.h miniexpect.h
+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 = *~
+
 # Man pages.
 
 man_MANS = miniexpect.3
 
 if HAVE_POD2MAN
+
+CLEANFILES += miniexpect.3
+
 miniexpect.3: miniexpect.pod
 	$(POD2MAN) \
+	  -u \
 	  --section 3 \
 	  --release "$(PACKAGE)-$(VERSION)" \
 	  -c "Library functions" \
 	  $< > $@-t
 	mv $@-t $@
-endif
 
-# Clean.
-
-CLEANFILES = *~
+endif