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

build: Fix 'make dist' regression

Browse Source 
Commit f084b603771f78126bc0b07229a1574b76e776bb incorrectly set
DIST_SUBDIRS for the toplevel Makefile.am.  In general actually we
don't need to set it, because modern automake automatically sets
it by looking at conditionals for SUBDIRS.

Tested-by: Rico Tzschichholz <ricotz@t-online.de>

https://bugzilla.gnome.org/show_bug.cgi?id=667806
This commit is contained in:
Colin Walters 2012-04-25 14:47:01 -04:00
parent 87cc77a198
commit 063ec9a75d
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gio/Makefile.am
View File

@ -2,7 +2,6 @@ include $(top_srcdir)/Makefile.decl
NULL = NULL =
DIST_SUBDIRS =
SUBDIRS = gdbus-2.0/codegen SUBDIRS = gdbus-2.0/codegen
if OS_UNIX if OS_UNIX
@ -328,8 +327,6 @@ endif
if BUILD_MODULAR_TESTS if BUILD_MODULAR_TESTS
SUBDIRS += tests SUBDIRS += tests
else
DIST_SUBDIRS += tests
endif endif
libgio_2_0_la_SOURCES = \ libgio_2_0_la_SOURCES = \

6
glib/Makefile.am
View File

@ -36,15 +36,11 @@ MAYBE_PCRE = pcre
endif endif
SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre .
DIST_SUBDIRS = DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests
if BUILD_MODULAR_TESTS if BUILD_MODULAR_TESTS
SUBDIRS += tests SUBDIRS += tests
else
DIST_SUBDIRS += tests
endif endif
DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests
AM_CPPFLAGS = \ AM_CPPFLAGS = \
$(glib_INCLUDES) \ $(glib_INCLUDES) \
$(pcre_inc) \ $(pcre_inc) \

3
gobject/Makefile.am
View File

@ -5,11 +5,8 @@
include $(top_srcdir)/Makefile.decl include $(top_srcdir)/Makefile.decl
SUBDIRS = . SUBDIRS = .
DIST_SUBDIRS =
if BUILD_MODULAR_TESTS if BUILD_MODULAR_TESTS
SUBDIRS += tests SUBDIRS += tests
else
DIST_SUBDIRS += tests
endif endif
BUILT_SOURCES= BUILT_SOURCES=