aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am77
1 files changed, 39 insertions, 38 deletions
diff --git a/Makefile.am b/Makefile.am
index 5ed9ac410a42..5e1d37dd1a83 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,14 +30,21 @@
AUTOMAKE_OPTIONS = \
dist-bzip2 \
+ dist-lzip \
+ dist-xz \
foreign \
- no-dist-gzip \
subdir-objects
ACLOCAL_AMFLAGS = -I m4
LIBTOOLFLAGS = --verbose
-SUBDIRS = lib examples tests # lib goes first to build first
+SUBDIRS = lib # lib goes first to build first
+if WITH_EXAMPLES
+SUBDIRS += examples
+endif
+if WITH_TESTS
+SUBDIRS += tests
+endif
if WITH_XMLWF
SUBDIRS += xmlwf doc
endif
@@ -47,41 +54,19 @@ pkgconfigdir = $(libdir)/pkgconfig
_EXTRA_DIST_CMAKE = \
+ cmake/expat-config.cmake.in \
+ cmake/mingw-toolchain.cmake \
+ \
CMakeLists.txt \
CMake.README \
ConfigureChecks.cmake \
expat_config.h.cmake
_EXTRA_DIST_WINDOWS = \
- examples/elements.vcxproj \
- examples/elements.vcxproj.filters \
- examples/outline.vcxproj \
- examples/outline.vcxproj.filters \
- \
- lib/expat_static.vcxproj \
- lib/expat_static.vcxproj.filters \
- lib/expat.vcxproj \
- lib/expat.vcxproj.filters \
- lib/expatw_static.vcxproj \
- lib/expatw_static.vcxproj.filters \
- lib/expatw.vcxproj \
- lib/expatw.vcxproj.filters \
- \
- tests/benchmark/benchmark.sln \
- tests/benchmark/benchmark.vcxproj \
- \
- tests/runtests.sln \
- tests/runtests.vcxproj \
- tests/runtests.vcxproj.filters \
- \
+ win32/build_expat_iss.bat \
win32/expat.iss \
win32/MANIFEST.txt \
- win32/README.txt \
- \
- xmlwf/xmlwf.vcxproj \
- xmlwf/xmlwf.vcxproj.filters \
- \
- expat.sln
+ win32/README.txt
EXTRA_DIST = \
$(_EXTRA_DIST_CMAKE) \
@@ -91,8 +76,13 @@ EXTRA_DIST = \
conftools/get-version.sh \
conftools/PrintPath \
\
+ xmlwf/xmlwf_helpgen.py \
+ xmlwf/xmlwf_helpgen.sh \
+ \
Changes \
README.md \
+ \
+ fix-xmltest-log.sh \
test-driver-wrapper.sh
@@ -121,7 +111,8 @@ run-benchmark:
$(MAKE) -C tests/benchmark
./run.sh tests/benchmark/benchmark@EXEEXT@ -n $(top_srcdir)/../testdata/largefiles/recset.xml 65535 3
-tests/xmlts.zip:
+.PHONY: download-xmlts-zip
+download-xmlts-zip:
if test "$(XMLTS_ZIP)" = ""; then \
wget --output-document=tests/xmlts.zip \
https://www.w3.org/XML/Test/xmlts20080827.zip; \
@@ -129,16 +120,26 @@ tests/xmlts.zip:
cp $(XMLTS_ZIP) tests/xmlts.zip; \
fi
-tests/xmlconf: tests/xmlts.zip
+tests/xmlts.zip:
+ $(MAKE) download-xmlts-zip
+
+.PHONY: extract-xmlts-zip
+extract-xmlts-zip: tests/xmlts.zip
+ [ -f $(builddir)/tests/xmlts.zip ] || $(MAKE) download-xmlts-zip # vpath workaround
cd tests && unzip -q xmlts.zip
+tests/xmlconf: tests/xmlts.zip
+ $(MAKE) extract-xmlts-zip
+
.PHONY: run-xmltest
run-xmltest: tests/xmlconf
if WITH_XMLWF
+ [ -d $(builddir)/tests/xmlconf ] || $(MAKE) extract-xmlts-zip # vpath workaround
+ $(MAKE) -C lib
$(MAKE) -C xmlwf
- tests/xmltest.sh "$(PWD)/run.sh $(PWD)/xmlwf/xmlwf@EXEEXT@" 2>&1 | tee tests/xmltest.log
- dos2unix tests/xmltest.log
- diff -u tests/xmltest.log.expected tests/xmltest.log
+ $(srcdir)/tests/xmltest.sh "$(abs_builddir)/run.sh $(abs_builddir)/xmlwf/xmlwf@EXEEXT@" 2>&1 | tee $(builddir)/tests/xmltest.log
+ $(srcdir)/fix-xmltest-log.sh $(builddir)/tests/xmltest.log
+ diff -u $(srcdir)/tests/xmltest.log.expected $(builddir)/tests/xmltest.log
else
@echo 'ERROR: xmlwf is needed for "make run-xmltest".' >&2
@echo 'ERROR: Please re-configure without --without-xmlwf.' >&2
@@ -147,7 +148,7 @@ endif
.PHONY: qa
qa:
- ./qa.sh address
- ./qa.sh memory
- ./qa.sh undefined
- ./qa.sh coverage
+ QA_COMPILER=clang QA_SANITIZER=address ./qa.sh
+ QA_COMPILER=clang QA_SANITIZER=memory ./qa.sh
+ QA_COMPILER=clang QA_SANITIZER=undefined ./qa.sh
+ QA_COMPILER=gcc QA_PROCESSOR=gcov ./qa.sh