X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=glib%2FMakefile.am;h=d0da7b21a9939fa4b2cc6c82be8a76d91bfba730;hb=2fb57ff46f32316e991ab9f99daa5fce4885f097;hp=72472c46f753aafa606a78469f8dc7318057b5d0;hpb=e3607fcdf39a487eec9ec8cb64eef49b729fa0d1;p=platform%2Fupstream%2Fglib.git diff --git a/glib/Makefile.am b/glib/Makefile.am index 72472c4..d0da7b2 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -1,6 +1,29 @@ ## Process this file with automake to produce Makefile.in include $(top_srcdir)/Makefile.decl +BUILT_SOURCES = +DISTCLEANFILES = +CLEANFILES = + +# +# Generate glibconfig.h +# +# The timestamp of the stamp file is used to indicate if glibconfig.h is +# up to date with respect to config.status. In the usual case, changes +# to config.status will not result in changes to glibconfig.h so we +# avoid touching its timestamp (in order not to rebuild the whole tree). +# +DISTCLEANFILES += glibconfig-stamp glibconfig.h +BUILT_SOURCES += glibconfig-stamp +configexecincludedir = $(libdir)/glib-2.0/include +nodist_configexecinclude_HEADERS = glibconfig.h +glibconfig-stamp: ../config.status + $(AM_V_GEN) cd $(top_builddir) && \ + $(SHELL) ./config.status glib/glibconfig.h + @touch glibconfig-stamp + + + if HAVE_GOOD_PRINTF else PRINTF_SUBDIR = gnulib @@ -19,12 +42,18 @@ gregex_c = gregex_h = endif +if HAVE_GCC_BUILTINS_FOR_ATOMIC_OPERATIONS +gatomic_c = gatomic-gcc.c +else +gatomic_c = gatomic.c +endif + SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests -DIST_SUBDIRS = libcharset gnulib pcre update-pcre +DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests AM_CPPFLAGS = \ - -I$(top_srcdir) \ + $(glib_INCLUDES) \ $(pcre_inc) \ -DG_LOG_DOMAIN=\"GLib\" \ $(GLIB_DEBUG_FLAGS) \ @@ -33,23 +62,15 @@ AM_CPPFLAGS = \ -DPCRE_STATIC 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 - -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 + $(AM_V_GEN) (echo -e EXPORTS; $(CPP) -P -DG_OS_WIN32 - <$(srcdir)/glib.symbols | sed -e '/^$$/d' -e 's/^/ /') > glib.def if OS_LINUX if HAVE_GNUC_VISIBILITY TESTS_ENVIRONMENT = GLIB_DEBUG_FLAGS="$(GLIB_DEBUG_FLAGS)" -TESTS = abicheck.sh pltcheck.sh +TESTS = abicheck.sh endif endif -BUILT_SOURCES = galias.h galiasdef.c - MIRRORING_TAB_SOURCE = \ glib-mirroring-tab/Makefile \ glib-mirroring-tab/gen-mirroring-tab.c \ @@ -61,63 +82,74 @@ MIRRORING_TAB_SOURCE = \ EXTRA_DIST += \ makefile.msc.in \ glib.rc.in \ + gen-iswide-table.py \ gen-unicode-tables.pl \ gen-script-table.pl \ - makegalias.pl \ + glibconfig.h.win32.in \ abicheck.sh \ - pltcheck.sh \ glib.symbols \ gregex.c \ gregex.h \ win_iconv.c \ + libglib-gdb.py.in \ $(MIRRORING_TAB_SOURCE) # These may be in the builddir too BUILT_EXTRA_DIST = \ makefile.msc \ - glib.rc \ - galias.h \ - galiasdef.c + glibconfig.h.win32 \ + glib.rc lib_LTLIBRARIES = libglib-2.0.la +if OS_WIN32_AND_DLL_COMPILATION if MS_LIB_AVAILABLE noinst_DATA = glib-2.0.lib -install-ms-lib: - $(INSTALL) glib-2.0.lib $(DESTDIR)$(libdir) +install_ms_lib_cmd = $(INSTALL) glib-2.0.lib $(DESTDIR)$(libdir) +uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/glib-2.0.lib +endif +endif -uninstall-ms-lib: - -rm $(DESTDIR)$(libdir)/glib-2.0.lib -else install-ms-lib: + $(install_ms_lib_cmd) + uninstall-ms-lib: -endif + $(uninstall_ms_lib_cmd) libglib_2_0_la_SOURCES = \ + glib_probes.d \ garray.c \ gasyncqueue.c \ - gatomic.c \ + $(gatomic_c) \ gbacktrace.c \ gbase64.c \ + gbitlock.c \ gbookmarkfile.c \ gbsearcharray.h \ + gbuffer.c \ + gbuffer.h \ gcache.c \ + gchecksum.c \ gcompletion.c \ gconvert.c \ gdataset.c \ gdatasetprivate.h \ - gdate.c \ + gdate.c \ + gdatetime.c \ gdir.c \ gerror.c \ gfileutils.c \ ghash.c \ ghook.c \ + ghostutils.c \ giochannel.c \ - gkeyfile.c \ + gkeyfile.c \ glibintl.h \ + glib_trace.h \ glist.c \ - gmain.c \ + gmain-internal.h \ + gmain.c \ gmappedfile.c \ gmarkup.c \ gmem.c \ @@ -126,6 +158,7 @@ libglib_2_0_la_SOURCES = \ gnode.c \ goption.c \ gpattern.c \ + gpoll.c \ gprimes.c \ gqsort.c \ gqueue.c \ @@ -146,6 +179,7 @@ libglib_2_0_la_SOURCES = \ gthreadprivate.h \ gthreadpool.c \ gtimer.c \ + gtimezone.c \ gtree.c \ guniprop.c \ gutf8.c \ @@ -159,10 +193,25 @@ libglib_2_0_la_SOURCES = \ gunicodeprivate.h \ gurifuncs.c \ gutils.c \ + gvariant.h \ + gvariant.c \ + gvariant-core.h \ + gvariant-core.c \ + gvariant-internal.h \ + gvariant-parser.c \ + gvariant-serialiser.h \ + gvariant-serialiser.c \ + gvarianttypeinfo.h \ + gvarianttypeinfo.c \ + gvarianttype.c \ gdebug.h \ gprintf.c \ gprintfint.h +if OS_UNIX +libglib_2_0_la_SOURCES += glib-unix.c +endif + EXTRA_libglib_2_0_la_SOURCES = \ giounix.c \ giowin32.c \ @@ -175,6 +224,10 @@ glibinclude_HEADERS = \ glib-object.h \ glib.h +if OS_UNIX +glibinclude_HEADERS += glib-unix.h +endif + glibsubincludedir=$(includedir)/glib-2.0/glib glibsubinclude_HEADERS = \ galloca.h \ @@ -183,17 +236,21 @@ glibsubinclude_HEADERS = \ gatomic.h \ gbacktrace.h \ gbase64.h \ + gbitlock.h \ gbookmarkfile.h \ gcache.h \ + gchecksum.h \ gcompletion.h \ gconvert.h \ gdataset.h \ gdate.h \ + gdatetime.h \ gdir.h \ gerror.h \ gfileutils.h \ ghash.h \ ghook.h \ + ghostutils.h \ gi18n.h \ gi18n-lib.h \ giochannel.h \ @@ -208,6 +265,7 @@ glibsubinclude_HEADERS = \ gnode.h \ goption.h \ gpattern.h \ + gpoll.h \ gprimes.h \ gqsort.h \ gquark.h \ @@ -228,11 +286,14 @@ glibsubinclude_HEADERS = \ gthread.h \ gthreadpool.h \ gtimer.h \ + gtimezone.h \ gtree.h \ gtypes.h \ gunicode.h \ - gurifuncs.h \ + gurifuncs.h \ gutils.h \ + gvarianttype.h \ + gvariant.h \ gwin32.h \ gprintf.h @@ -241,7 +302,7 @@ install-data-local: install-ms-lib install-def-file echo "*** Old headers found in $(glibincludedir). You should remove the" ; \ echo "*** contents of this directory and type 'make install' again." ; \ false ; \ - fi + fi uninstall-local: uninstall-ms-lib uninstall-def-file @@ -249,10 +310,14 @@ if PLATFORM_WIN32 no_undefined = -no-undefined endif -if OS_WIN32 -# This requires a very new libtool +if OS_WIN32_AND_DLL_COMPILATION export_symbols = -export-symbols glib.def +glib_win32_res = glib-win32-res.o +glib_win32_res_ldflag = -Wl,$(glib_win32_res) + +glib_def = glib.def + install-def-file: $(INSTALL) glib.def $(DESTDIR)$(libdir)/glib-2.0.def @@ -265,11 +330,6 @@ uninstall-def-file: export_symbols = $(LIBTOOL_EXPORT_OPTIONS) endif -if OS_WIN32 -glib_win32_res = glib-win32-res.o -glib_win32_res_ldflag = -Wl,$(glib_win32_res) -endif - if ENABLE_REGEX if USE_SYSTEM_PCRE pcre_lib = $(PCRE_LIBS) @@ -283,27 +343,62 @@ 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_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib) $(GLIB_RT_LIBS) +libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ $(glib_win32_res) $(glib_def) -libglib_2_0_la_LDFLAGS = \ +libglib_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \ $(glib_win32_res_ldflag) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -export-dynamic $(no_undefined) $(export_symbols) INSTALL_PROGS= +if ENABLE_DTRACE +glib_probes.h: glib_probes.d Makefile + $(AM_V_GEN) $(DTRACE) -C -h -s $< -o $@.tmp + @$(SED) -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," < $@.tmp > $@ && rm -f $@.tmp +glib_probes.o: glib_probes.d Makefile + $(AM_V_GEN) $(DTRACE) -G -s $< -o $@ +BUILT_SOURCES += glib_probes.h glib_probes.o +CLEANFILES += glib_probes.h glib_probes.h.tmp +libglib_2_0_la_LIBADD += glib_probes.o +endif + +if ENABLE_SYSTEMTAP +tapset_in_files = glib.stp.in +tapsetdir = @ABS_TAPSET_DIR@ +tapset_DATA = $(tapset_in_files:.stp.in=.stp) +EXTRA_DIST += $(tapset_in_files) +endif + +gspawn-win32-helper-console.c: + echo '#define HELPER_CONSOLE' >$@ + echo '#include "gspawn-win32-helper.c"' >>$@ + +gspawn-win64-helper.c: + echo '#include "gspawn-win32-helper.c"' >$@ + +gspawn-win64-helper-console.c: + echo '#define HELPER_CONSOLE' >$@ + echo '#include "gspawn-win32-helper.c"' >>$@ + + 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 -gspawn-win32-helper-console.c: - echo '#include "gspawn-win32-helper.c"' >$@ +endif +endif glib-win32-res.o: glib.rc $(WINDRES) glib.rc $@ -endif bin_PROGRAMS = ${INSTALL_PROGS} @@ -311,15 +406,94 @@ if OS_UNIX INSTALL_PROGS += gtester gtester_SOURCES = gtester.c -gtester_LDADD = libglib-2.0.la +gtester_LDADD = libglib-2.0.la + +auto_config_binscripts = gtester-report +bin_SCRIPTS = ${auto_config_binscripts} +EXTRA_DIST += ${auto_config_binscripts} + +CONFIGVARS = \ + "bindir" : "${bindir}", \ + "glib-version" : "${GLIB_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 $$? ; \ + chmod a+x $(DESTDIR)$(bindir)/$$sf ; \ + rm -f "$(DESTDIR)$(bindir)/$$sf".tmp ; \ + done endif glib-2.0.lib: libglib-2.0.la glib.def - lib -name:libglib-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:glib.def -out:$@ + lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libglib-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:glib.def -out:$@ -dist-hook: $(BUILT_EXTRA_DIST) +dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/glib.vcproj ../build/win32/vs10/glib.vcxproj ../build/win32/vs10/glib.vcxproj.filters files='$(BUILT_EXTRA_DIST)'; \ for f in $$files; do \ if test -f $$f; then d=.; else d=$(srcdir); fi; \ cp $$d/$$f $(distdir) || exit 1; done + +../build/win32/vs9/glib.vcproj: $(top_srcdir)/build/win32/vs9/glib.vcprojin + for F in $(libglib_2_0_la_SOURCES); do \ + case $$F in \ + *-gcc.c|*-unix.c) \ + ;; \ + *.c) echo ' ' \ + ;; \ + esac; \ + done >libglib.sourcefiles + $(CPP) -P - <$(top_srcdir)/build/win32/vs9/glib.vcprojin >$@ + rm libglib.sourcefiles + +../build/win32/vs10/glib.vcxproj: $(top_srcdir)/build/win32/vs10/glib.vcxprojin + for F in $(libglib_2_0_la_SOURCES); do \ + case $$F in \ + *-gcc.c|*-unix.c) \ + ;; \ + *.c) echo ' ' \ + ;; \ + esac; \ + done >libglib.vs10.sourcefiles + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/glib.vcxprojin >$@ + rm libglib.vs10.sourcefiles + +../build/win32/vs10/glib.vcxproj.filters: $(top_srcdir)/build/win32/vs10/glib.vcxproj.filtersin + for F in $(libglib_2_0_la_SOURCES); do \ + case $$F in \ + *-gcc.c|*-unix.c) \ + ;; \ + *.c) echo ' Source Files' \ + ;; \ + esac; \ + done >libglib.vs10.sourcefiles.filters + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/glib.vcxproj.filtersin >$@ + rm libglib.vs10.sourcefiles.filters + +distclean-local: + if test $(srcdir) = .; then :; else \ + rm -f libglib-gdb.py; \ + fi + +# install gdb scripts +gdbdir = $(datadir)/glib-2.0/gdb +dist_gdb_SCRIPTS = glib.py + +libglib-gdb.py: libglib-gdb.py.in + $(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > libglib-gdb.py + + +install-data-hook: libglib-gdb.py + mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR) + $(INSTALL) libglib-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION)-gdb.py +if HAVE_GLIB_RUNTIME_LIBDIR + mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR) + mv $(DESTDIR)$(libdir)/libglib-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR) + mv $(DESTDIR)$(libdir)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR) + rm -f $(DESTDIR)$(libdir)/libglib-2.0.so + ln -s $(GLIB_RUNTIME_LIBDIR)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/libglib-2.0.so +endif