projects / platform / upstream / glib.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
[kdbus] Integrate kdbus core with new API.
[platform/upstream/glib.git] / gio / Makefile.am
diff --git a/gio/Makefile.am b/gio/Makefile.am
index 3661686..bc77dc1 100644 (file)
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -152,6 +152,7 @@ application_headers = \
        gmenu.h                         \
        gmenuexporter.h                 \
        gdbusmenumodel.h                \
+       gnotification.h                 \
        $(NULL)
 
 application_sources = \
@@ -175,6 +176,10 @@ application_sources = \
        gmenu.c                                 \
        gmenuexporter.c                         \
        gdbusmenumodel.c                        \
+       gnotification-private.h                 \
+       gnotificationbackend.h                  \
+       gnotification.c                         \
+       gnotificationbackend.c                  \
        $(NULL)
 
 local_sources = \
@@ -202,6 +207,8 @@ local_sources = \
        gsocks4aproxy.h                 \
        gsocks5proxy.c                  \
        gsocks5proxy.h                  \
+       thumbnail-verify.h              \
+       thumbnail-verify.c              \
        $(NULL)
 
 platform_libadd =
@@ -241,7 +248,7 @@ endif
 
 if OS_UNIX
 appinfo_sources += gdesktopappinfo.c
-platform_libadd += xdgmime/libxdgmime.la $(RESOLVER_LIBADD)
+platform_libadd += xdgmime/libxdgmime.la
 platform_deps += xdgmime/libxdgmime.la
 unix_sources = \
        gfiledescriptorbased.c  \
@@ -261,6 +268,8 @@ unix_sources = \
        gunixoutputstream.c     \
        gcontenttype.c          \
        gcontenttypeprivate.h   \
+       gfdonotificationbackend.c \
+       ggtknotificationbackend.c \
        $(NULL)
 
 
@@ -329,6 +338,7 @@ endif
 
 libgio_2_0_la_SOURCES =                \
        gappinfo.c              \
+       gappinfoprivate.h       \
        gasynchelper.c          \
        gasynchelper.h          \
        gasyncinitable.c        \
@@ -342,6 +352,7 @@ libgio_2_0_la_SOURCES =             \
        gconverterinputstream.c \
        gconverteroutputstream.c        \
        gcredentials.c          \
+       gcredentialsprivate.h   \
        gdatainputstream.c      \
        gdataoutputstream.c     \
        gdrive.c                \
@@ -382,7 +393,10 @@ libgio_2_0_la_SOURCES =            \
        gioscheduler.c          \
        giostream.c             \
        gioprivate.h            \
+       giowin32-priv.h         \
        gloadableicon.c         \
+       gkdbus.c                \
+       gkdbusconnection.c      \
        gmount.c                \
        gmemoryinputstream.c    \
        gmemoryoutputstream.c   \
@@ -426,6 +440,9 @@ libgio_2_0_la_SOURCES =             \
        gsocketlistener.c       \
        gsocketoutputstream.c   \
        gsocketoutputstream.h   \
+       gsubprocesslauncher.c   \
+       gsubprocess.c           \
+       gsubprocesslauncher-private.h   \
        gsocketservice.c        \
        gsrvtarget.c            \
        gsimpleproxyresolver.c  \
@@ -467,9 +484,9 @@ libgio_2_0_la_SOURCES =             \
 EXTRA_DIST += strinfo.c
 
 libgio_2_0_la_LIBADD = \
-       $(top_builddir)/glib/libglib-2.0.la             \
        $(top_builddir)/gobject/libgobject-2.0.la       \
        $(top_builddir)/gmodule/libgmodule-2.0.la       \
+       $(top_builddir)/glib/libglib-2.0.la             \
        $(platform_libadd)                              \
        $(ZLIB_LIBS)                                    \
        $(SELINUX_LIBS)                                 \
@@ -554,6 +571,8 @@ gio_headers =                       \
        giomodule.h             \
        gioscheduler.h          \
        giostream.h             \
+       gkdbus.h                \
+       gkdbusconnection.h      \
        gloadableicon.h         \
        gmount.h                \
        gmemoryinputstream.h    \
@@ -589,6 +608,8 @@ gio_headers =                       \
        gsrvtarget.h            \
        gsimpleproxyresolver.h  \
        gtask.h                 \
+       gsubprocess.h           \
+       gsubprocesslauncher.h   \
        gtcpconnection.h        \
        gtcpwrapperconnection.h \
        gthreadedsocketservice.h\
@@ -666,15 +687,18 @@ gioenumtypes.c: $(gio_headers) gioenumtypes.c.template
        $(AM_V_GEN) $(top_builddir)/gobject/glib-mkenums --template $(filter %.template,$^) $(filter-out %.template,$^) > \
            gioenumtypes.c.tmp && mv gioenumtypes.c.tmp gioenumtypes.c
 
+gio.def: libgio-2.0.la
+       $(AM_V_GEN) dumpbin.exe -exports .libs/libgio-2.0-0.dll | awk 'BEGIN { print "EXPORTS" } / +[[:digit:]]+ +[[:xdigit:]]+ +[[:xdigit:]]+/{ print $$4 }' > gio.def.tmp && mv gio.def.tmp gio.def
+
 gio-2.0.lib: libgio-2.0.la gio.def
-       lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgio-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(builddir)/gio.def -out:$@
+       $(AM_V_GEN) lib.exe -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgio-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(builddir)/gio.def -out:$@
 
 bin_PROGRAMS = gio-querymodules glib-compile-schemas glib-compile-resources gsettings
 
-glib_compile_resources_LDADD = \
-       $(top_builddir)/glib/libglib-2.0.la \
+glib_compile_resources_LDADD = libgio-2.0.la           \
        $(top_builddir)/gobject/libgobject-2.0.la       \
-       libgio-2.0.la
+       $(top_builddir)/glib/libglib-2.0.la             \
+       $(NULL)
 
 glib_compile_resources_SOURCES = \
        gvdb/gvdb-format.h              \
@@ -683,11 +707,10 @@ glib_compile_resources_SOURCES = \
        glib-compile-resources.c
 
 gio_querymodules_SOURCES = gio-querymodules.c
-gio_querymodules_LDADD  = \
-       $(top_builddir)/glib/libglib-2.0.la             \
+gio_querymodules_LDADD  = libgio-2.0.la                \
        $(top_builddir)/gobject/libgobject-2.0.la       \
        $(top_builddir)/gmodule/libgmodule-2.0.la       \
-       libgio-2.0.la                                   \
+       $(top_builddir)/glib/libglib-2.0.la             \
        $(NULL)
 
 gconstructor_as_data.h: $(top_srcdir)/glib/gconstructor.h data-to-c.pl
@@ -701,10 +724,10 @@ glib_compile_schemas_SOURCES = \
        gvdb/gvdb-builder.c             \
        glib-compile-schemas.c
 
-gsettings_LDADD = \
-       $(top_builddir)/glib/libglib-2.0.la             \
+gsettings_LDADD = libgio-2.0.la                        \
        $(top_builddir)/gobject/libgobject-2.0.la       \
-       libgio-2.0.la
+       $(top_builddir)/glib/libglib-2.0.la             \
+       $(NULL)
 gsettings_SOURCES = gsettings-tool.c
 
 schemadir = $(datadir)/glib-2.0/schemas
@@ -715,12 +738,25 @@ dist_schema_DATA = gschema.dtd
 
 bin_PROGRAMS += gdbus
 gdbus_SOURCES = gdbus-tool.c
-gdbus_LDADD = libgio-2.0.la \
-       $(top_builddir)/glib/libglib-2.0.la             \
-       $(top_builddir)/gobject/libgobject-2.0.la
+gdbus_LDADD = libgio-2.0.la                            \
+       $(top_builddir)/gobject/libgobject-2.0.la       \
+       $(top_builddir)/glib/libglib-2.0.la             \
+       $(NULL)
+
+if OS_UNIX
+# ------------------------------------------------------------------------
+# gapplication(1) tool
+bin_PROGRAMS += gapplication
+gapplication_SOURCES = gapplication-tool.c
+gapplication_LDADD = libgio-2.0.la                     \
+       $(top_builddir)/gobject/libgobject-2.0.la       \
+       $(top_builddir)/glib/libglib-2.0.la             \
+       $(NULL)
+endif
 
 completiondir = $(datadir)/bash-completion/completions
 completion_DATA = \
+       completion/gapplication                         \
        completion/gdbus                                \
        completion/gsettings                            \
        completion/gresource
@@ -732,9 +768,9 @@ EXTRA_DIST += $(completion_DATA)
 bin_PROGRAMS += gresource
 gresource_SOURCES = gresource-tool.c
 gresource_CPPFLAGS = $(LIBELF_CFLAGS) $(AM_CPPFLAGS)
-gresource_LDADD = libgio-2.0.la \
-       $(top_builddir)/glib/libglib-2.0.la             \
-       $(top_builddir)/gobject/libgobject-2.0.la \
+gresource_LDADD = libgio-2.0.la                                \
+       $(top_builddir)/gobject/libgobject-2.0.la       \
+       $(top_builddir)/glib/libglib-2.0.la             \
        $(LIBELF_LIBS)
 
 # ------------------------------------------------------------------------
Domain: System / Base;