diff options
| author | Sebastian Pipping <sebastian@pipping.org> | 2017-08-12 19:23:14 +0200 |
|---|---|---|
| committer | Sebastian Pipping <sebastian@pipping.org> | 2017-08-12 19:23:14 +0200 |
| commit | d809c7cc2f4c117c7c488c0095feedc27f56a6cc (patch) | |
| tree | 737ebc0b643e2691349a3b71d9f8b8cb7483252e | |
| parent | 5c3a01c1cc9adbcf99c8343145429efe1e88b9bf (diff) | |
| parent | b86f806edf9ea9f72bfefd9a0d8a1d862b52cd5e (diff) | |
| download | libexpat-git-d809c7cc2f4c117c7c488c0095feedc27f56a6cc.tar.gz | |
Merge branch 'source-tarball-windows'
| -rw-r--r-- | expat/Changes | 1 | ||||
| -rw-r--r-- | expat/Makefile.am | 48 |
2 files changed, 41 insertions, 8 deletions
diff --git a/expat/Changes b/expat/Changes index ab087687..334034ef 100644 --- a/expat/Changes +++ b/expat/Changes @@ -19,6 +19,7 @@ Release 2.?.? ????????????????? #114 CMake: Compile man page if docbook2x-man is available, only #117 Include file tests/xmltest.log.expected in source tarball (required for "make run-xmltest") + #117 Include (existing) Visual Studio 2013 files in source tarball Improve test suite error output #111 Fix some typos in documentation diff --git a/expat/Makefile.am b/expat/Makefile.am index 5e34156c..5b1c055c 100644 --- a/expat/Makefile.am +++ b/expat/Makefile.am @@ -46,20 +46,52 @@ pkgconfig_DATA = expat.pc pkgconfigdir = $(libdir)/pkgconfig -EXTRA_DIST = \ - conftools/expat.m4 \ - conftools/get-version.sh \ - conftools/PrintPath \ +_EXTRA_DIST_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/expat.iss \ win32/MANIFEST.txt \ win32/README.txt \ \ + xmlwf/xmlwf.vcxproj \ + xmlwf/xmlwf.vcxproj.filters \ + \ + expat.sln + +EXTRA_DIST = \ + $(_EXTRA_DIST_CMAKE) \ + $(_EXTRA_DIST_WINDOWS) \ + \ + conftools/expat.m4 \ + conftools/get-version.sh \ + conftools/PrintPath \ + \ Changes \ - CMakeLists.txt \ - CMake.README \ - ConfigureChecks.cmake \ - expat_config.h.cmake \ README.md \ test-driver-wrapper.sh |