X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Makefile.am;h=0905eeadcb02e457307a723e690fc5c16f7fa145;hb=6b55164587cc96639e8c2d082ecb29ee7b0ff0bb;hp=f23a226d2d76f78047537a4ad6027a893d324370;hpb=d59c859aec6a80f4d9ed1c28487952929d7f19e8;p=platform%2Fupstream%2Fglib.git

diff --git a/Makefile.am b/Makefile.am
index f23a226..0905eea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = 1.4
+AUTOMAKE_OPTIONS = 1.7
 
-SUBDIRS = . m4macros glib gobject gmodule gthread docs tests build po
+SUBDIRS = . m4macros glib gobject gmodule gthread tests build po docs
 
 bin_SCRIPTS = glib-gettextize
 
@@ -10,21 +10,28 @@ INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ \
 	-DG_DISABLE_DEPRECATED -DGLIB_COMPILATION
 
 EXTRA_DIST = 			\
+	ChangeLog.pre-2-6	\
+	ChangeLog.pre-2-4	\
+	ChangeLog.pre-2-2	\
+	ChangeLog.pre-2-0	\
 	ChangeLog.pre-1-2	\
-	glib.spec.in		\
+	glib-zip.in		\
 	NEWS.pre-1-3		\
 	acglib.m4		\
 	sanity_check		\
+	README.in		\
+	INSTALL.in		\
 	README.win32		\
-	TODO.xml		\
 	makefile.msc		\
-	makefile.mingw		\
 	glibconfig.h.win32.in	\
+	msvc_recommended_pragmas.h \
 	config.h.win32.in	\
         po/po2tbl.sed.in        \
 	glib-2.0.pc.in 		\
 	gobject-2.0.pc.in 	\
 	gmodule-2.0.pc.in	\
+	gmodule-export-2.0.pc.in	\
+	gmodule-no-export-2.0.pc.in	\
 	gthread-2.0.pc.in	\
 	glib-2.0-uninstalled.pc.in 	\
 	gobject-2.0-uninstalled.pc.in 	\
@@ -33,9 +40,11 @@ EXTRA_DIST = 			\
 
 # These may be in the builddir too
 BUILT_EXTRA_DIST = 		\
+	README			\
+	INSTALL			\
 	glibconfig.h.win32	\
 	config.h.win32		\
-	glib.spec
+	gtk-doc.make
 
 configexecincludedir = $(libdir)/glib-2.0/include
 #configexecinclude_DATA = glibconfig.h
@@ -46,6 +55,9 @@ install-exec-local: 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
@@ -53,23 +65,28 @@ 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
-	CONFIG_FILES= CONFIG_HEADERS= CONFIG_OTHER=glibconfig.h ./config.status
+	cd $(top_builddir) && $(SHELL) ./config.status glibconfig.h
 	echo timestamp > stamp-gc-h
 
-
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = glib-2.0.pc gobject-2.0.pc gmodule-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
 
 $(pkgconfig_DATA): config.status
 
-glibconfig.h.win32: $(top_builddir)/config.status $(top_srcdir)/glibconfig.h.win32.in
-	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+# install mkinstalldirs for glib-gettextize's benefit
+gettextdir = $(datadir)/glib-2.0/gettext
+gettext_SCRIPTS = mkinstalldirs
 
-config.h.win32: $(top_builddir)/config.status $(top_srcdir)/config.h.win32.in
-	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+# build documentation when doing distcheck
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
 DISTCLEANFILES = glibconfig-sysdefs.h glibconfig.h stamp-gc-h
 
+distclean-local:
+	if test $(srcdir) = .; then :; else \
+	    rm -f $(BUILT_EXTRA_DIST); \
+	fi
+
 .PHONY: files release sanity snapshot
 
 files:
@@ -92,8 +109,7 @@ snapcheck:
 	$(MAKE) distcheck distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
 
 dist-hook: $(BUILT_EXTRA_DIST)
-	cd $(top_builddir) && CONFIG_FILES="INSTALL README" CONFIG_HEADERS= $(SHELL) ./config.status
-	files='$(BUILT_EXTRA_DIST) INSTALL README'; \
+	files='$(BUILT_EXTRA_DIST)'; \
 	for f in $$files; do \
 	  if test -f $$f; then d=.; else d=$(srcdir); fi; \
 	  rm -f $(distdir)/$$f && cp $$d/$$f $(distdir) || exit 1; done