summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Popela <tpopela@redhat.com>2017-12-04 11:40:48 +0100
committerTomas Popela <tpopela@redhat.com>2018-04-11 12:39:20 +0200
commitaf5186fdc1735c107ad1c0704692bb307e617132 (patch)
tree911ccc06b939719134bb76a2741276dc4f4a70c3
parent04f895723b9b21ffd45b3de43de2576f018ba38c (diff)
downloadlibsoup-af5186fdc1735c107ad1c0704692bb307e617132.tar.gz
Add Meson port files to the Autotools EXTRA_DIST
So it's possible to build with the Meson from the tarball that is produced by Autotools
-rw-r--r--Makefile.am3
-rw-r--r--docs/reference/Makefile.am2
-rw-r--r--examples/Makefile.am2
-rw-r--r--libsoup/Makefile.am2
-rw-r--r--tests/Makefile.am1
5 files changed, 10 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 141ef381..fea8b651 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,6 +12,9 @@ EXTRA_DIST = \
tap-driver.sh \
tap-test \
Makefile.glib \
+ meson.build \
+ meson_options.txt \
+ get_apache_module_dirs.py \
config.h.win32
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection --disable-vala
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index eef019bc..1baf1135 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -84,3 +84,5 @@ $(srcdir)/tmpl/*.sgml:
clean: clean-am
rm -rf tmpl
+
+EXTRA_DIST += meson.build
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 1609ff24..b72edd70 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -8,6 +8,8 @@ LIBS = \
$(top_builddir)/libsoup/libsoup-2.4.la \
$(GLIB_LIBS)
+EXTRA_DIST = meson.build
+
noinst_PROGRAMS = \
get \
simple-httpd \
diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
index 575aa66a..df4b08a4 100644
--- a/libsoup/Makefile.am
+++ b/libsoup/Makefile.am
@@ -328,6 +328,8 @@ CLEANFILES+= $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES)
endif
+EXTRA_DIST += meson.build soup-enum-types.h.template soup-enum-types.c.template
+
# ------ MSVC Project File Generation ------
MSVCPROJS = soup soup-gnome
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1ff4c0de..99442e04 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -88,6 +88,7 @@ EXTRA_DIST += \
test-cert.pem \
test-key.pem \
xmlrpc-server.php \
+ meson.build \
$(RESOURCES)
DISTCLEANFILES += soup-tests.gresource httpd.conf