From 7a4a1c63f0a8342d8b1e91fa9c7b518f9ded9c6c Mon Sep 17 00:00:00 2001 From: Nick Wellnhofer Date: Mon, 29 Aug 2022 15:40:02 +0200 Subject: [PATCH] Remove generated files from distribution - libxslt.spec - python/libxslt.py Also prefer 'dist_' prefix over EXTRA_DIST. --- Makefile.am | 15 +++++++-------- python/Makefile.am | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index d5d6a4cf..a2d766f5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,17 +12,15 @@ confexec_DATA = xsltConf.sh bin_SCRIPTS = xslt-config -dist-hook: cleanup libxslt.spec +dist-hook: cleanup touch $(distdir)/doc/*.xml touch $(distdir)/doc/EXSLT/*.xml touch $(distdir)/libxslt/*.syms (cd $(srcdir) ; tar -cf - win32 vms examples) | (cd $(distdir); tar xf -) -EXTRA_DIST = xsltConf.sh.in xslt-config.in libxslt.spec libxslt.spec.in \ - FEATURES TODO Copyright libxslt.m4 \ - win32/libxslt/libxslt.def win32/libxslt/libxslt.dsw \ - win32/libxslt/libxslt_so.dsp win32/libxslt/xsltproc.dsp \ - CMakeLists.txt config.h.cmake.in FindGcrypt.cmake libxslt-config.cmake.in libxslt-config.cmake.cmake.in +EXTRA_DIST = xsltConf.sh.in \ + FEATURES TODO Copyright \ + CMakeLists.txt config.h.cmake.in libxslt-config.cmake.in libxslt-config.cmake.cmake.in ## We create xsltConf.sh here and not from configure because we want ## to get the paths expanded correctly. Macros like srcdir are given @@ -73,8 +71,9 @@ pkgconfigdir=$(libdir)/pkgconfig pkgconfig_DATA = libxslt.pc libexslt.pc cmakedir = $(libdir)/cmake/libxslt -cmake_DATA = FindGcrypt.cmake libxslt-config.cmake +dist_cmake_DATA = FindGcrypt.cmake +cmake_DATA = libxslt-config.cmake m4datadir = $(datadir)/aclocal -m4data_DATA = libxslt.m4 +dist_m4data_DATA = libxslt.m4 diff --git a/python/Makefile.am b/python/Makefile.am index dfcf5e3f..bab1f4dc 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -31,7 +31,7 @@ libxsltmod_la_LDFLAGS = -module -avoid-version libxslt.py: $(srcdir)/libxsl.py libxsltclass.py cat $(srcdir)/libxsl.py libxsltclass.py > $@ -python_PYTHON = libxslt.py +nodist_python_PYTHON = libxslt.py GENERATE = generator.py API_DESC = $(top_srcdir)/doc/libxslt-api.xml $(srcdir)/libxslt-python-api.xml