X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Makefile.am;h=a1c9c33a045c18e3c6ce9b6bf89c04fd21790d57;hb=9da85c7262325478e8730ae9f3e76bd0528a9a8c;hp=cc4facad241145e931b6334200a3b7d5cb851e28;hpb=1b033919845cef366842373da9f1cfb56f522d01;p=platform%2Fupstream%2Fglib.git

diff --git a/Makefile.am b/Makefile.am
index cc4faca..a1c9c33 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,16 +1,20 @@
 ## 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 tests po docs
+SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests
 DIST_SUBDIRS = $(SUBDIRS) build
 
 bin_SCRIPTS = glib-gettextize
 
+if OS_LINUX
+TESTS += check-abis.sh
+endif
+
 AM_CPPFLAGS = 					\
 	-DG_LOG_DOMAIN=g_log_domain_glib 	\
 	@GLIB_DEBUG_FLAGS@ 			\
@@ -36,12 +40,15 @@ EXTRA_DIST += 			\
 	sanity_check		\
 	README.commits		\
 	README.in		\
+	README.rationale	\
 	INSTALL.in		\
 	README.win32		\
 	HACKING			\
 	autogen.sh		\
-	Makefile.decl		\
-	mkinstalldirs		\
+	glib.mk			\
+	glib-tap.mk		\
+	tap-driver.sh		\
+	tap-test		\
 	makefile.msc		\
 	msvc_recommended_pragmas.h \
 	config.h.win32.in	\
@@ -55,22 +62,18 @@ EXTRA_DIST += 			\
 	gio-2.0.pc.in		\
 	gio-unix-2.0.pc.in	\
 	gio-windows-2.0.pc.in	\
-	glib-2.0-uninstalled.pc.in 	\
-	gobject-2.0-uninstalled.pc.in 	\
-	gmodule-2.0-uninstalled.pc.in	\
-	gthread-2.0-uninstalled.pc.in	\
-	gmodule-no-export-2.0-uninstalled.pc.in \
-	gio-2.0-uninstalled.pc.in		\
-	gio-unix-2.0-uninstalled.pc.in
+	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
 
@@ -100,14 +103,10 @@ 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
 
-DISTCLEANFILES = config.lt
+DISTCLEANFILES += config.lt
 
 distclean-local: lcov-clean
 	if test $(srcdir) = .; then :; else \