X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=glib%2FMakefile.am;h=8c0c24d15719870bf2dd47b1a8c33d1c7cc2d364;hb=7a9987d35d568707df2c7c12e851623b46e9e63d;hp=d183ed5c1d3e89ec9fb6ef09b46ca44fa750c970;hpb=4c633ff0b58db039a29801d5039cc2756db90bbb;p=platform%2Fupstream%2Fglib.git
diff --git a/glib/Makefile.am b/glib/Makefile.am
index d183ed5..8c0c24d 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
@@ -24,7 +47,7 @@ SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests
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 +56,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 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,11 +76,11 @@ 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 \
@@ -76,9 +91,8 @@ EXTRA_DIST += \
# 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
@@ -97,32 +111,52 @@ install-ms-lib:
uninstall-ms-lib:
$(uninstall_ms_lib_cmd)
+deprecated_sources = \
+ deprecated/gallocator.c \
+ deprecated/gcache.c \
+ deprecated/gcompletion.c \
+ deprecated/grel.c \
+ deprecated/gthread-deprecated.c
+
libglib_2_0_la_SOURCES = \
+ $(deprecated_sources) \
+ glib_probes.d \
garray.c \
gasyncqueue.c \
+ gasyncqueueprivate.h \
gatomic.c \
gbacktrace.c \
gbase64.c \
+ gbitlock.c \
gbookmarkfile.c \
gbsearcharray.h \
- gcache.c \
+ gbuffer.c \
+ gbufferprivate.h \
gchecksum.c \
- gcompletion.c \
gconvert.c \
gdataset.c \
gdatasetprivate.h \
- gdate.c \
+ gdate.c \
+ gdatetime.c \
gdir.c \
+ genviron.c \
gerror.c \
gfileutils.c \
ghash.c \
+ ghmac.c \
ghook.c \
ghostutils.c \
giochannel.c \
- gkeyfile.c \
+ gkeyfile.c \
glibintl.h \
+ glib_trace.h \
+ glib-init.h \
+ glib-init.c \
+ glib-private.h \
+ glib-private.c \
glist.c \
- gmain.c \
+ gmain-internal.h \
+ gmain.c \
gmappedfile.c \
gmarkup.c \
gmem.c \
@@ -135,7 +169,6 @@ libglib_2_0_la_SOURCES = \
gprimes.c \
gqsort.c \
gqueue.c \
- grel.c \
grand.c \
$(gregex_c) \
gscanner.c \
@@ -147,11 +180,13 @@ libglib_2_0_la_SOURCES = \
gstdio.c \
gstrfuncs.c \
gstring.c \
+ gstringchunk.c \
gtestutils.c \
- gthread.c \
+ gthread.c \
gthreadprivate.h \
- gthreadpool.c \
+ gthreadpool.c \
gtimer.c \
+ gtimezone.c \
gtree.c \
guniprop.c \
gutf8.c \
@@ -165,10 +200,32 @@ libglib_2_0_la_SOURCES = \
gunicodeprivate.h \
gurifuncs.c \
gutils.c \
- gdebug.h \
+ 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 \
+ gwakeup.h \
+ gwakeup.c \
gprintf.c \
gprintfint.h
+if OS_UNIX
+libglib_2_0_la_SOURCES += glib-unix.c
+endif
+
+if OS_WIN32
+libglib_2_0_la_SOURCES += gthread-win32.c
+else
+libglib_2_0_la_SOURCES += gthread-posix.c
+endif
+
EXTRA_libglib_2_0_la_SOURCES = \
giounix.c \
giowin32.c \
@@ -178,9 +235,18 @@ EXTRA_libglib_2_0_la_SOURCES = \
glibincludedir=$(includedir)/glib-2.0
glibinclude_HEADERS = \
+ glib-unix.h \
glib-object.h \
glib.h
+deprecatedincludedir=$(includedir)/glib-2.0/glib/deprecated
+deprecatedinclude_HEADERS = \
+ deprecated/gallocator.h \
+ deprecated/gcache.h \
+ deprecated/gcompletion.h \
+ deprecated/grel.h \
+ deprecated/gthread.h
+
glibsubincludedir=$(includedir)/glib-2.0/glib
glibsubinclude_HEADERS = \
galloca.h \
@@ -189,17 +255,19 @@ 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 \
+ genviron.h \
gerror.h \
gfileutils.h \
ghash.h \
+ ghmac.h \
ghook.h \
ghostutils.h \
gi18n.h \
@@ -223,7 +291,6 @@ glibsubinclude_HEADERS = \
gqueue.h \
grand.h \
$(gregex_h) \
- grel.h \
gscanner.h \
gsequence.h \
gshell.h \
@@ -234,23 +301,35 @@ glibsubinclude_HEADERS = \
gstrfuncs.h \
gtestutils.h \
gstring.h \
+ gstringchunk.h \
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
+# This is read by gobject-introspection/misc/ and gtk-doc
+glib-public-headers.txt: Makefile
+ echo $(glibinclude_HEADERS) $(glibsubinclude_HEADERS) > $@.tmp && mv $@.tmp $@
+
+CLEANFILES += glib-public-headers.txt
+
+all-local: glib-public-headers.txt
+
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
+ fi
uninstall-local: uninstall-ms-lib uninstall-def-file
@@ -291,16 +370,34 @@ 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_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib) $(GLIB_RT_LIBS) $(G_THREAD_LIBS_EXTRA) $(G_THREAD_LIBS_FOR_GTHREAD)
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"' >>$@
@@ -312,6 +409,7 @@ 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
@@ -342,8 +440,8 @@ bin_SCRIPTS = ${auto_config_binscripts}
EXTRA_DIST += ${auto_config_binscripts}
CONFIGVARS = \
- "bindir" : "${bindir}", \
- "glib-version" : "${GLIB_VERSION}"
+ "bindir" : "${bindir}", \
+ "glib-version" : "${GLIB_VERSION}"
install-exec-hook:
for sf in ${auto_config_binscripts} ; do \
@@ -352,6 +450,7 @@ install-exec-hook:
-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
@@ -360,12 +459,48 @@ endif
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)
+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 `echo $(libglib_2_0_la_SOURCES) | tr '/' '\\'`; do \
+ case $$F in \
+ *-unix.c|gthread-*.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 `echo $(libglib_2_0_la_SOURCES) | tr '/' '\\'`; do \
+ case $$F in \
+ *-unix.c|gthread-*.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 `echo $(libglib_2_0_la_SOURCES) | tr '/' '\\'`; do \
+ case $$F in \
+ *-unix.c|gthread-*.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; \
@@ -376,16 +511,16 @@ gdbdir = $(datadir)/glib-2.0/gdb
dist_gdb_SCRIPTS = glib.py
libglib-gdb.py: libglib-gdb.py.in
- sed -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > libglib-gdb.py
+ $(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${libdir}
- $(INSTALL) libglib-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load${libdir}/libglib-2.0.so.0.$(LT_CURRENT).0-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).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).0 $(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