diff options
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | pactest/Makefile.am | 3 | ||||
-rw-r--r-- | pactest/tests/Makefile.am | 26 |
3 files changed, 29 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 20aa1807..87abc1f7 100644 --- a/configure.ac +++ b/configure.ac @@ -348,6 +348,7 @@ doc/Makefile etc/Makefile po/Makefile.in pactest/Makefile +pactest/tests/Makefile contrib/Makefile Makefile ]) diff --git a/pactest/Makefile.am b/pactest/Makefile.am index ce611f78..64f9a22e 100644 --- a/pactest/Makefile.am +++ b/pactest/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS = tests + check_SCRIPTS = \ pactest.py \ pmdb.py \ @@ -7,7 +9,6 @@ check_SCRIPTS = \ pmrule.py \ pmtest.py \ util.py \ - $(wildcard tests/*.py) \ vercmptest.sh noinst_SCRIPTS = $(check_SCRIPTS) diff --git a/pactest/tests/Makefile.am b/pactest/tests/Makefile.am new file mode 100644 index 00000000..42ca5cbe --- /dev/null +++ b/pactest/tests/Makefile.am @@ -0,0 +1,26 @@ +CONFTESTS = $(patsubst %py.in,%py,$(wildcard *.py.in)) + +check_SCRIPTS = \ + $(wildcard *.py) \ + $(CONFTESTS) + +noinst_SCRIPTS = $(check_SCRIPTS) + +EXTRA_DIST = $(check_SCRIPTS) + +CLEANFILES = $(CONFTESTS) + +#### Taken from the autoconf scripts Makefile.am #### +edit = sed \ + -e 's|@LIBS[@]|$(LIBS)|g' \ + -e 's|@configure_input[@]|Generated from $@.in; do not edit by hand.|g' + + +$(CONFTESTS): Makefile + rm -f $@ $@.tmp + test -f $(srcdir)/$@.in && $(edit) $(srcdir)/$@.in >$@.tmp || true + test -f $@.tmp || false + chmod a-w $@.tmp + mv $@.tmp $@ + +# vim:set ts=2 sw=2 noet: |