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

diff --git a/Makefile.am b/Makefile.am
index faba563..0905eea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,84 +1,91 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = 1.4
+AUTOMAKE_OPTIONS = 1.7
 
-SUBDIRS = . gmodule gthread docs tests
+SUBDIRS = . m4macros glib gobject gmodule gthread tests build po docs
 
-configincludedir = $(pkglibdir)/include
+bin_SCRIPTS = glib-gettextize
 
-bin_SCRIPTS=glib-config
-BUILT_SOURCES=glib-config
-glib-config: glib-config.in
+INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ \
+	-DG_DISABLE_DEPRECATED -DGLIB_COMPILATION
 
-INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@
-
-EXTRA_DIST = \
-	glib.m4			\
-	glib.spec.in		\
+EXTRA_DIST = 			\
+	ChangeLog.pre-2-6	\
+	ChangeLog.pre-2-4	\
+	ChangeLog.pre-2-2	\
+	ChangeLog.pre-2-0	\
+	ChangeLog.pre-1-2	\
+	glib-zip.in		\
+	NEWS.pre-1-3		\
 	acglib.m4		\
 	sanity_check		\
+	README.in		\
+	INSTALL.in		\
 	README.win32		\
-	glib.def		\
 	makefile.msc		\
-	giowin32.c		\
+	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 	\
+	gmodule-2.0-uninstalled.pc.in	\
+	gthread-2.0-uninstalled.pc.in
+
+# These may be in the builddir too
+BUILT_EXTRA_DIST = 		\
+	README			\
+	INSTALL			\
 	glibconfig.h.win32	\
-	config.h.win32
-
-lib_LTLIBRARIES = libglib.la
-
-libglib_la_SOURCES = \
-	garray.c	\
-	gcache.c	\
-	gcompletion.c	\
-	gdataset.c	\
-	gdate.c         \
-	gerror.c	\
-	ghash.c		\
-	ghook.c		\
-	giochannel.c    \
-	giounix.c       \
-	glist.c		\
-	gmain.c         \
-	gmem.c		\
-	gmessages.c	\
-	gmutex.c	\
-	gnode.c		\
-	gprimes.c	\
-	grel.c		\
-	gscanner.c	\
-	gslist.c	\
-	gstrfuncs.c	\
-	gstring.c	\
-	gtimer.c	\
-	gtree.c		\
-	gutils.c
-
-include_HEADERS = \
-	glib.h
-
-configinclude_DATA = \
-	glibconfig.h
-
-configure: configure.in acglib.m4		
+	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
-	CONFIG_FILES= CONFIG_HEADERS= CONFIG_OTHER=glibconfig.h ./config.status
+	cd $(top_builddir) && $(SHELL) ./config.status glibconfig.h
 	echo timestamp > stamp-gc-h
 
-libglib_la_LDFLAGS = \
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-	-release $(LT_RELEASE)
+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
 
-noinst_PROGRAMS = testglib testgdate testgdateparser
-testglib_LDADD = libglib.la
-testgdate_LDADD = libglib.la
-testgdateparser_LDADD = libglib.la
+$(pkgconfig_DATA): config.status
 
-m4datadir = $(datadir)/aclocal
-m4data_DATA = glib.m4
+# 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-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
 
@@ -96,7 +103,13 @@ sanity:
 	./sanity_check $(VERSION)
 
 snapshot:
-	$(MAKE) dist distdir=$(PACKAGE)`date +"%y%m%d"`
+	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
+
+snapcheck:
+	$(MAKE) distcheck distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
 
-dist-hook:
-	cp glib.spec $(distdir)
\ No newline at end of file
+dist-hook: $(BUILT_EXTRA_DIST)
+	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