X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Makefile.am;h=ce5344541920148f78b31fc17eb292c31c843c5b;hb=fc8fd6f8cb01ac93933d372e8056765de04092ae;hp=75e448345d3c25a5920038ed42356ca1f90369c0;hpb=5900267cc7bfe0641709d43eaba28f6b0ff7ab0d;p=platform%2Fupstream%2Fglib.git

diff --git a/Makefile.am b/Makefile.am
index 75e4483..ce53445 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,75 +1,79 @@
 ## Process this file with automake to produce Makefile.in
 
-# build . first, then SUBDIRS
-SUBDIRS = gmodule docs
-all-recursive-am: all-am
-# alpha `automake' supports this better
-#SUBDIRS = . gmodule docs
-
-configincludedir = $(pkglibdir)/include
-
-bin_SCRIPTS=glib-config
-BUILT_SOURCES=glib-config
-glib-config: glib-config.in
-
-DEFS += -DG_LOG_DOMAIN=g_log_domain_glib
-
-EXTRA_DIST = \
-	glib.m4		\
-	glib.spec	\
-	sanity_check	\
-	README.win32	\
-	glib.def	\
-	makefile.lcc	\
-	makefile.msc	\
-	glibconfig.h.win32
-
-lib_LTLIBRARIES = libglib.la
-
-libglib_la_SOURCES = \
-		garray.c	\
-		gcache.c	\
-		gcompletion.c	\
-		gdataset.c	\
-		gerror.c	\
-		ghash.c		\
-		ghook.c		\
-		glist.c		\
-		gmem.c		\
-		gmessages.c	\
-		gnode.c		\
-		gprimes.c	\
-		gslist.c	\
-		gtimer.c	\
-		gtree.c		\
-		grel.c		\
-		gstring.c	\
-		gstrfuncs.c	\
-		gscanner.c	\
-		gutils.c
-
-include_HEADERS = \
-		glib.h
-
-configinclude_DATA = \
-		glibconfig.h
+AUTOMAKE_OPTIONS = 1.4
+
+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 = 			\
+	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	\
+	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 = 		\
+	glibconfig.h.win32	\
+	config.h.win32		\
+	glib.spec		\
+	glib-zip
+
+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
+
+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
 	echo timestamp > stamp-gc-h
 
-libglib_la_LDFLAGS = \
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
-INCLUDES = -I$(top_srcdir)
 
-noinst_PROGRAMS = testglib
-testglib_LDADD = libglib.la
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = glib-2.0.pc gobject-2.0.pc gmodule-2.0.pc gthread-2.0.pc
 
-m4datadir = $(datadir)/aclocal
-m4data_DATA = glib.m4
+$(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
+
+config.h.win32: $(top_builddir)/config.status $(top_srcdir)/config.h.win32.in
+	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+DISTCLEANFILES = glibconfig-sysdefs.h glibconfig.h stamp-gc-h
 
 .PHONY: files release sanity snapshot
 
@@ -87,4 +91,38 @@ 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: $(BUILT_EXTRA_DIST)
+	cd $(top_builddir) && CONFIG_FILES="INSTALL README" CONFIG_HEADERS= $(SHELL) ./config.status
+	files='$(BUILT_EXTRA_DIST) INSTALL README'; \
+	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
+
+# This is a version of the automake-1.4 distcheck rule modified
+# to pass --enable-gtk-doc to ./configure
+#
+mydistcheck: dist
+	-rm -rf $(distdir)
+	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
+	mkdir $(distdir)/=build
+	mkdir $(distdir)/=inst
+	dc_install_base=`cd $(distdir)/=inst && pwd`; \
+	cd $(distdir)/=build \
+	  && ../configure --srcdir=.. --prefix=$$dc_install_base --enable-gtk-doc \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist
+	-rm -rf $(distdir)
+	@banner="$(distdir).tar.gz is ready for distribution"; \
+	dashes=`echo "$$banner" | sed s/./=/g`; \
+	echo "$$dashes"; \
+	echo "$$banner"; \
+	echo "$$dashes"