X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2FMakefile.am;h=78cd4798c10c7767bc7efdddd125bddeabd629d0;hb=2a53b4d0e2c98a14aedf31e38f0ad1fb2e8fe26f;hp=fe4053e19598b9bd17901a7d720dca40a9b2f97c;hpb=6427e93757dbc38cc53ffeb87ed814cdb9df0ed4;p=platform%2Fupstream%2Fglib.git diff --git a/gio/Makefile.am b/gio/Makefile.am index fe4053e..78cd479 100644 --- a/gio/Makefile.am +++ b/gio/Makefile.am @@ -1,16 +1,14 @@ -include $(top_srcdir)/Makefile.decl +include $(top_srcdir)/glib.mk -NULL = - -SUBDIRS= +SUBDIRS = gdbus-2.0/codegen if OS_UNIX -SUBDIRS += libasyncns xdgmime +SUBDIRS += xdgmime endif if OS_WIN32_AND_DLL_COMPILATION if MS_LIB_AVAILABLE -noinst_DATA = gio-2.0.lib +noinst_DATA += gio-2.0.lib install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir) uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gio-2.0.lib @@ -23,61 +21,16 @@ install-ms-lib: uninstall-ms-lib: $(uninstall_ms_lib_cmd) -gio.def: gio.symbols - (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gio.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g' | sort) > gio.def.tmp && \ - mv gio.def.tmp gio.def - -gioalias.h: gio.symbols - $(PERL) $(srcdir)/makegioalias.pl < $(srcdir)/gio.symbols > gioalias.h.tmp && \ - mv gioalias.h.tmp gioalias.h - -gioaliasdef.c: gio.symbols - $(PERL) $(srcdir)/makegioalias.pl -def < $(srcdir)/gio.symbols > gioaliasdef.c.tmp && \ - mv gioaliasdef.c.tmp gioaliasdef.c - -if OS_LINUX -if HAVE_GNUC_VISIBILITY -TESTS = abicheck.sh pltcheck.sh -endif -endif - -if HAVE_THREADS -THREAD_FLAGS=-DG_THREADS_MANDATORY -endif - AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"GLib-GIO\" \ - -I$(top_builddir) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/glib \ - -I$(top_srcdir)/gmodule \ + $(gmodule_INCLUDES) \ $(GLIB_DEBUG_FLAGS) \ - $(THREAD_FLAGS) \ - -DG_DISABLE_DEPRECATED \ -DGIO_COMPILATION \ -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" -lib_LTLIBRARIES = libgio-2.0.la - -marshal_sources = \ - gio-marshal.h \ - gio-marshal.c \ - $(NULL) - -if CROSS_COMPILING - glib_genmarshal=$(GLIB_GENMARSHAL) -else - glib_genmarshal=../gobject/glib-genmarshal -endif - -gio-marshal.h: gio-marshal.list - $(glib_genmarshal) --prefix=_gio_marshal $(srcdir)/gio-marshal.list --header --internal > $@.tmp && \ - mv $@.tmp $@ +AM_CFLAGS = $(GLIB_WARN_CFLAGS) -gio-marshal.c: gio-marshal.h gio-marshal.list - (echo "#include \"gio-marshal.h\""; \ - $(glib_genmarshal) --prefix=_gio_marshal $(srcdir)/gio-marshal.list --body --internal) > $@.tmp && \ - mv $@.tmp $@ +lib_LTLIBRARIES = libgio-2.0.la gdbus_headers = \ gdbusauthobserver.h \ @@ -89,11 +42,19 @@ gdbus_headers = \ gdbusmessage.h \ gdbusnameowning.h \ gdbusnamewatching.h \ - gdbusproxywatching.h \ gdbusproxy.h \ gdbusintrospection.h \ gdbusmethodinvocation.h \ gdbusserver.h \ + gdbusinterface.h \ + gdbusinterfaceskeleton.h \ + gdbusobject.h \ + gdbusobjectskeleton.h \ + gdbusobjectproxy.h \ + gdbusobjectmanager.h \ + gdbusobjectmanagerclient.h \ + gdbusobjectmanagerserver.h \ + gtestdbus.h \ $(NULL) gdbus_sources = \ @@ -110,16 +71,38 @@ gdbus_sources = \ gdbusmessage.h gdbusmessage.c \ gdbusnameowning.h gdbusnameowning.c \ gdbusnamewatching.h gdbusnamewatching.c \ - gdbusproxywatching.h gdbusproxywatching.c \ gdbusproxy.h gdbusproxy.c \ gdbusprivate.h gdbusprivate.c \ gdbusintrospection.h gdbusintrospection.c \ gdbusmethodinvocation.h gdbusmethodinvocation.c \ gdbusserver.h gdbusserver.c \ + gdbusinterface.h gdbusinterface.c \ + gdbusinterfaceskeleton.h gdbusinterfaceskeleton.c \ + gdbusobject.h gdbusobject.c \ + gdbusobjectskeleton.h gdbusobjectskeleton.c \ + gdbusobjectproxy.h gdbusobjectproxy.c \ + gdbusobjectmanager.h gdbusobjectmanager.c \ + gdbusobjectmanagerclient.h gdbusobjectmanagerclient.c \ + gdbusobjectmanagerserver.h gdbusobjectmanagerserver.c \ + gtestdbus.h gtestdbus.c \ $(NULL) +# These are not built into the library yet +EXTRA_DIST += gdbusdaemon.c gdbusdaemon.h dbus-daemon.xml + +gdbus-daemon-generated.h gdbus-daemon-generated.c: $(srcdir)/dbus-daemon.xml $(srcdir)/gdbus-2.0/codegen/gdbus-codegen.in + $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ + UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ + $(PYTHON) $(srcdir)/gdbus-2.0/codegen/gdbus-codegen.in \ + --interface-prefix org. \ + --generate-c-code gdbus-daemon-generated \ + --c-namespace _G \ + $(srcdir)/dbus-daemon.xml \ + $(NULL) + settings_headers = \ gsettingsbackend.h \ + gsettingsschema.h \ gsettings.h settings_sources = \ @@ -128,20 +111,77 @@ settings_sources = \ gvdb/gvdb-reader.c \ gdelayedsettingsbackend.h \ gdelayedsettingsbackend.c \ - gkeyfilesettingsbackend.h \ gkeyfilesettingsbackend.c \ - gmemorysettingsbackend.h \ gmemorysettingsbackend.c \ - gnullsettingsbackend.h \ gnullsettingsbackend.c \ gsettingsbackendinternal.h \ gsettingsbackend.c \ gsettingsschema.h \ + gsettingsschema-internal.h \ gsettingsschema.c \ gsettings-mapping.h \ gsettings-mapping.c \ gsettings.c +if OS_WIN32 +settings_sources += \ + gregistrysettingsbackend.h \ + gregistrysettingsbackend.c +endif + +if OS_COCOA +settings_sources += \ + gnextstepsettingsbackend.c +endif + +application_headers = \ + gapplication.h \ + gapplicationcommandline.h \ + \ + gactiongroup.h \ + gactionmap.h \ + gsimpleactiongroup.h \ + gremoteactiongroup.h \ + gactiongroupexporter.h \ + gdbusactiongroup.h \ + gaction.h \ + gpropertyaction.h \ + gsimpleaction.h \ + \ + gmenumodel.h \ + gmenu.h \ + gmenuexporter.h \ + gdbusmenumodel.h \ + gnotification.h \ + $(NULL) + +application_sources = \ + gapplication.c \ + gapplicationcommandline.c \ + gapplicationimpl-dbus.c \ + gapplicationimpl.h \ + \ + gactiongroup.c \ + gactionmap.c \ + gsimpleactiongroup.c \ + gremoteactiongroup.c \ + gactiongroupexporter.c \ + 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 = \ glocaldirectorymonitor.c \ glocaldirectorymonitor.h \ @@ -161,6 +201,14 @@ local_sources = \ glocalfileiostream.h \ glocalvfs.c \ glocalvfs.h \ + gsocks4proxy.c \ + gsocks4proxy.h \ + gsocks4aproxy.c \ + gsocks4aproxy.h \ + gsocks5proxy.c \ + gsocks5proxy.h \ + thumbnail-verify.h \ + thumbnail-verify.c \ $(NULL) platform_libadd = @@ -173,6 +221,12 @@ platform_libadd += inotify/libinotify.la platform_deps += inotify/libinotify.la endif +if HAVE_KQUEUE +SUBDIRS += kqueue +platform_libadd += kqueue/libkqueue.la +platform_deps += kqueue/libkqueue.la +endif + if HAVE_FEN AM_CPPFLAGS += -DHAVE_FEN SUBDIRS += fen @@ -186,8 +240,7 @@ platform_libadd += win32/libgiowin32.la platform_deps += win32/libgiowin32.la endif - -SUBDIRS += . +SUBDIRS += . tests if HAVE_FAM SUBDIRS += fam @@ -195,8 +248,8 @@ endif if OS_UNIX appinfo_sources += gdesktopappinfo.c -platform_libadd += libasyncns/libasyncns.la xdgmime/libxdgmime.la -platform_deps += libasyncns/libasyncns.la xdgmime/libxdgmime.la +platform_libadd += xdgmime/libxdgmime.la +platform_deps += xdgmime/libxdgmime.la unix_sources = \ gfiledescriptorbased.c \ gunixconnection.c \ @@ -206,8 +259,6 @@ unix_sources = \ gunixmount.c \ gunixmount.h \ gunixmounts.c \ - gunixresolver.c \ - gunixresolver.h \ gunixsocketaddress.c \ gunixvolume.c \ gunixvolume.h \ @@ -215,6 +266,10 @@ unix_sources = \ gunixvolumemonitor.h \ gunixinputstream.c \ gunixoutputstream.c \ + gcontenttype.c \ + gcontenttypeprivate.h \ + gfdonotificationbackend.c \ + ggtknotificationbackend.c \ $(NULL) @@ -231,16 +286,27 @@ giounixinclude_HEADERS = \ gunixoutputstream.h \ gunixsocketaddress.h \ $(NULL) + +if HAVE_NETLINK +unix_sources += \ + gnetworkmonitornetlink.c \ + gnetworkmonitornetlink.h \ + $(NULL) +endif endif -if OS_WIN32 -appinfo_sources += gwin32appinfo.c gwin32appinfo.h -platform_libadd += -lshlwapi -lws2_32 -ldnsapi -win32_sources = \ +gdbus_daemon_sources = \ + gdbusdaemon.c \ + gdbusdaemon.h \ + gdbus-daemon-generated.c \ + gdbus-daemon-generated.h \ + $(NULL) + +win32_actual_sources = \ + $(gdbus_daemon_sources) \ + gcontenttype-win32.c \ gwin32mount.c \ gwin32mount.h \ - gwin32resolver.c \ - gwin32resolver.h \ gwin32volumemonitor.c \ gwin32volumemonitor.h \ gwin32inputstream.c \ @@ -250,12 +316,18 @@ win32_sources = \ win32_more_sources_for_vcproj = \ gwin32appinfo.c \ + gregistrysettingsbackend.c \ win32/gwin32directorymonitor.c \ win32/gwinhttpfile.c \ win32/gwinhttpfileinputstream.c \ win32/gwinhttpfileoutputstream.c \ win32/gwinhttpvfs.c +if OS_WIN32 +appinfo_sources += gwin32appinfo.c gwin32appinfo.h +platform_libadd += -lshlwapi -lws2_32 -ldnsapi -liphlpapi +win32_sources = $(win32_actual_sources) + giowin32includedir=$(includedir)/gio-win32-2.0/gio giowin32include_HEADERS = \ gwin32inputstream.h \ @@ -264,31 +336,32 @@ giowin32include_HEADERS = \ endif -SUBDIRS += tests - libgio_2_0_la_SOURCES = \ gappinfo.c \ - gapplication.c \ - gapplication.h \ + gappinfoprivate.h \ gasynchelper.c \ gasynchelper.h \ gasyncinitable.c \ gasyncresult.c \ gbufferedinputstream.c \ gbufferedoutputstream.c \ + gbytesicon.c \ gcancellable.c \ - gcontenttype.c \ - gcontenttypeprivate.h \ gcharsetconverter.c \ gconverter.c \ gconverterinputstream.c \ gconverteroutputstream.c \ gcredentials.c \ + gcredentialsprivate.h \ gdatainputstream.c \ gdataoutputstream.c \ gdrive.c \ gdummyfile.h \ gdummyfile.c \ + gdummyproxyresolver.c \ + gdummyproxyresolver.h \ + gdummytlsbackend.c \ + gdummytlsbackend.h \ gemblem.h \ gemblem.c \ gemblemedicon.h \ @@ -309,6 +382,7 @@ libgio_2_0_la_SOURCES = \ gfilteroutputstream.c \ gicon.c \ ginetaddress.c \ + ginetaddressmask.c \ ginetsocketaddress.c \ ginitable.c \ ginputstream.c \ @@ -318,7 +392,10 @@ libgio_2_0_la_SOURCES = \ giomodule-priv.h \ gioscheduler.c \ giostream.c \ + gioprivate.h \ + giowin32-priv.h \ gloadableicon.c \ + gkdbus.c \ gmount.c \ gmemoryinputstream.c \ gmemoryoutputstream.c \ @@ -326,13 +403,27 @@ libgio_2_0_la_SOURCES = \ gnativevolumemonitor.c \ gnativevolumemonitor.h \ gnetworkaddress.c \ + gnetworking.c \ gnetworkingprivate.h \ + gnetworkmonitor.c \ + gnetworkmonitorbase.c \ + gnetworkmonitorbase.h \ gnetworkservice.c \ goutputstream.c \ gpermission.c \ + gpollableinputstream.c \ + gpollableoutputstream.c \ + gpollableutils.c \ gpollfilemonitor.c \ gpollfilemonitor.h \ + gproxy.c \ + gproxyaddress.c \ + gproxyaddressenumerator.c \ + gproxyresolver.c \ gresolver.c \ + gresource.c \ + gresourcefile.c \ + gresourcefile.h \ gseekable.c \ gsimpleasyncresult.c \ gsimplepermission.c \ @@ -348,13 +439,28 @@ libgio_2_0_la_SOURCES = \ gsocketlistener.c \ gsocketoutputstream.c \ gsocketoutputstream.h \ + gsubprocesslauncher.c \ + gsubprocess.c \ + gsubprocesslauncher-private.h \ gsocketservice.c \ gsrvtarget.c \ + gsimpleproxyresolver.c \ + gtask.c \ gtcpconnection.c \ + gtcpwrapperconnection.c \ gthreadedsocketservice.c\ gthemedicon.c \ gthreadedresolver.c \ gthreadedresolver.h \ + gtlsbackend.c \ + gtlscertificate.c \ + gtlsclientconnection.c \ + gtlsconnection.c \ + gtlsdatabase.c \ + gtlsfiledatabase.c \ + gtlsinteraction.c \ + gtlspassword.c \ + gtlsserverconnection.c \ gunionvolumemonitor.c \ gunionvolumemonitor.h \ gvfs.c \ @@ -365,64 +471,56 @@ libgio_2_0_la_SOURCES = \ gmountprivate.h \ gioenumtypes.h \ gioenumtypes.c \ - gioalias.h \ - gioaliasdef.c \ $(appinfo_sources) \ $(unix_sources) \ $(win32_sources) \ + $(application_sources) \ $(settings_sources) \ $(gdbus_sources) \ $(local_sources) \ - $(marshal_sources) \ $(NULL) -EXTRA_DIST += gnullapplication.c gdbusapplication.c - -$(libgio_2_0_la_OBJECTS): $(marshal_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) \ $(GLIB_LIBS) \ $(XATTR_LIBS) \ + $(NETWORK_LIBS) \ $(NULL) +libgio_2_0_la_CPPFLAGS = $(ZLIB_CFLAGS) $(AM_CPPFLAGS) + if PLATFORM_WIN32 no_undefined = -no-undefined endif if OS_WIN32_AND_DLL_COMPILATION -export_symbols = -export-symbols gio.def -gio_def = gio.def - gio_win32_res = gio-win32-res.o gio_win32_res_ldflag = -Wl,$(gio_win32_res) - -install-def-file: - $(INSTALL) gio.def $(DESTDIR)$(libdir)/gio-2.0.def - -uninstall-def-file: - -rm $(DESTDIR)$(libdir)/gio-2.0.def -else -install-def-file: -uninstall-def-file: - -export_symbols = -export-symbols-regex '^g_.*' endif -install-data-local: install-ms-lib install-def-file +install-data-local: install-ms-lib $(mkinstalldirs) $(DESTDIR)$(GIO_MODULE_DIR) -uninstall-local: uninstall-ms-lib uninstall-def-file +uninstall-local: uninstall-ms-lib -libgio_2_0_la_LDFLAGS = \ +libgio_2_0_la_CFLAGS = $(AM_CFLAGS) $(GLIB_HIDDEN_VISIBILITY_CFLAGS) +libgio_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \ $(gio_win32_res_ldflag) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -export-dynamic $(no_undefined) $(export_symbols) + -export-dynamic $(no_undefined) + +if OS_COCOA +# This is dumb. The ObjC source file should be properly named .m +libgio_2_0_la_CFLAGS += -xobjective-c +libgio_2_0_la_LDFLAGS += -Wl,-framework,Foundation +endif libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps) @@ -431,11 +529,11 @@ gio-win32-res.o: gio.rc gio_headers = \ gappinfo.h \ - gapplication.h \ gasyncinitable.h \ gasyncresult.h \ gbufferedinputstream.h \ gbufferedoutputstream.h \ + gbytesicon.h \ gcancellable.h \ gcontenttype.h \ gcharsetconverter.h \ @@ -461,6 +559,7 @@ gio_headers = \ gfilteroutputstream.h \ gicon.h \ ginetaddress.h \ + ginetaddressmask.h \ ginetsocketaddress.h \ ginputstream.h \ ginitable.h \ @@ -471,6 +570,7 @@ gio_headers = \ giomodule.h \ gioscheduler.h \ giostream.h \ + gkdbus.h \ gloadableicon.h \ gmount.h \ gmemoryinputstream.h \ @@ -478,10 +578,19 @@ gio_headers = \ gmountoperation.h \ gnativevolumemonitor.h \ gnetworkaddress.h \ + gnetworkmonitor.h \ gnetworkservice.h \ goutputstream.h \ gpermission.h \ + gpollableinputstream.h \ + gpollableoutputstream.h \ + gpollableutils.h \ + gproxyaddress.h \ + gproxy.h \ + gproxyaddressenumerator.h \ + gproxyresolver.h \ gresolver.h \ + gresource.h \ gseekable.h \ gsimpleasyncresult.h \ gsimplepermission.h \ @@ -495,14 +604,29 @@ gio_headers = \ gsocketlistener.h \ gsocketservice.h \ gsrvtarget.h \ + gsimpleproxyresolver.h \ + gtask.h \ + gsubprocess.h \ + gsubprocesslauncher.h \ gtcpconnection.h \ + gtcpwrapperconnection.h \ gthreadedsocketservice.h\ gthemedicon.h \ + gtlsbackend.h \ + gtlscertificate.h \ + gtlsclientconnection.h \ + gtlsconnection.h \ + gtlsdatabase.h \ + gtlsfiledatabase.h \ + gtlsinteraction.h \ + gtlspassword.h \ + gtlsserverconnection.h \ gvfs.h \ gvolume.h \ gvolumemonitor.h \ gzlibcompressor.h \ gzlibdecompressor.h \ + $(application_headers) \ $(settings_headers) \ $(gdbus_headers) \ $(NULL) @@ -512,71 +636,96 @@ gioinclude_HEADERS = \ $(gio_headers) \ gioenumtypes.h +nodist_gioinclude_HEADERS = \ + gnetworking.h \ + $(NULL) + # these sources (also mentioned above) are generated. -BUILT_SOURCES = \ - gio-marshal.h \ - gio-marshal.c \ - gioalias.h \ - gioaliasdef.c \ +BUILT_SOURCES += \ + gconstructor_as_data.h \ gioenumtypes.h \ gioenumtypes.c \ + gdbus-daemon-generated.c \ + gdbus-daemon-generated.h \ + gnetworking.h \ $(NULL) EXTRA_DIST += \ - gio-marshal.list \ - gio.symbols \ + data-to-c.pl \ gioenumtypes.h.template \ gioenumtypes.c.template \ makefile.msc \ - makegioalias.pl \ - abicheck.sh \ - pltcheck.sh \ gio.rc.in \ gschema.dtd \ + gconstructor_as_data.h \ + gnetworking.h.win32 \ $(NULL) -BUILT_EXTRA_DIST = \ +BUILT_EXTRA_DIST += \ gio.rc -CLEANFILES = \ - $(marshal_sources) \ - $(NULL) +# This is read by gobject-introspection/misc/ and gtk-doc +gio-public-headers.txt: Makefile + $(AM_V_GEN) echo $(gioinclude_HEADERS) $(giowin32include_HEADERS) $(giounixinclude_HEADERS) > $@.tmp && mv $@.tmp $@ + +CLEANFILES += gdbus-daemon-generated.c gdbus-daemon-generated.h gio-public-headers.txt gconstructor_as_data.h + + +DISTCLEANFILES += \ + gioenumtypes.h \ + gioenumtypes.c + +all-local: gio-public-headers.txt gioenumtypes.h: $(gio_headers) gioenumtypes.h.template - ( top_builddir=`cd $(top_builddir) && pwd`; \ - cd $(srcdir) && $$top_builddir/gobject/glib-mkenums --template gioenumtypes.h.template $(gio_headers) ) > \ + $(AM_V_GEN) $(top_builddir)/gobject/glib-mkenums --template $(filter %.template,$^) $(filter-out %.template,$^) > \ gioenumtypes.h.tmp && mv gioenumtypes.h.tmp gioenumtypes.h gioenumtypes.c: $(gio_headers) gioenumtypes.c.template - ( top_builddir=`cd $(top_builddir) && pwd`; \ - cd $(srcdir) && $$top_builddir/gobject/glib-mkenums --template gioenumtypes.c.template $(gio_headers) ) > \ + $(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: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:$@ -dist_bin_SCRIPTS = gsettings-schema-convert -bin_PROGRAMS = gio-querymodules glib-compile-schemas gsettings +bin_PROGRAMS = gio-querymodules glib-compile-schemas glib-compile-resources gsettings + +glib_compile_resources_LDADD = libgio-2.0.la \ + $(top_builddir)/gobject/libgobject-2.0.la \ + $(top_builddir)/glib/libglib-2.0.la \ + $(NULL) + +glib_compile_resources_SOURCES = \ + gvdb/gvdb-format.h \ + gvdb/gvdb-builder.h \ + gvdb/gvdb-builder.c \ + 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 + $(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_SOURCES = \ + gconstructor_as_data.h \ gvdb/gvdb-format.h \ gvdb/gvdb-builder.h \ gvdb/gvdb-builder.c \ - gschema-compile.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 @@ -587,26 +736,53 @@ 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) -completiondir = $(sysconfdir)/bash_completion.d -completion_SCRIPTS = gdbus-bash-completion.sh -EXTRA_DIST += $(completion_SCRIPTS) +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 +EXTRA_DIST += $(completion_DATA) # ------------------------------------------------------------------------ +# gresource tool -dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj +bin_PROGRAMS += gresource +gresource_SOURCES = gresource-tool.c +gresource_CPPFLAGS = $(LIBELF_CFLAGS) $(AM_CPPFLAGS) +gresource_LDADD = libgio-2.0.la \ + $(top_builddir)/gobject/libgobject-2.0.la \ + $(top_builddir)/glib/libglib-2.0.la \ + $(LIBELF_LIBS) + +# ------------------------------------------------------------------------ + +dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj ../build/win32/vs10/gio.vcxproj ../build/win32/vs10/gio.vcxproj.filters files='$(BUILT_EXTRA_DIST)'; \ for f in $$files; do \ if test -f $$f; then d=.; else d=$(srcdir); fi; \ cp $$d/$$f $(distdir) || exit 1; done ../build/win32/vs9/gio.vcproj: $(top_srcdir)/build/win32/vs9/gio.vcprojin - for F in `echo $(libgio_2_0_la_SOURCES) $(win32_sources) $(win32_more_sources_for_vcproj) | tr '/' '\\'`; do \ + for F in `echo $(libgio_2_0_la_SOURCES) $(win32_actual_sources) $(win32_more_sources_for_vcproj) | tr '/' '\\'`; do \ case $$F in \ - gunix*.c|gdesktopappinfo.c) ;; \ + gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c|gcontenttype.c) ;; \ *.c) echo ' ' \ ;; \ esac; \ @@ -614,6 +790,28 @@ dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gio.vcprojin >$@ rm libgio.sourcefiles +../build/win32/vs10/gio.vcxproj: $(top_srcdir)/build/win32/vs10/gio.vcxprojin + for F in `echo $(libgio_2_0_la_SOURCES) $(win32_actual_sources) $(win32_more_sources_for_vcproj) | tr '/' '\\'`; do \ + case $$F in \ + gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c|gcontenttype.c) ;; \ + *.c) echo ' ' \ + ;; \ + esac; \ + done | sort -u >libgio.vs10.sourcefiles + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gio.vcxprojin >$@ + rm libgio.vs10.sourcefiles + +../build/win32/vs10/gio.vcxproj.filters: $(top_srcdir)/build/win32/vs10/gio.vcxproj.filtersin + for F in `echo $(libgio_2_0_la_SOURCES) $(win32_actual_sources) $(win32_more_sources_for_vcproj) | tr '/' '\\'`; do \ + case $$F in \ + gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c|gcontenttype.c) ;; \ + *.c) echo ' Source Files' \ + ;; \ + esac; \ + done | sort -u >libgio.vs10.sourcefiles.filters + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gio.vcxproj.filtersin >$@ + rm libgio.vs10.sourcefiles.filters + if HAVE_GLIB_RUNTIME_LIBDIR install-data-hook: mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)