From 7f7961df25d8e66771c94893a3f1f33fc0eae13c Mon Sep 17 00:00:00 2001
From: Nick Wellnhofer <wellnhofer@aevum.de>
Date: Thu, 25 Aug 2022 13:47:16 +0200
Subject: [PATCH] Remove generated files from distribution

- libxml2.spec
- libxml-2.0.pc
- xml2-config
- include/libxml/xmlversion.h
- python/libxml2.py
- python/libxml2-export.c
- python/libxml2-py.c
- python/libxml2-py.h
- python/libxml2class.py
- python/libxml2class.txt
- python/setup.py
---
 Makefile.am                |  6 +++---
 include/libxml/Makefile.am |  1 -
 python/Makefile.am         | 38 +++++++++++++++++---------------------
 3 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index eaa9a7a7..f5820d15 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,7 @@ check_PROGRAMS = \
 
 bin_PROGRAMS = xmllint xmlcatalog
 
-bin_SCRIPTS=xml2-config
+nodist_bin_SCRIPTS = xml2-config
 
 lib_LTLIBRARIES = libxml2.la
 libxml2_la_CFLAGS = $(EXTRA_CFLAGS) $(THREAD_CFLAGS) $(Z_CFLAGS) $(LZMA_CFLAGS)
@@ -387,7 +387,7 @@ rpm: cleanup cleantar
 CLEANFILES = runxmlconf.log test.out *.gcda *.gcno *.res
 DISTCLEANFILES = COPYING missing.lst
 
-EXTRA_DIST = xml2-config.in libxml.spec.in libxml2.spec \
+EXTRA_DIST = xml2-config.in libxml.spec.in \
              libxml.m4 Copyright check-xml-test-suite.py gentest.py \
 	     check-relaxng-test-suite.py check-relaxng-test-suite2.py \
 	     check-xsddata-test-suite.py check-xinclude-test-suite.py \
@@ -404,7 +404,7 @@ EXTRA_DIST = xml2-config.in libxml.spec.in libxml2.spec \
 
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libxml-2.0.pc
+nodist_pkgconfig_DATA = libxml-2.0.pc
 
 cmakedir = $(libdir)/cmake/libxml2
 cmake_DATA = libxml2-config.cmake
diff --git a/include/libxml/Makefile.am b/include/libxml/Makefile.am
index 6373bc71..cb717cf6 100644
--- a/include/libxml/Makefile.am
+++ b/include/libxml/Makefile.am
@@ -26,7 +26,6 @@ xmlinc_HEADERS = \
 		uri.h \
 		valid.h \
 		xlink.h \
-		xmlversion.h \
 		catalog.h \
 		threads.h \
 		globals.h \
diff --git a/python/Makefile.am b/python/Makefile.am
index d60bb5cc..cc1419a1 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -6,13 +6,9 @@ docsdir = $(docdir)/python
 dist_docs_DATA = TODO
 
 EXTRA_DIST = 			\
-	setup.py		\
 	generator.py		\
 	libxml.py		\
-	libxml2-export.c	\
-	libxml2-python-api.xml	\
-	libxml2class.py		\
-	libxml2class.txt
+	libxml2-python-api.xml
 
 if WITH_PYTHON
 AM_CPPFLAGS = \
@@ -22,32 +18,32 @@ AM_CPPFLAGS = \
 
 pyexec_LTLIBRARIES = libxml2mod.la
 
-libxml2mod_la_SOURCES = libxml.c libxml_wrap.h libxml2-py.h libxml2-py.c types.c
+libxml2mod_la_SOURCES = libxml.c libxml_wrap.h types.c
+nodist_libxml2mod_la_SOURCES = libxml2-py.h libxml2-py.c
 libxml2mod_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version
 libxml2mod_la_LIBADD = $(top_builddir)/libxml2.la $(CYGWIN_EXTRA_PYTHON_LIBADD) $(WIN32_EXTRA_PYTHON_LIBADD) $(PYTHON_LIBS)
 
 BUILT_SOURCES = libxml2-export.c libxml2-py.h libxml2-py.c
 
+python_PYTHON = drv_libxml2.py
+nodist_python_PYTHON = libxml2.py
+
+API_DESC = $(top_srcdir)/doc/libxml2-api.xml $(srcdir)/libxml2-python-api.xml
+GENERATED = libxml2class.py libxml2class.txt $(BUILT_SOURCES)
+CLEANFILES = libxml2.py $(GENERATED)
+
+all-local: libxml2.py
+
+$(GENERATED): $(srcdir)/generator.py $(API_DESC)
+	$(PYTHON) $(srcdir)/generator.py $(srcdir)
+
 # libxml.c #includes libxml2-export.c
 libxml.$(OBJEXT): libxml2-export.c
 
 libxml2.py: $(srcdir)/libxml.py libxml2class.py
 	cat $(srcdir)/libxml.py `test -f libxml2class.py || echo $(srcdir)/`libxml2class.py > $@
 
-python_PYTHON = \
-	drv_libxml2.py \
-	libxml2.py
+clean-local:
+	rm -rf __pycache__
 
-CLEANFILES = *.pyc
-
-MAINTAINERCLEANFILES = libxml2.py libxml2class.*
-
-API_DESC = $(top_srcdir)/doc/libxml2-api.xml $(srcdir)/libxml2-python-api.xml
-GENERATED = libxml2class.py libxml2class.txt $(BUILT_SOURCES)
-
-# Generated sources
-all-local: drv_libxml2.py libxml2.py
-
-$(GENERATED): $(srcdir)/generator.py $(API_DESC)
-	$(PYTHON) $(srcdir)/generator.py $(srcdir)
 endif