projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
glib/tests/mainloop: Acquire the context while asserting its state
[platform/upstream/glib.git]
/
glib
/
Makefile.am
diff --git
a/glib/Makefile.am
b/glib/Makefile.am
index
657978d
..
d9892f6
100644
(file)
--- a/
glib/Makefile.am
+++ b/
glib/Makefile.am
@@
-1,9
+1,5
@@
## Process this file with automake to produce Makefile.in
## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/Makefile.decl
-
-BUILT_SOURCES =
-DISTCLEANFILES =
-CLEANFILES =
+include $(top_srcdir)/glib.mk
#
# Generate glibconfig.h
#
# Generate glibconfig.h
@@
-35,11
+31,8
@@
else
MAYBE_PCRE = pcre
endif
MAYBE_PCRE = pcre
endif
-SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre .
+SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre .
tests
DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests
DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests
-if BUILD_MODULAR_TESTS
-SUBDIRS += tests
-endif
AM_CPPFLAGS = \
$(glib_INCLUDES) \
AM_CPPFLAGS = \
$(glib_INCLUDES) \
@@
-49,6
+42,8
@@
AM_CPPFLAGS = \
-DGLIB_COMPILATION \
-DPCRE_STATIC
-DGLIB_COMPILATION \
-DPCRE_STATIC
+AM_CFLAGS = $(GLIB_WARN_CFLAGS)
+
MIRRORING_TAB_SOURCE = \
glib-mirroring-tab/Makefile \
glib-mirroring-tab/gen-mirroring-tab.c \
MIRRORING_TAB_SOURCE = \
glib-mirroring-tab/Makefile \
glib-mirroring-tab/gen-mirroring-tab.c \
@@
-75,7
+70,7
@@
EXTRA_DIST += \
CLEANFILES += libglib-gdb.py
# These may be in the builddir too
CLEANFILES += libglib-gdb.py
# These may be in the builddir too
-BUILT_EXTRA_DIST
=
\
+BUILT_EXTRA_DIST
+=
\
makefile.msc \
glibconfig.h.win32 \
glib.rc
makefile.msc \
glibconfig.h.win32 \
glib.rc
@@
-84,7
+79,7
@@
lib_LTLIBRARIES = libglib-2.0.la
if OS_WIN32_AND_DLL_COMPILATION
if MS_LIB_AVAILABLE
if OS_WIN32_AND_DLL_COMPILATION
if MS_LIB_AVAILABLE
-noinst_DATA = glib-2.0.lib
+noinst_DATA
+
= glib-2.0.lib
install_ms_lib_cmd = $(INSTALL) glib-2.0.lib $(DESTDIR)$(libdir)
uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/glib-2.0.lib
install_ms_lib_cmd = $(INSTALL) glib-2.0.lib $(DESTDIR)$(libdir)
uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/glib-2.0.lib
@@
-177,6
+172,8
@@
libglib_2_0_la_SOURCES = \
gthreadpool.c \
gtimer.c \
gtimezone.c \
gthreadpool.c \
gtimer.c \
gtimezone.c \
+ gtranslit.c \
+ gtranslit-data.h \
gtrashstack.c \
gtree.c \
guniprop.c \
gtrashstack.c \
gtree.c \
guniprop.c \
@@
-206,17
+203,20
@@
libglib_2_0_la_SOURCES = \
gwakeup.h \
gwakeup.c \
gprintf.c \
gwakeup.h \
gwakeup.c \
gprintf.c \
- gprintfint.h
+ gprintfint.h \
+ valgrind.h
if OS_UNIX
libglib_2_0_la_SOURCES += glib-unix.c
endif
if OS_UNIX
libglib_2_0_la_SOURCES += glib-unix.c
endif
-if
O
S_WIN32
+if
THREAD
S_WIN32
libglib_2_0_la_SOURCES += gthread-win32.c
else
libglib_2_0_la_SOURCES += gthread-win32.c
else
+if THREADS_POSIX
libglib_2_0_la_SOURCES += gthread-posix.c
endif
libglib_2_0_la_SOURCES += gthread-posix.c
endif
+endif
EXTRA_libglib_2_0_la_SOURCES = \
giounix.c \
EXTRA_libglib_2_0_la_SOURCES = \
giounix.c \
@@
-361,14
+361,19
@@
libglib_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
INSTALL_PROGS=
if ENABLE_DTRACE
INSTALL_PROGS=
if ENABLE_DTRACE
-glib_probes.h: glib_probes.d Makefile
+DTCOMPILE = $(patsubst -W%,,$(LTCOMPILE))
+DTCFLAGS = $(patsubst -W%,,$(CFLAGS))
+
+glib_probes.h: glib_probes.d
$(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
$(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
+
+glib_probes.lo: glib_probes.d
+ $(AM_V_GEN) env CC="$(DTCOMPILE)" CFLAGS="$(DTCFLAGS)" $(DTRACE) -G -s $< -o $@
+
+BUILT_SOURCES += glib_probes.h glib_probes.lo
CLEANFILES += glib_probes.h glib_probes.h.tmp
CLEANFILES += glib_probes.h glib_probes.h.tmp
-libglib_2_0_la_LIBADD += glib_probes.o
+libglib_2_0_la_LIBADD += glib_probes.
l
o
endif
if ENABLE_SYSTEMTAP
endif
if ENABLE_SYSTEMTAP
@@
-428,7
+433,7
@@
install-exec-hook:
mv -f "$(DESTDIR)$(bindir)/$$sf" "$(DESTDIR)$(bindir)/$$sf".tmp \
&& sed < "$(DESTDIR)$(bindir)/$$sf".tmp > "$(DESTDIR)$(bindir)/$$sf" \
-e '1,24s|^ *#@PKGINSTALL_CONFIGVARS_IN24LINES@| ${CONFIGVARS}|' \
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}|' \
+ -e '1,1s|#! /usr/bin/env python
.*
|#!${PYTHON}|' \
|| exit $$? ; \
chmod a+x $(DESTDIR)$(bindir)/$$sf ; \
rm -f "$(DESTDIR)$(bindir)/$$sf".tmp ; \
|| exit $$? ; \
chmod a+x $(DESTDIR)$(bindir)/$$sf ; \
rm -f "$(DESTDIR)$(bindir)/$$sf".tmp ; \
@@
-436,8
+441,11
@@
install-exec-hook:
endif
endif
+glib.def: libglib-2.0.la
+ $(AM_V_GEN) dumpbin.exe -exports .libs/libglib-2.0-0.dll | awk 'BEGIN { print "EXPORTS" } / +[[:digit:]]+ +[[:xdigit:]]+ +[[:xdigit:]]+/{ print $$4 }' > glib.def.tmp && mv glib.def.tmp glib.def
+
glib-2.0.lib: libglib-2.0.la glib.def
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:$(builddir)/glib.def -out:$@
+
$(AM_V_GEN) lib.exe
-machine:@LIB_EXE_MACHINE_FLAG@ -name:libglib-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(builddir)/glib.def -out:$@
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)'; \
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)'; \