configure should add meson files to make dist

add meson.build etc. to EXTRA_DIST see https://github.com/libvips/libvips/issues/2876
2022-06-20 15:04:33 +01:00 · 2022-06-20 15:04:33 +01:00 · d9f31be67d
parent e9414f8d8f
commit d9f31be67d
25 changed files with 72 additions and 27 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -9,14 +9,17 @@ SUBDIRS = \
 	fuzz

 EXTRA_DIST = \
-	m4 \
-	benchmark \
 	autogen.sh \
-	vips.pc.in \
-	vips-cpp.pc.in \
-	suppressions \
+	benchmark \
 	depcomp \
-	README.md 
+	m4 \
+	meson.build \
+	meson_options.txt \
+	po/meson.build \
+	README.md \
+	suppressions \
+	vips-cpp.pc.in \
+	vips.pc.in

 pkgconfig_DATA = vips.pc vips-cpp.pc

--- a/cplusplus/Makefile.am
+++ b/cplusplus/Makefile.am
@ -54,8 +54,9 @@ tidy: $(libvips_cpp_la_SOURCES)
 		-- $(AM_CPPFLAGS)

 EXTRA_DIST = \
-	README.md \
-	vips-operators.cpp \
 	Doxyfile.in \
-	gen-operators.py
+	gen-operators.py \
+	meson.build \
+	README.md \
+	vips-operators.cpp

--- a/cplusplus/include/vips/Makefile.am
+++ b/cplusplus/include/vips/Makefile.am
@ -6,6 +6,9 @@ pkginclude_HEADERS = \
 	VConnection8.h \
 	vips8 

+EXTRA_DIST = \
+	meson.build
+
 vips-operators:
 	echo "// headers for vips operations" > vips-operators; \
 	echo "// paste this file into VImage8.h, do not leave in repo" > vips-operators; \
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@ -181,8 +181,9 @@ include gtk-doc.make
 # e.g. EXTRA_DIST += version.xml.in
 EXTRA_DIST += \
        ${markdown_content_files} \
+	gen-function-list.py \
 	images \
-	gen-function-list.py
+	meson.build

 # Files not to distribute
 # for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
--- a/fuzz/Makefile.am
+++ b/fuzz/Makefile.am
@ -28,4 +28,5 @@ noinst_LIBRARIES = $(FUZZLIBS)

 EXTRA_DIST = \
 	$(TESTS) \
-	common_fuzzer_corpus
+	common_fuzzer_corpus \
+	meson.build
--- a/libvips/Makefile.am
+++ b/libvips/Makefile.am
@ -62,7 +62,8 @@ libvips_la_LDFLAGS = \
 	-version-info @LIBRARY_CURRENT@:@LIBRARY_REVISION@:@LIBRARY_AGE@ 

 EXTRA_DIST = \
-	$(OPTIONAL_DIST_DIR)
+	$(OPTIONAL_DIST_DIR) \
+        meson.build

 CLEANFILES = 

--- a/libvips/arithmetic/Makefile.am
+++ b/libvips/arithmetic/Makefile.am
@ -48,3 +48,5 @@ libarithmetic_la_SOURCES = \
 	round.c 

 AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@ 
+
+EXTRA_DIST = meson.build
--- a/libvips/colour/Makefile.am
+++ b/libvips/colour/Makefile.am
@ -44,6 +44,7 @@ profiles.c:
 	./wrap-profiles.sh profiles profiles.c

 EXTRA_DIST = \
+	meson.build \
 	wrap-profiles.sh

 AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@ 
--- a/libvips/conversion/Makefile.am
+++ b/libvips/conversion/Makefile.am
@ -52,3 +52,5 @@ AM_CPPFLAGS = \
 	@VIPS_CFLAGS@ @VIPS_INCLUDES@ \
 	-Wno-unknown-pragmas

+EXTRA_DIST = meson.build
+
--- a/libvips/convolution/Makefile.am
+++ b/libvips/convolution/Makefile.am
@ -20,3 +20,5 @@ libconvolution_la_SOURCES = \
 	gaussblur.c 

 AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@ 
+
+EXTRA_DIST = meson.build
--- a/libvips/create/Makefile.am
+++ b/libvips/create/Makefile.am
@ -36,3 +36,5 @@ libcreate_la_SOURCES = \
 	zone.c 

 AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@ 
+
+EXTRA_DIST = meson.build
--- a/libvips/deprecated/Makefile.am
+++ b/libvips/deprecated/Makefile.am
@ -97,3 +97,5 @@ AM_CPPFLAGS = \
 	@VIPS_CFLAGS@ \
 	@VIPS_INCLUDES@ \
 	-DVIPS_DISABLE_DEPRECATION_WARNINGS
+
+EXTRA_DIST = meson.build
--- a/libvips/draw/Makefile.am
+++ b/libvips/draw/Makefile.am
@ -14,3 +14,5 @@ libdraw_la_SOURCES = \
 	draw_smudge.c 

 AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@ 
+
+EXTRA_DIST = meson.build
--- a/libvips/foreign/Makefile.am
+++ b/libvips/foreign/Makefile.am
@ -94,3 +94,5 @@ libforeign_la_SOURCES += openslideload.c
 endif # !OPENSLIDE_MODULE

 AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
+
+EXTRA_DIST = meson.build
--- a/libvips/foreign/libnsgif/Makefile.am
+++ b/libvips/foreign/libnsgif/Makefile.am
@ -11,9 +11,10 @@ libnsgif_la_SOURCES = $(MY_SOURCES)
 endif

 EXTRA_DIST = \
-	README-ns.md \
-	README.md \
+	meson.build \
 	patches \
+	README.md \
+	README-ns.md \
 	update.sh

 if !ENABLE_NSGIF
--- a/libvips/freqfilt/Makefile.am
+++ b/libvips/freqfilt/Makefile.am
@ -10,3 +10,5 @@ libfreqfilt_la_SOURCES = \
 	phasecor.c 

 AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@ 
+
+EXTRA_DIST = meson.build
--- a/libvips/histogram/Makefile.am
+++ b/libvips/histogram/Makefile.am
@ -19,3 +19,5 @@ libhistogram_la_SOURCES = \
 	stdif.c 

 AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@ 
+
+EXTRA_DIST = meson.build
--- a/libvips/include/vips/Makefile.am
+++ b/libvips/include/vips/Makefile.am
@ -49,7 +49,13 @@ pkginclude_HEADERS = \

 nodist_pkginclude_HEADERS = version.h

-EXTRA_DIST = version.h.in internal.h enumtemplate
+EXTRA_DIST = \
+	enumtemplate \
+	enumtypes.c.in \
+	enumtypes.h.in \
+	internal.h \
+	meson.build \
+	version.h.in 

 # the headers we scan for enums etc.
 # keep in sync with ${top_srcdir}/libvips/iofuncs/Makefile.am
--- a/libvips/iofuncs/Makefile.am
+++ b/libvips/iofuncs/Makefile.am
@ -51,8 +51,9 @@ vipsmarshal.c: vipsmarshal.list

 EXTRA_DIST = \
 	enumtemplate \
-	vipsmarshal.h \
+	meson.build \
 	vipsmarshal.c \
+	vipsmarshal.h \
 	vipsmarshal.list

 AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@ 
@ -81,3 +82,4 @@ vips_scan_headers = \

 enumtypes.c: $(vips_scan_headers) Makefile.am
 	glib-mkenums --template ${top_srcdir}/libvips/iofuncs/enumtemplate $(vips_scan_headers) > enumtypes.c
+
--- a/libvips/morphology/Makefile.am
+++ b/libvips/morphology/Makefile.am
@ -10,3 +10,5 @@ libmorphology_la_SOURCES = \
 	labelregions.c 

 AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@ 
+
+EXTRA_DIST = meson.build
--- a/libvips/mosaicing/Makefile.am
+++ b/libvips/mosaicing/Makefile.am
@ -24,3 +24,5 @@ libmosaicing_la_SOURCES = \
 	pmosaicing.h

 AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@ 
+
+EXTRA_DIST = meson.build
--- a/libvips/resample/Makefile.am
+++ b/libvips/resample/Makefile.am
@ -22,7 +22,8 @@ libresample_la_SOURCES = \
 	templates.h 

 EXTRA_DIST = \
-	dummy2.cc 
+	dummy2.cc \
+	meson.build

 noinst_LTLIBRARIES = libresample.la

--- a/man/Makefile.am
+++ b/man/Makefile.am
@ -9,4 +9,4 @@ man_MANS = \
 	vipsprofile.1 \
 	vipsthumbnail.1

-EXTRA_DIST = ${man_MANS}
+EXTRA_DIST = ${man_MANS} meson.build
--- a/test/Makefile.am
+++ b/test/Makefile.am
@ -26,15 +26,16 @@ AM_LDFLAGS = @LDFLAGS@
 LDADD = @VIPS_CFLAGS@ ${top_builddir}/libvips/libvips.la @VIPS_LIBS@

 EXTRA_DIST = \
-	variables.sh.in \
+        meson.build \
 	test_cli.sh \
-	test_descriptors.sh \
 	test_connections.sh \
+	test_descriptors.sh \
 	test_formats.sh \
 	test_seq.sh \
-	test_thumbnail.sh \
 	test_stall.sh \
-	test_threading.sh 
+	test_threading.sh \
+	test_thumbnail.sh \
+	variables.sh.in

 clean-local: 
 	-rm -rf tmp-*
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@ -23,13 +23,14 @@ bin_SCRIPTS = \
 	vips-8.13

 EXTRA_DIST = \
-	vipsprofile \
-	vips-8.13 \
-	light_correct.in \
-	shrink_width.in \
+	batch_crop.in \ 
 	batch_image_convert.in \
 	batch_rubber_sheet.in \
-	batch_crop.in 
+	light_correct.in \
+	meson.build \
+	shrink_width.in \
+	vips-8.13 \
+	vipsprofile

 install-exec-hook:
 	chmod ugo+x ${DESTDIR}${bindir}/light_correct