win32: suppress fatal error dialog box when running tests

[platform/upstream/glib.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f5c510d..5df81cc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,8 +6,13 @@ include $(top_srcdir)/Makefile.decl
 
 ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
 
-SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
+SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs
 DIST_SUBDIRS = $(SUBDIRS) build
+if BUILD_MODULAR_TESTS
+SUBDIRS += tests 
+else
+DIST_SUBDIRS += tests
+endif
 
 bin_SCRIPTS = glib-gettextize
 
@@ -41,7 +46,6 @@ EXTRA_DIST +=                         \
        HACKING                 \
        autogen.sh              \
        Makefile.decl           \
-       mkinstalldirs           \
        makefile.msc            \
        msvc_recommended_pragmas.h \
        config.h.win32.in       \
@@ -93,10 +97,6 @@ endif
 
 $(pkgconfig_DATA): config.status
 
-# install mkinstalldirs for glib-gettextize's benefit
-gettextdir = $(datadir)/glib-2.0/gettext
-gettext_SCRIPTS = mkinstalldirs
-
 # build documentation when doing distcheck
 DISTCHECK_CONFIGURE_FLAGS = --enable-debug --enable-gtk-doc --enable-man --disable-maintainer-mode