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

diff --git a/Makefile.am b/Makefile.am
index cd0f964..ce53445 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,140 +2,45 @@
 
 AUTOMAKE_OPTIONS = 1.4
 
-SUBDIRS = . gobject gmodule gthread docs tests build
+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_COMPAT_H -DGLIB_COMPILATION
+	-DG_DISABLE_DEPRECATED -DGLIB_COMPILATION
 
 EXTRA_DIST = 			\
 	ChangeLog.pre-1-2	\
-	glib-2.0.m4		\
 	glib.spec.in		\
+	glib-zip.in		\
+	NEWS.pre-1-3		\
 	acglib.m4		\
 	sanity_check		\
+	README.in		\
+	INSTALL.in		\
 	README.win32		\
 	TODO.xml		\
-	glib.def		\
-	makefile.msc.in		\
-	makefile.mingw.in	\
+	makefile.msc		\
+	makefile.mingw		\
 	glibconfig.h.win32.in	\
+	msvc_recommended_pragmas.h \
 	config.h.win32.in	\
-	build-dll		\
-	glib.rc.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	\
-	gen-unicode-tables.pl
+	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 = \
-	makefile.msc		\
-	makefile.mingw		\
+BUILT_EXTRA_DIST = 		\
 	glibconfig.h.win32	\
 	config.h.win32		\
-	glib.rc			\
-	glib.spec
-
-lib_LTLIBRARIES = libglib-1.3.la
-
-libglib_1_3_la_SOURCES = 	\
-	garray.c		\
-	gasyncqueue.c		\
-	gbacktrace.c		\
-	gcache.c		\
-	gcompletion.c		\
-	gconvert.c		\
-	gdataset.c		\
-	gdate.c         	\
-	gerror.c		\
-	gfileutils.c		\
-	ghash.c			\
-	ghook.c			\
-	giochannel.c    	\
-	glibintl.h		\
-	glist.c			\
-	gmain.c         	\
-	gmarkup.c		\
-	gmem.c			\
-	gmessages.c		\
-	gnode.c			\
-	gprimes.c		\
-	gqsort.c		\
-	gqueue.c		\
-	grel.c			\
-	grand.c			\
-	gscanner.c		\
-	gshell.c		\
-	gslist.c		\
-	gstrfuncs.c		\
-	gstring.c		\
-	gthread.c       	\
-	gthreadpool.c   	\
-	gtimer.c		\
-	gtree.c			\
-	guniprop.c		\
-	gutf8.c			\
-	gunibreak.h		\
-	gunibreak.c		\
-	gunichartables.h	\
-	gunidecomp.h		\
-	gunidecomp.c		\
-	gutils.c
-
-EXTRA_libglib_1_3_la_SOURCES = \
-	giounix.c	\
-	giowin32.c	\
-	gspawn.c	\
-	gspawn-win32.c	\
-	gwin32.c
-
-glibincludedir=$(includedir)/glib-2.0
-glibinclude_HEADERS =   \
-	galloca.h	\
-	garray.h	\
-	gasyncqueue.h	\
-	gbacktrace.h	\
-	gcache.h	\
-	gcompat.h	\
-	gcompletion.h	\
-	gconvert.h	\
-	gdataset.h	\
-	gdate.h		\
-	gerror.h	\
-	gfileutils.h	\
-	ghash.h		\
-	ghook.h		\
-	giochannel.h	\
-	glib.h 		\
-	glib-object.h	\
-	glist.h		\
-	gmacros.h	\
-	gmain.h		\
-	gmarkup.h	\
-	gmem.h		\
-	gmessages.h	\
-	gnode.h		\
-	gprimes.h	\
-	gqsort.h	\
-	gquark.h	\
-	gqueue.h	\
-	grand.h		\
-	grel.h		\
-	gscanner.h	\
-	gshell.h	\
-	gslist.h	\
-	gspawn.h	\
-	gstrfuncs.h	\
-	gstring.h	\
-	gthread.h	\
-	gthreadpool.h	\
-	gtimer.h	\
-	gtree.h		\
-	gtypes.h	\
-	gunicode.h	\
-	gutils.h	\
-	gwin32.h
+	glib.spec		\
+	glib-zip
 
 configexecincludedir = $(libdir)/glib-2.0/include
 #configexecinclude_DATA = glibconfig.h
@@ -156,60 +61,19 @@ stamp-gc-h: config.status
 	CONFIG_FILES= CONFIG_HEADERS= CONFIG_OTHER=glibconfig.h ./config.status
 	echo timestamp > stamp-gc-h
 
-libglib_1_3_la_LIBADD = @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@
-libglib_1_3_la_DEPENDENCIES = @GIO@ @GSPAWN@ @PLATFORMDEP@ 
-
-
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-if OS_WIN32
-# This requires a very new libtool
-export_symbols = -export-symbols glib.def
-endif
-
-libglib_1_3_la_LDFLAGS = \
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-	-export-dynamic $(no_undefined) $(export_symbols)
-
-if OS_WIN32
-bin_PROGRAMS = gspawn-win32-helper
-gspawn_win32_helper_LDADD = libglib-1.3.la
-endif
-if ENABLE_TIMELOOP
-timeloop = timeloop
-endif
-noinst_PROGRAMS = testglib testgdate testgdateparser $(timeloop)
-testglib_LDADD = libglib-1.3.la
-testgdate_LDADD = libglib-1.3.la
-testgdateparser_LDADD = libglib-1.3.la
-if ENABLE_TIMELOOP
-timeloop_LDADD = libglib-1.3.la
-endif
-m4datadir = $(datadir)/aclocal
-m4data_DATA = glib-2.0.m4
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = glib-2.0.pc gobject-2.0.pc gmodule-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
 
 config.h.win32: $(top_builddir)/config.status $(top_srcdir)/config.h.win32.in
 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-makefile.msc: $(top_builddir)/config.status $(top_srcdir)/makefile.msc.in
-	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/makefile.mingw.in
-	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-glib.rc: $(top_builddir)/config.status $(top_srcdir)/glib.rc.in
-	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-bin_SCRIPTS=glib-config-2.0
-BUILT_SOURCES=glib-config-2.0
-glib-config-2.0: glib-config-2.0.in
+DISTCLEANFILES = glibconfig-sysdefs.h glibconfig.h stamp-gc-h
 
 .PHONY: files release sanity snapshot
 
@@ -233,7 +97,32 @@ snapcheck:
 	$(MAKE) distcheck distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
 
 dist-hook: $(BUILT_EXTRA_DIST)
-	files='$(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; \
-	  cp $$d/$$f $(distdir) || exit 1; done
+	  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"