Merge 2.52.3 into tizen

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

diff --git a/gio/Makefile.am b/gio/Makefile.am
index f07c94a..deda902 100644 (file)
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -28,7 +28,7 @@ AM_CPPFLAGS = \
        $(gmodule_INCLUDES)                             \
        $(GLIB_DEBUG_FLAGS)                             \
        -DGIO_COMPILATION                               \
-       -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"  
+       -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"
 
 AM_CFLAGS = $(GLIB_WARN_CFLAGS)
 
@@ -226,6 +226,10 @@ appinfo_sources =
 appinfo_headers =
 contenttype_sources =
 
+if LIBDBUSPOLICY
+platform_libadd += $(LIBDBUSPOLICY1_LIBS)
+endif
+
 if HAVE_INOTIFY
 SUBDIRS += inotify
 platform_libadd += inotify/libinotify.la
@@ -261,6 +265,10 @@ endif
 
 unix_sources = \
        gfiledescriptorbased.c  \
+       gkdbus.c                \
+       gkdbus.h                \
+       gkdbusfakedaemon.c      \
+       gkdbusfakedaemon.h      \
        gunixconnection.c       \
        gunixcredentialsmessage.c       \
        gunixfdlist.c           \
@@ -618,6 +626,10 @@ libgio_2_0_la_CFLAGS += $(LIBMOUNT_CFLAGS)
 libgio_2_0_la_LIBADD += $(LIBMOUNT_LIBS)
 endif
 
+if LIBDBUSPOLICY
+libgio_2_0_la_CPPFLAGS += $(LIBDBUSPOLICY1_CFLAGS)
+endif
+
 libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)
 
 gio-win32-res.o: gio.rc
@@ -729,6 +741,7 @@ gio_headers =                       \
        gzlibdecompressor.h     \
        glistmodel.h            \
        gliststore.h            \
+       tizen_header_glib.h     \
        $(application_headers)  \
        $(settings_headers)     \
        $(gdbus_headers)        \
@@ -801,6 +814,7 @@ glib_compile_resources_LDADD = libgio-2.0.la                \
        $(top_builddir)/gmodule/libgmodule-2.0.la       \
        $(top_builddir)/glib/libglib-2.0.la             \
        $(NULL)
+glib_compile_resources_LDFLAGS = -pie
 
 glib_compile_resources_SOURCES = \
        gvdb/gvdb-format.h              \
@@ -814,11 +828,13 @@ gio_querymodules_LDADD     = libgio-2.0.la                \
        $(top_builddir)/gmodule/libgmodule-2.0.la       \
        $(top_builddir)/glib/libglib-2.0.la             \
        $(NULL)
+gio_querymodules_LDFLAGS        = -pie
 
 gconstructor_as_data.h: $(top_srcdir)/glib/gconstructor.h data-to-c.pl
        $(AM_V_GEN) $(srcdir)/data-to-c.pl $(top_srcdir)/glib/gconstructor.h gconstructor_code > $@.tmp && mv $@.tmp $@
 
 glib_compile_schemas_LDADD = $(top_builddir)/glib/libglib-2.0.la
+glib_compile_schemas_LDFLAGS = -pie
 glib_compile_schemas_SOURCES = \
        gconstructor_as_data.h \
        gvdb/gvdb-format.h              \
@@ -831,6 +847,7 @@ gsettings_LDADD = libgio-2.0.la                     \
        $(top_builddir)/gmodule/libgmodule-2.0.la       \
        $(top_builddir)/glib/libglib-2.0.la             \
        $(NULL)
+gsettings_LDFLAGS = -pie
 gsettings_SOURCES = gsettings-tool.c
 
 schemadir = $(datadir)/glib-2.0/schemas
@@ -883,6 +900,7 @@ gdbus_LDADD = libgio-2.0.la                                 \
        $(top_builddir)/gmodule/libgmodule-2.0.la       \
        $(top_builddir)/glib/libglib-2.0.la             \
        $(NULL)
+gdbus_LDFLAGS = -pie
 
 if OS_UNIX
 if !OS_COCOA
@@ -895,6 +913,7 @@ gapplication_LDADD = libgio-2.0.la                  \
        $(top_builddir)/gmodule/libgmodule-2.0.la       \
        $(top_builddir)/glib/libglib-2.0.la             \
        $(NULL)
+gapplication_LDFLAGS = -pie
 endif
 endif
 
@@ -917,6 +936,7 @@ gresource_LDADD = libgio-2.0.la                             \
        $(top_builddir)/gmodule/libgmodule-2.0.la       \
        $(top_builddir)/glib/libglib-2.0.la             \
        $(LIBELF_LIBS)
+gresource_LDFLAGS = -pie
 
 # ------------------------------------------------------------------------
 # gio tool
@@ -946,6 +966,7 @@ gio_LDADD = libgio-2.0.la                           \
        $(top_builddir)/gobject/libgobject-2.0.la       \
        $(top_builddir)/glib/libglib-2.0.la             \
        $(NULL)
+gio_LDFLAGS = -pie
 
 # ------------------------------------------------------------------------
 # ------ MSVC Project File Generation ------