X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2FMakefile.am;h=e993e2fef1e5206f9179000687be59ac653c91d7;hb=4482977238ae80f64c2fe318d1500f4662c73980;hp=1e7b6b7176097cad87dd3f783f4f1d73ff6d69fa;hpb=f9eb9eed10b7123ef000e49be1290755b2d6ae8f;p=platform%2Fupstream%2Fglib.git diff --git a/gio/Makefile.am b/gio/Makefile.am index 1e7b6b7..e993e2f 100644 --- a/gio/Makefile.am +++ b/gio/Makefile.am @@ -145,12 +145,14 @@ application_headers = \ gactiongroupexporter.h \ gdbusactiongroup.h \ gaction.h \ + gpropertyaction.h \ gsimpleaction.h \ \ gmenumodel.h \ gmenu.h \ gmenuexporter.h \ gdbusmenumodel.h \ + gnotification.h \ $(NULL) application_sources = \ @@ -167,12 +169,17 @@ application_sources = \ gdbusactiongroup-private.h \ gdbusactiongroup.c \ gaction.c \ + gpropertyaction.c \ gsimpleaction.c \ \ gmenumodel.c \ gmenu.c \ gmenuexporter.c \ gdbusmenumodel.c \ + gnotification-private.h \ + gnotificationbackend.h \ + gnotification.c \ + gnotificationbackend.c \ $(NULL) local_sources = \ @@ -200,6 +207,8 @@ local_sources = \ gsocks4aproxy.h \ gsocks5proxy.c \ gsocks5proxy.h \ + thumbnail-verify.h \ + thumbnail-verify.c \ $(NULL) platform_libadd = @@ -239,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 \ @@ -259,6 +268,8 @@ unix_sources = \ gunixoutputstream.c \ gcontenttype.c \ gcontenttypeprivate.h \ + gfdonotificationbackend.c \ + ggtknotificationbackend.c \ $(NULL) @@ -314,7 +325,7 @@ win32_more_sources_for_vcproj = \ if OS_WIN32 appinfo_sources += gwin32appinfo.c gwin32appinfo.h -platform_libadd += -lshlwapi -lws2_32 -ldnsapi +platform_libadd += -lshlwapi -lws2_32 -ldnsapi -liphlpapi win32_sources = $(win32_actual_sources) giowin32includedir=$(includedir)/gio-win32-2.0/gio @@ -327,6 +338,7 @@ endif libgio_2_0_la_SOURCES = \ gappinfo.c \ + gappinfoprivate.h \ gasynchelper.c \ gasynchelper.h \ gasyncinitable.c \ @@ -340,6 +352,7 @@ libgio_2_0_la_SOURCES = \ gconverterinputstream.c \ gconverteroutputstream.c \ gcredentials.c \ + gcredentialsprivate.h \ gdatainputstream.c \ gdataoutputstream.c \ gdrive.c \ @@ -379,6 +392,8 @@ libgio_2_0_la_SOURCES = \ giomodule-priv.h \ gioscheduler.c \ giostream.c \ + gioprivate.h \ + giowin32-priv.h \ gloadableicon.c \ gmount.c \ gmemoryinputstream.c \ @@ -423,6 +438,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 \ @@ -464,9 +482,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) \ @@ -558,7 +576,6 @@ gio_headers = \ gmountoperation.h \ gnativevolumemonitor.h \ gnetworkaddress.h \ - gnetworking.h \ gnetworkmonitor.h \ gnetworkservice.h \ goutputstream.h \ @@ -587,6 +604,8 @@ gio_headers = \ gsrvtarget.h \ gsimpleproxyresolver.h \ gtask.h \ + gsubprocess.h \ + gsubprocesslauncher.h \ gtcpconnection.h \ gtcpwrapperconnection.h \ gthreadedsocketservice.h\ @@ -615,6 +634,10 @@ gioinclude_HEADERS = \ $(gio_headers) \ gioenumtypes.h +nodist_gioinclude_HEADERS = \ + gnetworking.h \ + $(NULL) + # these sources (also mentioned above) are generated. BUILT_SOURCES += \ gconstructor_as_data.h \ @@ -660,15 +683,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 \ @@ -677,11 +703,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 @@ -695,10 +720,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 @@ -709,12 +734,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 @@ -726,9 +764,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) # ------------------------------------------------------------------------