summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Toso <victortoso@redhat.com>2021-03-05 18:33:38 +0100
committerVictor Toso <victortoso@redhat.com>2021-03-24 20:21:44 +0100
commit34f08f5a6161fc3dedbef36281d8195092ed323b (patch)
tree3500b531d8febffd5654f8b8451c6a395d3533ed
parent222afbb1351ec55c6281a53368624170795cd71d (diff)
build-sys: Ship meson on a tarball from autotools
The opposite is already true. You can build with autotools on a tarball made with meson dist. Signed-off-by: Victor Toso <victortoso@redhat.com>
-rw-r--r--Makefile.am1
-rw-r--r--fuzzing/Makefile.am3
-rw-r--r--tools/Makefile.am3
-rw-r--r--usbredirhost/Makefile.am3
-rw-r--r--usbredirparser/Makefile.am3
-rw-r--r--usbredirserver/Makefile.am3
-rw-r--r--usbredirtestclient/Makefile.am3
7 files changed, 19 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index b7b4620..11f9661 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,6 +4,7 @@ SUBDIRS += usbredirserver usbredirtestclient
endif
EXTRA_DIST = \
+ meson.build \
README.md \
ChangeLog.md
diff --git a/fuzzing/Makefile.am b/fuzzing/Makefile.am
index 3294648..4643300 100644
--- a/fuzzing/Makefile.am
+++ b/fuzzing/Makefile.am
@@ -16,4 +16,7 @@ usbredirparserfuzz_DEPENDENCIES = libstandalone.a
endif
+EXTRA_DIST = \
+ meson.build
+
-include $(top_srcdir)/git.mk
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 9361167..f16835b 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -18,3 +18,6 @@ usbredirect_CFLAGS = \
dist_man_MANS = usbredirect.1
endif
+
+EXTRA_DIST = \
+ meson.build
diff --git a/usbredirhost/Makefile.am b/usbredirhost/Makefile.am
index 2878cce..6b42b4c 100644
--- a/usbredirhost/Makefile.am
+++ b/usbredirhost/Makefile.am
@@ -12,4 +12,7 @@ libusbredirhost_la_LDFLAGS = -version-info $(LIBUSBREDIRHOST_SO_VERSION) \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libusbredirhost.pc
+EXTRA_DIST = \
+ meson.build
+
-include $(top_srcdir)/git.mk
diff --git a/usbredirparser/Makefile.am b/usbredirparser/Makefile.am
index ebff5f2..7b8854d 100644
--- a/usbredirparser/Makefile.am
+++ b/usbredirparser/Makefile.am
@@ -14,4 +14,7 @@ endif
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libusbredirparser-0.5.pc
+EXTRA_DIST = \
+ meson.build
+
-include $(top_srcdir)/git.mk
diff --git a/usbredirserver/Makefile.am b/usbredirserver/Makefile.am
index bcfc23d..6a5963f 100644
--- a/usbredirserver/Makefile.am
+++ b/usbredirserver/Makefile.am
@@ -8,3 +8,6 @@ usbredirserver_CFLAGS = $(LIBUSB_CFLAGS) \
-I$(top_srcdir)/usbredirparser
dist_man_MANS = usbredirserver.1
+
+EXTRA_DIST = \
+ meson.build
diff --git a/usbredirtestclient/Makefile.am b/usbredirtestclient/Makefile.am
index 4b3b388..1fbbb09 100644
--- a/usbredirtestclient/Makefile.am
+++ b/usbredirtestclient/Makefile.am
@@ -4,4 +4,7 @@ usbredirtestclient_SOURCES = usbredirtestclient.c
usbredirtestclient_LDADD = $(top_builddir)/usbredirparser/libusbredirparser.la
usbredirtestclient_CFLAGS = -I$(top_srcdir)/usbredirparser
+EXTRA_DIST = \
+ meson.build
+
-include $(top_srcdir)/git.mk