diff options
author | Christoph Reiter <reiter.christoph@gmail.com> | 2018-06-23 08:52:26 +0000 |
---|---|---|
committer | Christoph Reiter <reiter.christoph@gmail.com> | 2018-06-23 08:52:26 +0000 |
commit | 4e5a9500d0771d54a5f2336d3e94e0037f343bbc (patch) | |
tree | 3889eed4018fae4b47d618f2514fa17d1ec09344 | |
parent | 773c597b719df318e3ffe7722524e19d438b841f (diff) | |
parent | 0bc999fbfc8c010689e0320cd3a462b53bf85716 (diff) | |
download | gobject-introspection-4e5a9500d0771d54a5f2336d3e94e0037f343bbc.tar.gz |
Merge branch 'autotools-dist-meson' into 'master'
autotools: dist all meson files
See merge request GNOME/gobject-introspection!44
-rw-r--r-- | Makefile-cmph.am | 3 | ||||
-rw-r--r-- | Makefile-examples.am | 3 | ||||
-rw-r--r-- | Makefile-gir.am | 3 | ||||
-rw-r--r-- | Makefile-girepository.am | 3 | ||||
-rw-r--r-- | Makefile-giscanner.am | 3 | ||||
-rw-r--r-- | Makefile-tools.am | 3 | ||||
-rw-r--r-- | Makefile.am | 4 | ||||
-rw-r--r-- | docs/Makefile.am | 3 | ||||
-rw-r--r-- | docs/reference/Makefile.am | 4 | ||||
-rw-r--r-- | tests/Makefile.am | 3 |
10 files changed, 27 insertions, 5 deletions
diff --git a/Makefile-cmph.am b/Makefile-cmph.am index 5e2133ad..a0bf2291 100644 --- a/Makefile-cmph.am +++ b/Makefile-cmph.am @@ -3,6 +3,9 @@ EXTRA_LTLIBRARIES += libcmph.la libcmph_la_CPPFLAGS = -Icmph $(GLIB_CFLAGS) $(GI_HIDDEN_VISIBILITY_CFLAGS) libcmph_la_LIBADD = -lm $(GLIB_LIBS) +EXTRA_DIST += \ + girepository/cmph/meson.build + libcmph_la_SOURCES = \ girepository/cmph/bdz.c \ girepository/cmph/bdz.h \ diff --git a/Makefile-examples.am b/Makefile-examples.am index 0d9cedcf..8e5985bb 100644 --- a/Makefile-examples.am +++ b/Makefile-examples.am @@ -3,3 +3,6 @@ noinst_PROGRAMS += glib-print glib_print_SOURCES = examples/glib-print.c glib_print_CFLAGS = $(GOBJECT_CFLAGS) -I$(top_srcdir)/girepository glib_print_LDADD = libgirepository-1.0.la $(GOBJECT_LIBS) + +EXTRA_DIST += \ + examples/meson.build diff --git a/Makefile-gir.am b/Makefile-gir.am index 1d0da9b1..0b9cb177 100644 --- a/Makefile-gir.am +++ b/Makefile-gir.am @@ -15,6 +15,9 @@ STATIC_GIRSOURCES = \ gir/win32-1.0.gir EXTRA_DIST += $(STATIC_GIRSOURCES) +EXTRA_DIST += \ + gir/meson.build + gir/cairo-1.0.gir: gir/cairo-1.0.gir.in Makefile [ -d $(@D) ] || $(mkdir_p) $(@D) ; \ sed \ diff --git a/Makefile-girepository.am b/Makefile-girepository.am index 44b508df..f7f956a3 100644 --- a/Makefile-girepository.am +++ b/Makefile-girepository.am @@ -1,5 +1,6 @@ EXTRA_DIST += \ - girepository/docs.c + girepository/docs.c \ + girepository/meson.build girepodir = $(includedir)/gobject-introspection-1.0/ girepo_HEADERS = \ diff --git a/Makefile-giscanner.am b/Makefile-giscanner.am index c144fe54..23e793cb 100644 --- a/Makefile-giscanner.am +++ b/Makefile-giscanner.am @@ -6,6 +6,9 @@ BUILT_SOURCES += \ giscanner/scannerlexer.c \ giscanner/scannerlexer.h +EXTRA_DIST += \ + giscanner/meson.build + AM_YFLAGS = -d -t # Why do I have to do this automake? diff --git a/Makefile-tools.am b/Makefile-tools.am index b2e830f7..5dfa6c48 100644 --- a/Makefile-tools.am +++ b/Makefile-tools.am @@ -6,7 +6,8 @@ bin_SCRIPTS += g-ir-doc-tool endif EXTRA_DIST += \ - tools/g-ir-tool-template.in + tools/g-ir-tool-template.in \ + tools/meson.build TOOL_SUBSTITUTIONS = -e s,@libdir\@,$(libdir), -e s,@datarootdir\@,$(datarootdir), -e s,@PYTHON\@,$(PYTHON), diff --git a/Makefile.am b/Makefile.am index 6d1a2cc0..d941a3a9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,7 +58,9 @@ EXTRA_DIST += \ misc/update-glib-annotations.py \ misc/update-gtkdoc-tests.py \ misc/verbump.py \ - README.msvc + README.msvc \ + meson.build \ + meson_options.txt # Default pep8.py --exclude + emacs backup files PEP8_EXCLUDES=--exclude='.svn,CVS,.bzr,.hg,.git,__pycache__,.\#*' diff --git a/docs/Makefile.am b/docs/Makefile.am index f47966dd..5505303e 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -5,3 +5,6 @@ endif # Install the gir-1.2 schema schemadir = $(datadir)/gir-1.0 dist_schema_DATA = gir-1.2.rnc + +EXTRA_DIST = \ + meson.build diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 994b1149..ed55e594 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -99,7 +99,9 @@ GTKDOC_LIBS= \ include $(top_srcdir)/gtk-doc.make # generated by autogen.sh # Other files to distribute -EXTRA_DIST += version.xml.in +EXTRA_DIST += \ + version.xml.in \ + meson.build # Files not to distribute # for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types diff --git a/tests/Makefile.am b/tests/Makefile.am index bdd0fa7c..a47fcc31 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -25,7 +25,8 @@ libgimarshallingtests_1_0_la_SOURCES = gimarshallingtests.c EXTRA_DIST += \ gimarshallingtests.h \ gi-tester \ - gitestmacros.h + gitestmacros.h \ + meson.build BUILT_SOURCES += everything.c everything.h |