X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=glib%2FMakefile.am;h=eb220e66ec2d3aae013d9d19e7b022358cd3b1e2;hb=6a3b4fa05ac996566e7b8037edf80d0f06fa2a90;hp=11b4e82d0574e6801fb33123937ad36cc004b0e2;hpb=fab889b14d4c71cc3d45aee2f610fdad0aa16ab1;p=platform%2Fupstream%2Fglib.git

diff --git a/glib/Makefile.am b/glib/Makefile.am
index 11b4e82..eb220e6 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -1,81 +1,154 @@
 ## Process this file with automake to produce Makefile.in
+include $(top_srcdir)/Makefile.decl
+
+if HAVE_GOOD_PRINTF
+else
+PRINTF_SUBDIR = gnulib
+printf_la = gnulib/libgnulib.la
+endif 
+
+if ENABLE_REGEX
+if USE_SYSTEM_PCRE
+else
+MAYBE_PCRE = pcre 
+endif
+gregex_c = gregex.c
+gregex_h = gregex.h
+else
+gregex_c =
+gregex_h =
+endif
+
+SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests
 
-AUTOMAKE_OPTIONS = 1.4
+DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests
 
-SUBDIRS = . m4macros gobject gmodule gthread docs tests build
+AM_CPPFLAGS = 				\
+	-I$(top_srcdir) 		\
+	$(pcre_inc) 			\
+	-DG_LOG_DOMAIN=\"GLib\" 	\
+	$(GLIB_DEBUG_FLAGS) 		\
+	-DG_DISABLE_DEPRECATED 		\
+	-DGLIB_COMPILATION 		\
+	-DPCRE_STATIC
 
-INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ \
-	-DG_DISABLE_DEPRECATED -DGLIB_COMPILATION
+glib.def: glib.symbols
+	(echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/glib.symbols | sed -e '/^$$/d' -e 's/^/	/' -e 's/G_GNUC_[^ ]*//g') > glib.def
 
-EXTRA_DIST = 			\
-	ChangeLog.pre-1-2	\
-	glib.spec.in		\
-	NEWS.pre-1-3		\
-	acglib.m4		\
-	sanity_check		\
-	README.win32		\
-	TODO.xml		\
-	glib.def		\
+galias.h: glib.symbols
+	  $(PERL) $(srcdir)/makegalias.pl < $(srcdir)/glib.symbols > galias.h
+
+galiasdef.c: glib.symbols
+	  $(PERL) $(srcdir)/makegalias.pl -def < $(srcdir)/glib.symbols > galiasdef.c
+
+if OS_LINUX
+if HAVE_GNUC_VISIBILITY
+TESTS_ENVIRONMENT = GLIB_DEBUG_FLAGS="$(GLIB_DEBUG_FLAGS)"
+TESTS = abicheck.sh pltcheck.sh
+endif
+endif
+
+BUILT_SOURCES = galias.h galiasdef.c
+
+MIRRORING_TAB_SOURCE = 				\
+	glib-mirroring-tab/Makefile 		\
+	glib-mirroring-tab/gen-mirroring-tab.c	\
+	glib-mirroring-tab/packtab.h		\
+	glib-mirroring-tab/packtab.c
+
+# The compilation of GRegex can be disabled, but the source files must
+# be distributed.
+EXTRA_DIST += 			\
 	makefile.msc.in		\
-	makefile.mingw.in	\
-	glibconfig.h.win32.in	\
-	config.h.win32.in	\
-	build-dll		\
 	glib.rc.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	\
-	gen-unicode-tables.pl
+	gen-unicode-tables.pl	\
+	gen-script-table.pl	\
+	makegalias.pl		\
+	abicheck.sh		\
+	pltcheck.sh		\
+	glib.symbols		\
+	gregex.c		\
+	gregex.h		\
+	win_iconv.c		\
+	$(MIRRORING_TAB_SOURCE)
 
 # These may be in the builddir too
 BUILT_EXTRA_DIST = 		\
 	makefile.msc		\
-	makefile.mingw		\
-	glibconfig.h.win32	\
-	config.h.win32		\
 	glib.rc			\
-	glib.spec
+	galias.h		\
+	galiasdef.c
+
+lib_LTLIBRARIES = libglib-2.0.la
 
-lib_LTLIBRARIES = libglib-1.3.la
+if OS_WIN32_AND_DLL_COMPILATION
+if MS_LIB_AVAILABLE
+noinst_DATA = glib-2.0.lib
 
-libglib_1_3_la_SOURCES = 	\
+install_ms_lib_cmd = $(INSTALL) glib-2.0.lib $(DESTDIR)$(libdir)
+uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/glib-2.0.lib
+endif
+endif
+
+install-ms-lib:
+	$(install_ms_lib_cmd)
+
+uninstall-ms-lib:
+	$(uninstall_ms_lib_cmd)
+
+libglib_2_0_la_SOURCES = 	\
 	garray.c		\
 	gasyncqueue.c		\
+	gatomic.c		\
 	gbacktrace.c		\
+	gbase64.c		\
+	gbookmarkfile.c 	\
+	gbsearcharray.h		\
 	gcache.c		\
+	gchecksum.c		\
 	gcompletion.c		\
 	gconvert.c		\
 	gdataset.c		\
+	gdatasetprivate.h	\
 	gdate.c         	\
+	gdir.c			\
 	gerror.c		\
 	gfileutils.c		\
 	ghash.c			\
 	ghook.c			\
+	ghostutils.c		\
 	giochannel.c    	\
+	gkeyfile.c        	\
 	glibintl.h		\
 	glist.c			\
 	gmain.c         	\
+	gmappedfile.c		\
 	gmarkup.c		\
 	gmem.c			\
 	gmessages.c		\
+	gmirroringtable.h	\
 	gnode.c			\
+	goption.c		\
 	gpattern.c		\
+	gpoll.c			\
 	gprimes.c		\
 	gqsort.c		\
 	gqueue.c		\
 	grel.c			\
 	grand.c			\
+	$(gregex_c)		\
 	gscanner.c		\
+	gscripttable.h		\
+	gsequence.c		\
 	gshell.c		\
+	gslice.c		\
 	gslist.c		\
+	gstdio.c		\
 	gstrfuncs.c		\
 	gstring.c		\
+	gtestutils.c		\
 	gthread.c       	\
+	gthreadprivate.h	\
 	gthreadpool.c   	\
 	gtimer.c		\
 	gtree.c			\
@@ -84,11 +157,18 @@ libglib_1_3_la_SOURCES = 	\
 	gunibreak.h		\
 	gunibreak.c		\
 	gunichartables.h	\
+	gunicollate.c		\
+	gunicomp.h		\
 	gunidecomp.h		\
 	gunidecomp.c		\
-	gutils.c
-
-EXTRA_libglib_1_3_la_SOURCES = \
+	gunicodeprivate.h	\
+	gurifuncs.c 		\
+	gutils.c		\
+	gdebug.h		\
+	gprintf.c		\
+	gprintfint.h
+
+EXTRA_libglib_2_0_la_SOURCES = \
 	giounix.c	\
 	giowin32.c	\
 	gspawn.c	\
@@ -97,41 +177,61 @@ EXTRA_libglib_1_3_la_SOURCES = \
 
 glibincludedir=$(includedir)/glib-2.0
 glibinclude_HEADERS =   \
+	glib-object.h	\
+	glib.h
+
+glibsubincludedir=$(includedir)/glib-2.0/glib
+glibsubinclude_HEADERS =   \
 	galloca.h	\
 	garray.h	\
 	gasyncqueue.h	\
+	gatomic.h	\
 	gbacktrace.h	\
+	gbase64.h	\
+	gbookmarkfile.h \
 	gcache.h	\
+	gchecksum.h	\
 	gcompletion.h	\
 	gconvert.h	\
 	gdataset.h	\
 	gdate.h		\
+	gdir.h		\
 	gerror.h	\
 	gfileutils.h	\
 	ghash.h		\
 	ghook.h		\
+	ghostutils.h	\
+	gi18n.h		\
+	gi18n-lib.h	\
 	giochannel.h	\
-	glib.h 		\
-	glib-object.h	\
+	gkeyfile.h 	\
 	glist.h		\
 	gmacros.h	\
 	gmain.h		\
+	gmappedfile.h	\
 	gmarkup.h	\
 	gmem.h		\
 	gmessages.h	\
 	gnode.h		\
+	goption.h	\
 	gpattern.h	\
+	gpoll.h		\
 	gprimes.h	\
 	gqsort.h	\
 	gquark.h	\
 	gqueue.h	\
 	grand.h		\
+	$(gregex_h)	\
 	grel.h		\
 	gscanner.h	\
+	gsequence.h	\
 	gshell.h	\
+	gslice.h	\
 	gslist.h	\
 	gspawn.h	\
+	gstdio.h	\
 	gstrfuncs.h	\
+	gtestutils.h	\
 	gstring.h	\
 	gthread.h	\
 	gthreadpool.h	\
@@ -139,105 +239,128 @@ glibinclude_HEADERS =   \
 	gtree.h		\
 	gtypes.h	\
 	gunicode.h	\
+	gurifuncs.h 		\
 	gutils.h	\
-	gwin32.h
+	gwin32.h	\
+	gprintf.h
 
-configexecincludedir = $(libdir)/glib-2.0/include
-#configexecinclude_DATA = glibconfig.h
+install-data-local: install-ms-lib install-def-file
+	@if test -f $(glibincludedir)/glist.h ; then					\
+	  echo "*** Old headers found in $(glibincludedir). You should remove the" ;	\
+	  echo "*** contents of this directory and type 'make install' again." ;	\
+	  false ;									\
+        fi
 
-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: uninstall-ms-lib uninstall-def-file
 
-CONFIGURE_DEPENDENCIES = acglib.m4
+if PLATFORM_WIN32
+no_undefined = -no-undefined
+endif
 
-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
+if OS_WIN32_AND_DLL_COMPILATION
+export_symbols = -export-symbols glib.def
 
-libglib_1_3_la_LIBADD = @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@
-libglib_1_3_la_DEPENDENCIES = @GIO@ @GSPAWN@ @PLATFORMDEP@ 
+glib_win32_res = glib-win32-res.o
+glib_win32_res_ldflag = -Wl,$(glib_win32_res)
 
+glib_def = glib.def
 
-if PLATFORM_WIN32
-no_undefined = -no-undefined
+install-def-file:
+	$(INSTALL) glib.def $(DESTDIR)$(libdir)/glib-2.0.def
+
+uninstall-def-file:
+	-rm $(DESTDIR)$(libdir)/glib-2.0.def
+else
+install-def-file:
+uninstall-def-file:
+
+export_symbols = $(LIBTOOL_EXPORT_OPTIONS)
 endif
-if OS_WIN32
-# This requires a very new libtool
-export_symbols = -export-symbols glib.def
+
+if ENABLE_REGEX
+if USE_SYSTEM_PCRE
+pcre_lib = $(PCRE_LIBS)
+pcre_inc = $(PCRE_CFLAGS)
+else
+pcre_lib = pcre/libpcre.la
+pcre_inc =
 endif
+else
+pcre_lib =
+pcre_inc =
+endif
+
+libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib)
+libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ $(glib_win32_res) $(glib_def)
 
-libglib_1_3_la_LDFLAGS = \
+libglib_2_0_la_LDFLAGS = \
+	 $(glib_win32_res_ldflag) \
 	-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
+INSTALL_PROGS=
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = glib-2.0.pc gobject-2.0.pc gmodule-2.0.pc gthread-2.0.pc
+gspawn-win32-helper-console.c:
+	echo '#define HELPER_CONSOLE' >$@
+	echo '#include "gspawn-win32-helper.c"' >>$@
 
-glibconfig.h.win32: $(top_builddir)/config.status $(top_srcdir)/glibconfig.h.win32.in
-	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+gspawn-win64-helper.c:
+	echo '#include "gspawn-win32-helper.c"' >$@
 
-config.h.win32: $(top_builddir)/config.status $(top_srcdir)/config.h.win32.in
-	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+gspawn-win64-helper-console.c:
+	echo '#define HELPER_CONSOLE' >$@
+	echo '#include "gspawn-win32-helper.c"' >>$@
 
-makefile.msc: $(top_builddir)/config.status $(top_srcdir)/makefile.msc.in
-	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+if OS_WIN32
+if OS_WIN32_X64
+INSTALL_PROGS += gspawn-win64-helper gspawn-win64-helper-console
+gspawn_win64_helper_LDADD = libglib-2.0.la
+gspawn_win64_helper_LDFLAGS = -mwindows
+gspawn_win64_helper_console_LDADD = libglib-2.0.la
+else
+INSTALL_PROGS += gspawn-win32-helper gspawn-win32-helper-console
+gspawn_win32_helper_LDADD = libglib-2.0.la
+gspawn_win32_helper_LDFLAGS = -mwindows
+gspawn_win32_helper_console_LDADD = libglib-2.0.la
+endif
+endif
 
-makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/makefile.mingw.in
-	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+glib-win32-res.o: glib.rc
+	$(WINDRES) glib.rc $@
 
-glib.rc: $(top_builddir)/config.status $(top_srcdir)/glib.rc.in
-	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+bin_PROGRAMS	 = ${INSTALL_PROGS}
 
-bin_SCRIPTS=glib-config-2.0
-BUILT_SOURCES=glib-config-2.0
-glib-config-2.0: glib-config-2.0.in
+if OS_UNIX
 
-.PHONY: files release sanity snapshot
+INSTALL_PROGS	+= gtester
+gtester_SOURCES	 = gtester.c
+gtester_LDADD	 = libglib-2.0.la 
 
-files:
-	@files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
-	  echo $$p; \
-	done
+auto_config_binscripts = gtester-report
+bin_SCRIPTS = ${auto_config_binscripts}
+EXTRA_DIST += ${auto_config_binscripts}
 
-release:
-	rm -rf .deps */.deps
-	cd docs && make glib.html
-	$(MAKE) distcheck
+CONFIGVARS = \
+        "bindir"    	: "${bindir}",		\
+        "glib-version"  : "${GLIB_VERSION}"
 
-sanity:
-	./sanity_check $(VERSION)
+install-exec-hook:
+	for sf in ${auto_config_binscripts} ; do \
+	  mv -f "$(DESTDIR)$(bindir)/$$sf" "$(DESTDIR)$(bindir)/$$sf".tmp \
+	  && sed < "$(DESTDIR)$(bindir)/$$sf".tmp > "$(DESTDIR)$(bindir)/$$sf" \
+	    -e '1,24s|^ *#@PKGINSTALL_CONFIGVARS_IN24LINES@|  ${CONFIGVARS}|' \
+	    -e '1,1s|#! /usr/bin/env python\([0-9]\+\(\.[0-9]\+\)\?\)\?|#!${PYTHON}|' \
+	  || exit $$? ; \
+	  rm -f "$(DESTDIR)$(bindir)/$$sf".tmp ; \
+	done
 
-snapshot:
-	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
+endif
 
-snapcheck:
-	$(MAKE) distcheck distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
+glib-2.0.lib: libglib-2.0.la glib.def
+	lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libglib-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:glib.def -out:$@
 
 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
+	  cp $$d/$$f $(distdir) || exit 1; done