X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Makefile.am;h=c04c1447a962f23d83ee88760f330be444d9b9d5;hb=5b45c39b4b02f4f5c4665b505fb1cf3e84d0b6e8;hp=e129296b8e567b880e10fcefda8a259f010278ac;hpb=0b434a3cbda99fc8f93be23aea4961051cbce8ab;p=platform%2Fupstream%2Fglib.git

diff --git a/Makefile.am b/Makefile.am
index e129296..c04c144 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,15 +1,24 @@
 ## Process this file with automake to produce Makefile.in
+include $(top_srcdir)/Makefile.decl
 
-AUTOMAKE_OPTIONS = 1.7
+ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
 
-SUBDIRS = . m4macros glib gobject gmodule gthread tests build po docs
+SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
+DIST_SUBDIRS = $(SUBDIRS) build
 
 bin_SCRIPTS = glib-gettextize
 
-INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ \
-	-DG_DISABLE_DEPRECATED -DGLIB_COMPILATION
-
-EXTRA_DIST = 			\
+AM_CPPFLAGS = 					\
+	-DG_LOG_DOMAIN=g_log_domain_glib 	\
+	@GLIB_DEBUG_FLAGS@ 			\
+	-DG_DISABLE_DEPRECATED 			\
+	-DGLIB_COMPILATION
+
+EXTRA_DIST += 			\
+	ChangeLog.pre-2-20	\
+	ChangeLog.pre-2-18	\
+	ChangeLog.pre-2-16	\
+	ChangeLog.pre-2-14	\
 	ChangeLog.pre-2-12	\
 	ChangeLog.pre-2-10	\
 	ChangeLog.pre-2-8	\
@@ -22,14 +31,16 @@ EXTRA_DIST = 			\
 	NEWS.pre-1-3		\
 	acglib.m4		\
 	sanity_check		\
+	README.commits		\
 	README.in		\
 	INSTALL.in		\
 	README.win32		\
 	HACKING			\
 	MAINTAINERS		\
 	autogen.sh		\
+	Makefile.decl		\
+	mkinstalldirs		\
 	makefile.msc		\
-	glibconfig.h.win32.in	\
 	msvc_recommended_pragmas.h \
 	config.h.win32.in	\
         po/po2tbl.sed.in        \
@@ -39,45 +50,51 @@ EXTRA_DIST = 			\
 	gmodule-export-2.0.pc.in	\
 	gmodule-no-export-2.0.pc.in	\
 	gthread-2.0.pc.in	\
+	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
+	gmodule-no-export-2.0-uninstalled.pc.in \
+	gio-2.0-uninstalled.pc.in		\
+	gio-unix-2.0-uninstalled.pc.in
 
 
 # These may be in the builddir too
 BUILT_EXTRA_DIST = 		\
 	README			\
 	INSTALL			\
-	glibconfig.h.win32	\
+	ChangeLog		\
 	config.h.win32		\
 	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
-
-uninstall-local:
-	rm -f $(DESTDIR)$(configexecincludedir)/glibconfig.h
-
 CONFIGURE_DEPENDENCIES = acglib.m4
 
-BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
-glibconfig.h: stamp-gc-h
-	@if test -f glibconfig.h; then :; \
-	else rm -f stamp-gc-h; $(MAKE) stamp-gc-h; fi
-stamp-gc-h: config.status
-	cd $(top_builddir) && $(SHELL) ./config.status glibconfig.h
-	echo timestamp > stamp-gc-h
+ChangeLog:
+	$(AM_V_GEN) if test -d "$(srcdir)/.git"; then \
+	  (GIT_DIR=$(top_srcdir)/.git ./missing --run git log GLIB_2_20_0^^.. --stat) | fmt --split-only > $@.tmp \
+	  && mv -f $@.tmp $@ \
+	  || ($(RM) $@.tmp; \
+	      echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
+	      (test -f $@ || echo git-log is required to generate this file >> $@)); \
+	else \
+	  test -f $@ || \
+	  (echo A git checkout and git-log is required to generate ChangeLog >&2 && \
+	  echo A git checkout and git-log is required to generate this file >> $@); \
+	fi
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = glib-2.0.pc gobject-2.0.pc gmodule-2.0.pc gmodule-export-2.0.pc gmodule-no-export-2.0.pc gthread-2.0.pc
+pkgconfig_DATA = glib-2.0.pc gobject-2.0.pc gmodule-2.0.pc gmodule-export-2.0.pc gmodule-no-export-2.0.pc gthread-2.0.pc gio-2.0.pc
+
+if OS_UNIX
+pkgconfig_DATA += gio-unix-2.0.pc
+endif
+
+if OS_WIN32
+pkgconfig_DATA += gio-windows-2.0.pc
+endif
 
 $(pkgconfig_DATA): config.status
 
@@ -88,14 +105,14 @@ gettext_SCRIPTS = mkinstalldirs
 # build documentation when doing distcheck
 DISTCHECK_CONFIGURE_FLAGS = --enable-debug --enable-gtk-doc --enable-man
 
-DISTCLEANFILES = glibconfig-sysdefs.h glibconfig.h stamp-gc-h
+DISTCLEANFILES = config.lt
 
-distclean-local:
+distclean-local: lcov-clean
 	if test $(srcdir) = .; then :; else \
 	    rm -f $(BUILT_EXTRA_DIST); \
 	fi
 
-.PHONY: files release sanity snapshot
+.PHONY: files release sanity snapshot ChangeLog
 
 files:
 	@files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \