diff options
Diffstat (limited to 'lib/cpluff/test/Makefile.am')
| -rw-r--r-- | lib/cpluff/test/Makefile.am | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/lib/cpluff/test/Makefile.am b/lib/cpluff/test/Makefile.am index 3c05d2f9fc..8681b3f351 100644 --- a/lib/cpluff/test/Makefile.am +++ b/lib/cpluff/test/Makefile.am @@ -17,7 +17,7 @@ EXTRA_DIST = tests.txt CPPFLAGS = @CPPFLAGS@ CPPFLAGS += -DCP_HOST="\"$(host)\"" -LIBS = @LIBS_OTHER@ @LIBS@ +LIBS = @LIBS_OTHER@ @LIBS_TESTSUITE@ @LIBS@ check_PROGRAMS = testsuite @@ -85,19 +85,19 @@ dist-hook: $(MKDIR_P) '$(distdir)/expected' cp -p '$(srcdir)'/expected/*.txt '$(distdir)'/expected $(MKDIR_P) '$(distdir)'/plugins - cd '$(srcdir)'/plugins && \ - for d in *; do \ - ( mkdir '$(distdir)'/plugins/"$$d" && \ - cp -p "$$d/plugin.xml" '$(distdir)'/plugins/"$$d" ) \ - || exit 1; \ - done + for d in $$(ls '$(srcdir)'/plugins); do \ + ( $(MKDIR_P) '$(distdir)'/plugins/"$$d" && \ + cp -p '$(srcdir)'"/plugins/$$d/plugin.xml" '$(distdir)'/plugins/"$$d" ) \ + || exit 1; \ + done $(MKDIR_P) '$(distdir)'/pcollections - cd '$(srcdir)'/pcollections && \ - for d in */*; do \ - ( $(MKDIR_P) '$(distdir)'/pcollections/"$$d" && \ - cp -p "$$d/plugin.xml" '$(distdir)'/pcollections/"$$d" ) \ + for d in $$(ls '$(srcdir)'/pcollections); do \ + for d2 in $$(ls '$(srcdir)'"/pcollections/$$d"); do \ + ( $(MKDIR_P) '$(distdir)'/pcollections/"$$d/$$d2" && \ + cp -p '$(srcdir)'"/pcollections/$$d/$$d2/plugin.xml" '$(distdir)'/pcollections/"$$d/$$d2" ) \ || exit 1; \ - done + done; \ + done install-plugins: build-plugins install-libcpluff cd plugins-source && $(MAKE) $(AM_MAKEFLAGS) DESTDIR='$(tmpinstalldir)' install |