diff options
| author | Philip Withnall <philip@tecnocode.co.uk> | 2018-05-28 11:47:17 +0000 |
|---|---|---|
| committer | Philip Withnall <philip@tecnocode.co.uk> | 2018-05-28 11:47:17 +0000 |
| commit | 66187c4c3ebb46bc842ced16fd86458f26d68f34 (patch) | |
| tree | 65b6d7d68a7af0f1a8976ced24995fbb5e73875a | |
| parent | b84e0d164719cb285a798afc54ea496b5b2b75ea (diff) | |
| parent | e8e9dbe843b5f3c466a97a63cbf01cc43ea0a9c6 (diff) | |
| download | glib-66187c4c3ebb46bc842ced16fd86458f26d68f34.tar.gz | |
Merge branch 'dist-subprojects' into 'master'
build: Add missing subprojects/ to archive. Fixes #1295
Closes #1295
See merge request GNOME/glib!30
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | subprojects/Makefile.am | 5 |
3 files changed, 7 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 49b5e4e71..f6e5ef169 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,7 @@ include $(top_srcdir)/glib.mk ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS} -SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests +SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests subprojects DIST_SUBDIRS = $(SUBDIRS) build win32 bin_SCRIPTS = glib-gettextize diff --git a/configure.ac b/configure.ac index 7afeb87dc..ab67bda3f 100644 --- a/configure.ac +++ b/configure.ac @@ -3615,6 +3615,7 @@ tests/Makefile tests/gobject/Makefile tests/refcount/Makefile m4macros/Makefile +subprojects/Makefile ]) # We need this command because the configure script will not preserve diff --git a/subprojects/Makefile.am b/subprojects/Makefile.am new file mode 100644 index 000000000..34b2a92ec --- /dev/null +++ b/subprojects/Makefile.am @@ -0,0 +1,5 @@ +EXTRA_DIST = \ + libffi.wrap \ + proxy-libintl.wrap \ + zlib.wrap \ + $(NULL) |