projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GVariant: add GVariantVectors utility struct
[platform/upstream/glib.git]
/
glib
/
Makefile.am
diff --git
a/glib/Makefile.am
b/glib/Makefile.am
index
0744a6c
..
2c4b878
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) \
@@
-62,9
+55,7
@@
MIRRORING_TAB_SOURCE = \
EXTRA_DIST += \
makefile.msc.in \
glib.rc.in \
EXTRA_DIST += \
makefile.msc.in \
glib.rc.in \
- gen-iswide-table.py \
gen-unicode-tables.pl \
gen-unicode-tables.pl \
- gen-script-table.pl \
glibconfig.h.win32.in \
gregex.c \
gregex.h \
glibconfig.h.win32.in \
gregex.c \
gregex.h \
@@
-77,7
+68,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
@@
-86,7
+77,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
@@
-152,7
+143,6
@@
libglib_2_0_la_SOURCES = \
gmarkup.c \
gmem.c \
gmessages.c \
gmarkup.c \
gmem.c \
gmessages.c \
- gmessages-private.h \
gmirroringtable.h \
gnode.c \
goption.c \
gmirroringtable.h \
gnode.c \
goption.c \
@@
-180,6
+170,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 \
@@
-202,6
+194,8
@@
libglib_2_0_la_SOURCES = \
gvariant-parser.c \
gvariant-serialiser.h \
gvariant-serialiser.c \
gvariant-parser.c \
gvariant-serialiser.h \
gvariant-serialiser.c \
+ gvariant-vectors.h \
+ gvariant-vectors.c \
gvarianttypeinfo.h \
gvarianttypeinfo.c \
gvarianttype.c \
gvarianttypeinfo.h \
gvarianttypeinfo.c \
gvarianttype.c \
@@
-367,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
@@
-442,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)'; \