cleanup

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

diff --git a/Makefile.am b/Makefile.am
index b2555ad..a1c9c33 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,23 +1,18 @@
 ## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/Makefile.decl
+include $(top_srcdir)/glib.mk
 
 # http://people.gnome.org/~walters/docs/build-api.txt
 .buildapi-allow-builddir:
 
 ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
 
-SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs
+SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests
 DIST_SUBDIRS = $(SUBDIRS) build
-if BUILD_MODULAR_TESTS
-SUBDIRS += tests 
-else
-DIST_SUBDIRS += tests
-endif
 
 bin_SCRIPTS = glib-gettextize
 
 if OS_LINUX
-TESTS = check-abis.sh
+TESTS += check-abis.sh
 endif
 
 AM_CPPFLAGS =                                  \
@@ -45,11 +40,15 @@ EXTRA_DIST +=                       \
        sanity_check            \
        README.commits          \
        README.in               \
+       README.rationale        \
        INSTALL.in              \
        README.win32            \
        HACKING                 \
        autogen.sh              \
-       Makefile.decl           \
+       glib.mk                 \
+       glib-tap.mk             \
+       tap-driver.sh           \
+       tap-test                \
        makefile.msc            \
        msvc_recommended_pragmas.h \
        config.h.win32.in       \
@@ -63,16 +62,18 @@ EXTRA_DIST +=                       \
        gio-2.0.pc.in           \
        gio-unix-2.0.pc.in      \
        gio-windows-2.0.pc.in   \
-       check-abis.sh
+       check-abis.sh           \
+       gtk-doc.make            \
+       $(NULL)
 
 
 # These may be in the builddir too
-BUILT_EXTRA_DIST =             \
+BUILT_EXTRA_DIST +=            \
        README                  \
        INSTALL                 \
        ChangeLog               \
        config.h.win32          \
-       gtk-doc.make
+       $(NULL)
 
 CONFIGURE_DEPENDENCIES = acglib.m4
 
@@ -105,7 +106,7 @@ $(pkgconfig_DATA): config.status
 # build documentation when doing distcheck
 DISTCHECK_CONFIGURE_FLAGS = --enable-debug --enable-gtk-doc --enable-man --disable-maintainer-mode
 
-DISTCLEANFILES = config.lt
+DISTCLEANFILES += config.lt
 
 distclean-local: lcov-clean
        if test $(srcdir) = .; then :; else \