summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.com>2018-12-27 16:46:19 -0600
committerOlivier CrĂȘte <olivier.crete@collabora.com>2018-12-27 16:46:26 -0600
commit1b142226eb0292ca8fa565a9972d846d6dfc657c (patch)
tree062cc384150adec11387df46087ca0608e4aeaa7
parentcac351a24789c4b53db896c8880038a1193755c4 (diff)
Makefiles: Add meson.build files to tarball
-rw-r--r--Makefile.am4
-rw-r--r--agent/Makefile.am2
-rw-r--r--docs/reference/libnice/Makefile.am2
-rw-r--r--examples/Makefile.am2
-rw-r--r--gst/Makefile.am2
-rw-r--r--nice/Makefile.am4
-rw-r--r--random/Makefile.am1
-rw-r--r--socket/Makefile.am2
-rw-r--r--stun/Makefile.am2
-rw-r--r--stun/tests/Makefile.am2
-rw-r--r--stun/tools/Makefile.am2
-rw-r--r--tests/Makefile.am4
12 files changed, 24 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index 810e755..8ffaa48 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,7 +34,9 @@ EXTRA_DIST = \
scripts/valgrind-test-driver \
win32 \
win32/vs9/libnice.def \
- m4/introspection.m4
+ m4/introspection.m4 \
+ meson.build \
+ meson_options.txt
MAINTAINERCLEANFILES = ar-lib
diff --git a/agent/Makefile.am b/agent/Makefile.am
index 465c7c6..118520f 100644
--- a/agent/Makefile.am
+++ b/agent/Makefile.am
@@ -131,3 +131,5 @@ typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
CLEANFILES += $(gir_DATA) $(typelib_DATA)
endif
+
+EXTRA_DIST = meson.build
diff --git a/docs/reference/libnice/Makefile.am b/docs/reference/libnice/Makefile.am
index f44e866..f6c2d52 100644
--- a/docs/reference/libnice/Makefile.am
+++ b/docs/reference/libnice/Makefile.am
@@ -96,6 +96,8 @@ include $(top_srcdir)/gtk-doc.make
# e.g. EXTRA_DIST += version.xml.in
EXTRA_DIST += states.gv
+EXTRA_DIST += meson.build
+
# Files not to distribute
# for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
# for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 9c80854..fa47e5e 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -31,3 +31,5 @@ threaded_example_LDADD = $(top_builddir)/agent/libagent.la \
sdp_example_SOURCES = sdp-example.c
sdp_example_LDADD = $(top_builddir)/agent/libagent.la \
$(GLIB_LIBS) $(GUPNP_LIBS)
+
+EXTRA_DIST = meson.build
diff --git a/gst/Makefile.am b/gst/Makefile.am
index 5f9a386..8776780 100644
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -54,3 +54,5 @@ libgstnice010_la_LIBADD = $(COMMON_LIBADD) $(GST010_LIBS)
libgstnice010_la_LDFLAGS = -module -avoid-version -no-undefined
endif
+
+EXTRA_DIST = meson.build
diff --git a/nice/Makefile.am b/nice/Makefile.am
index b2ccb2b..089050d 100644
--- a/nice/Makefile.am
+++ b/nice/Makefile.am
@@ -55,7 +55,9 @@ check_DATA = libnice.symbols
TESTS = $(check_SCRIPTS)
-EXTRA_DIST = $(check_SCRIPTS) libnice.sym libnice.ver
+EXTRA_DIST = $(check_SCRIPTS) \
+ libnice.sym libnice.ver \
+ meson.build gen-map.py gen-def.py
pkginclude_HEADERS = nice.h
diff --git a/random/Makefile.am b/random/Makefile.am
index 86ab926..b6f5d74 100644
--- a/random/Makefile.am
+++ b/random/Makefile.am
@@ -24,3 +24,4 @@ test_LDADD = libnice-random.la $(GLIB_LIBS)
TESTS = $(check_PROGRAMS)
+EXTRA_DIST = meson.build
diff --git a/socket/Makefile.am b/socket/Makefile.am
index 72c395b..2560f17 100644
--- a/socket/Makefile.am
+++ b/socket/Makefile.am
@@ -42,4 +42,4 @@ libsocket_la_SOURCES = \
udp-turn-over-tcp.h \
udp-turn-over-tcp.c
-
+EXTRA_DIST = meson.build
diff --git a/stun/Makefile.am b/stun/Makefile.am
index 9afcc75..d90d8b9 100644
--- a/stun/Makefile.am
+++ b/stun/Makefile.am
@@ -41,7 +41,7 @@ libstun_la_SOURCES = constants.h \
libstun_la_LIBADD = $(LIBRT) $(GNUTLS_LIBS) $(OPENSSL_LIBS)
-EXTRA_DIST = win32_common.h
+EXTRA_DIST = win32_common.h meson.build
libstun_la_includedir=$(includedir)/stun
libstun_la_include_HEADERS = stunagent.h stunmessage.h win32_common.h debug.h constants.h
diff --git a/stun/tests/Makefile.am b/stun/tests/Makefile.am
index 8475c05..c660ed6 100644
--- a/stun/tests/Makefile.am
+++ b/stun/tests/Makefile.am
@@ -26,3 +26,5 @@ dist_check_SCRIPTS = check-bind.sh
TESTS = $(check_PROGRAMS)
#$(dist_check_SCRIPTS)
+
+EXTRA_DIST = meson.build
diff --git a/stun/tools/Makefile.am b/stun/tools/Makefile.am
index 7a9b772..c945650 100644
--- a/stun/tools/Makefile.am
+++ b/stun/tools/Makefile.am
@@ -27,3 +27,5 @@ if WINDOWS
AM_CFLAGS += -DWINVER=0x0501 # _WIN32_WINNT_WINXP
stunbdc_LDADD += -lws2_32
endif
+
+EXTRA_DIST = meson.build
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a8865cb..b081c7c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -145,4 +145,6 @@ all-local:
chmod a+x $(srcdir)/check-test-fullmode-with-stun.sh
chmod a+x $(srcdir)/test-pseudotcp-random.sh
-EXTRA_DIST = libnice.supp
+EXTRA_DIST = \
+ libnice.supp \
+ meson.build