[kdbus] sync with kdbus (kdbus.h - commit: 5ae1ecac44cb)

[platform/upstream/glib.git] / glib / Makefile.am

diff --git a/glib/Makefile.am b/glib/Makefile.am
index 12463fa..0b7c8d8 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -55,9 +55,7 @@ MIRRORING_TAB_SOURCE =                                \
 EXTRA_DIST +=                  \
        makefile.msc.in         \
        glib.rc.in              \
-       gen-iswide-table.py     \
        gen-unicode-tables.pl   \
-       gen-script-table.pl     \
        glibconfig.h.win32.in   \
        gregex.c                \
        gregex.h                \
@@ -136,6 +134,7 @@ libglib_2_0_la_SOURCES =    \
        glib_trace.h            \
        glib-init.h             \
        glib-init.c             \
+       glib-linux.h            \
        glib-private.h          \
        glib-private.c          \
        glist.c                 \
@@ -145,7 +144,6 @@ libglib_2_0_la_SOURCES =    \
        gmarkup.c               \
        gmem.c                  \
        gmessages.c             \
-       gmessages-private.h     \
        gmirroringtable.h       \
        gnode.c                 \
        goption.c               \
@@ -161,6 +159,7 @@ libglib_2_0_la_SOURCES =    \
        gscripttable.h          \
        gsequence.c             \
        gshell.c                \
+       gsiphash.c              \
        gslice.c                \
        gslist.c                \
        gstdio.c                \
@@ -173,6 +172,8 @@ libglib_2_0_la_SOURCES =    \
        gthreadpool.c           \
        gtimer.c                \
        gtimezone.c             \
+       gtranslit.c             \
+       gtranslit-data.h        \
        gtrashstack.c           \
        gtree.c                 \
        guniprop.c              \
@@ -195,6 +196,8 @@ libglib_2_0_la_SOURCES =    \
        gvariant-parser.c       \
        gvariant-serialiser.h   \
        gvariant-serialiser.c   \
+       gvariant-vectors.h      \
+       gvariant-vectors.c      \
        gvarianttypeinfo.h      \
        gvarianttypeinfo.c      \
        gvarianttype.c          \
@@ -289,6 +292,7 @@ glibsubinclude_HEADERS = \
        gscanner.h      \
        gsequence.h     \
        gshell.h        \
+       gsiphash.h      \
        gslice.h        \
        gslist.h        \
        gspawn.h        \
@@ -360,14 +364,19 @@ libglib_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
 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
-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
-libglib_2_0_la_LIBADD += glib_probes.o
+libglib_2_0_la_LIBADD += glib_probes.lo
 endif
 
 if ENABLE_SYSTEMTAP
@@ -435,8 +444,11 @@ install-exec-hook:
 
 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
-       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)'; \