Merge 2.53.4 into tizen
authorAdrian Szyndela <adrian.s@samsung.com>
Fri, 17 Jan 2020 11:18:41 +0000 (12:18 +0100)
committerAdrian Szyndela <adrian.s@samsung.com>
Tue, 28 Jan 2020 12:15:53 +0000 (13:15 +0100)
Change-Id: I92c3ee01a88e92717ab46ca59f3323a6b6a895c6

13 files changed:
1  2 
NEWS
configure.ac
gio/Makefile.am
gio/gdbus-2.0/codegen/codegen.py
gio/gdbusconnection.c
gio/gdbusmessage.c
gio/gdbusnamewatching.c
gio/gdbusutils.c
gio/gfile.c
gio/tests/Makefile.am
glib/Makefile.am
glib/gvariant.c
gobject/Makefile.am

diff --cc NEWS
Simple merge
diff --cc configure.ac
Simple merge
diff --cc gio/Makefile.am
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc gio/gfile.c
Simple merge
Simple merge
Simple merge
diff --cc glib/gvariant.c
Simple merge
@@@ -198,17 -186,13 +186,14 @@@ libgobject_2_0_la_SOURCES = $(gobject_t
  #
  # programs to compile and install
  #
- bin_PROGRAMS = gobject-query glib-genmarshal
- bin_SCRIPTS = glib-mkenums
+ bin_PROGRAMS = gobject-query
+ bin_SCRIPTS = glib-mkenums glib-genmarshal
  # source files
  gobject_query_SOURCES = gobject-query.c
- glib_genmarshal_SOURCES = glib-genmarshal.c
  # link programs against libgobject
  progs_LDADD = ./libgobject-2.0.la $(libglib)
- glib_genmarshal_LDADD = $(libglib)
- glib_genmarshal_LDFLAGS = -pie
  gobject_query_LDADD = $(progs_LDADD)
 +gobject_query_LDFLAGS = -pie
  
  #
  # auxillary files