luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-23 15:49:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dist-subprojects' into 'master'

Browse Source 
build: Add missing subprojects/ to archive. Fixes #1295

Closes #1295

See merge request GNOME/glib!30
This commit is contained in:
Philip Withnall 2018-05-28 11:47:17 +00:00
commit 66187c4c3e
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -6,7 +6,7 @@ include $(top_srcdir)/glib.mk
ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS} 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 DIST_SUBDIRS = $(SUBDIRS) build win32
bin_SCRIPTS = glib-gettextize bin_SCRIPTS = glib-gettextize

1
configure.ac
View File

@ -3615,6 +3615,7 @@ tests/Makefile
tests/gobject/Makefile tests/gobject/Makefile
tests/refcount/Makefile tests/refcount/Makefile
m4macros/Makefile m4macros/Makefile
subprojects/Makefile
]) ])
# We need this command because the configure script will not preserve # We need this command because the configure script will not preserve

5
subprojects/Makefile.am Normal file
View File

@ -0,0 +1,5 @@
EXTRA_DIST = \
libffi.wrap \
proxy-libintl.wrap \
zlib.wrap \
$(NULL)