X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Makefile.am;h=e36285c6dbbb452b07cb8b44f86fae8a8ffcb6d1;hb=1e55738f31385ddb3bf172ba3590a79cf42782f4;hp=408dce4cc96fce4f9b4dc2cb52f7e97cfac43c7e;hpb=912027f0df88dc54999144a493208aec01ea9905;p=platform%2Fupstream%2Fglib.git

diff --git a/Makefile.am b/Makefile.am
index 408dce4..e36285c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,15 +1,17 @@
 ## Process this file with automake to produce Makefile.in
+include $(top_srcdir)/Makefile.decl
 
 AUTOMAKE_OPTIONS = 1.7
 
-SUBDIRS = . m4macros glib gobject gmodule gthread tests po docs
+SUBDIRS = . m4macros glib gobject gmodule gthread tests build po docs
 
 bin_SCRIPTS = glib-gettextize
 
 INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ \
 	-DG_DISABLE_DEPRECATED -DGLIB_COMPILATION
 
-EXTRA_DIST = 			\
+EXTRA_DIST += 			\
+	ChangeLog.pre-2-14	\
 	ChangeLog.pre-2-12	\
 	ChangeLog.pre-2-10	\
 	ChangeLog.pre-2-8	\
@@ -28,6 +30,7 @@ EXTRA_DIST = 			\
 	HACKING			\
 	MAINTAINERS		\
 	autogen.sh		\
+	mkinstalldirs		\
 	makefile.msc		\
 	glibconfig.h.win32.in	\
 	msvc_recommended_pragmas.h \
@@ -55,13 +58,7 @@ BUILT_EXTRA_DIST = 		\
 	gtk-doc.make
 
 configexecincludedir = $(libdir)/glib-2.0/include
-#configexecinclude_DATA = glibconfig.h
-
-install-exec-local: glibconfig.h
-	$(mkinstalldirs) $(DESTDIR)$(configexecincludedir)
-	file=$(DESTDIR)$(configexecincludedir)/glibconfig.h; \
-	if test -r $$file && cmp -s glibconfig.h $$file; then :; \
-	else $(INSTALL_DATA) glibconfig.h $$file; fi
+configexecinclude_DATA = glibconfig.h
 
 uninstall-local:
 	rm -f $(DESTDIR)$(configexecincludedir)/glibconfig.h
@@ -86,7 +83,7 @@ gettextdir = $(datadir)/glib-2.0/gettext
 gettext_SCRIPTS = mkinstalldirs
 
 # build documentation when doing distcheck
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+DISTCHECK_CONFIGURE_FLAGS = --enable-debug --enable-gtk-doc --enable-man
 
 DISTCLEANFILES = glibconfig-sysdefs.h glibconfig.h stamp-gc-h