X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2FMakefile.am;h=06c71b994d9493db350a611f8f16cb0a03334014;hb=ee17a54c289b8be286a54c594cff5c2d46345054;hp=78e5003f5c5baac52bdcab9a2fd9594533cb3fff;hpb=d110fd9202a1084e1fe1d8efcfbdda1d078945e4;p=platform%2Fupstream%2Fglib.git diff --git a/gio/Makefile.am b/gio/Makefile.am index 78e5003..06c71b9 100644 --- a/gio/Makefile.am +++ b/gio/Makefile.am @@ -23,16 +23,6 @@ install-ms-lib: uninstall-ms-lib: $(uninstall_ms_lib_cmd) -gio.def: gio.symbols - $(AM_V_GEN) (echo 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 - -if OS_LINUX -if HAVE_GNUC_VISIBILITY -TESTS = abicheck.sh -endif -endif - AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"GLib-GIO\" \ $(gmodule_INCLUDES) \ @@ -64,6 +54,7 @@ gdbus_headers = \ gdbusobjectmanager.h \ gdbusobjectmanagerclient.h \ gdbusobjectmanagerserver.h \ + gtestdbus.h \ $(NULL) gdbus_sources = \ @@ -93,8 +84,22 @@ gdbus_sources = \ 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 \ @@ -124,38 +129,50 @@ settings_sources += \ 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 \ gsimpleaction.h \ - gdbusactiongroup.h \ - gactiongroupexporter.h \ - gapplicationcommandline.h \ - gapplication.h \ + \ gmenumodel.h \ - gmenuproxy.h \ gmenu.h \ - gmenumarkup.h \ gmenuexporter.h \ + gdbusmenumodel.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 \ gsimpleaction.c \ - gdbusactiongroup.c \ - gactiongroupexporter.c \ - gapplicationcommandline.c \ - gapplicationimpl.h \ - gapplicationimpl-dbus.c \ - gapplication.c \ + \ gmenumodel.c \ - gmenuproxy.c \ gmenu.c \ - gmenumarkup.c \ gmenuexporter.c \ + gdbusmenumodel.c \ $(NULL) local_sources = \ @@ -195,6 +212,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 @@ -234,6 +257,8 @@ unix_sources = \ gunixvolumemonitor.h \ gunixinputstream.c \ gunixoutputstream.c \ + gcontenttype.c \ + gcontenttypeprivate.h \ $(NULL) @@ -259,7 +284,16 @@ unix_sources += \ endif endif +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 \ gwin32volumemonitor.c \ @@ -291,7 +325,9 @@ giowin32include_HEADERS = \ endif -SUBDIRS += tests +if BUILD_MODULAR_TESTS +SUBDIRS += tests +endif libgio_2_0_la_SOURCES = \ gappinfo.c \ @@ -302,8 +338,6 @@ libgio_2_0_la_SOURCES = \ gbufferedinputstream.c \ gbufferedoutputstream.c \ gcancellable.c \ - gcontenttype.c \ - gcontenttypeprivate.h \ gcharsetconverter.c \ gconverter.c \ gconverterinputstream.c \ @@ -356,6 +390,7 @@ libgio_2_0_la_SOURCES = \ gnativevolumemonitor.c \ gnativevolumemonitor.h \ gnetworkaddress.c \ + gnetworking.c \ gnetworkingprivate.h \ gnetworkmonitor.c \ gnetworkmonitorbase.c \ @@ -365,10 +400,17 @@ libgio_2_0_la_SOURCES = \ 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 \ @@ -384,11 +426,10 @@ libgio_2_0_la_SOURCES = \ gsocketlistener.c \ gsocketoutputstream.c \ gsocketoutputstream.h \ - gproxy.c \ - gproxyaddress.c \ - gproxyaddressenumerator.c \ gsocketservice.c \ gsrvtarget.c \ + gsimpleproxyresolver.c \ + gtask.c \ gtcpconnection.c \ gtcpwrapperconnection.c \ gthreadedsocketservice.c\ @@ -444,33 +485,26 @@ 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 = $(LIBTOOL_EXPORT_OPTIONS) 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_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) @@ -526,17 +560,20 @@ gio_headers = \ gmountoperation.h \ gnativevolumemonitor.h \ gnetworkaddress.h \ + gnetworking.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 \ @@ -550,6 +587,8 @@ gio_headers = \ gsocketlistener.h \ gsocketservice.h \ gsrvtarget.h \ + gsimpleproxyresolver.h \ + gtask.h \ gtcpconnection.h \ gtcpwrapperconnection.h \ gthreadedsocketservice.h\ @@ -580,21 +619,23 @@ gioinclude_HEADERS = \ # these sources (also mentioned above) are generated. BUILT_SOURCES = \ + gconstructor_as_data.h \ gioenumtypes.h \ gioenumtypes.c \ + gdbus-daemon-generated.c \ + gdbus-daemon-generated.h \ + gnetworking.h \ $(NULL) EXTRA_DIST += \ - gio.symbols \ + data-to-c.pl \ gioenumtypes.h.template \ gioenumtypes.c.template \ makefile.msc \ - abicheck.sh \ gio.rc.in \ gschema.dtd \ - menumarkup.xml \ - menumarkup2.xml \ - menumarkup.dtd \ + gconstructor_as_data.h \ + gnetworking.h.win32 \ $(NULL) BUILT_EXTRA_DIST = \ @@ -602,26 +643,40 @@ BUILT_EXTRA_DIST = \ # This is read by gobject-introspection/misc/ and gtk-doc gio-public-headers.txt: Makefile - echo $(gioinclude_HEADERS) $(giowin32include_HEADERS) $(giounixinclude_HEADERS) > $@.tmp && mv $@.tmp $@ + $(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 -CLEANFILES = gio-public-headers.txt + +DISTCLEANFILES = \ + gioenumtypes.h \ + gioenumtypes.c all-local: gio-public-headers.txt gioenumtypes.h: $(gio_headers) gioenumtypes.h.template - $(AM_V_GEN) ( 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 - $(AM_V_GEN) ( 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-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:$@ + lib -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 \ + $(top_builddir)/gobject/libgobject-2.0.la \ + libgio-2.0.la -bin_PROGRAMS = gio-querymodules glib-compile-schemas gsettings +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 = \ @@ -631,8 +686,12 @@ gio_querymodules_LDADD = \ libgio-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 \ @@ -656,13 +715,25 @@ gdbus_LDADD = libgio-2.0.la \ $(top_builddir)/glib/libglib-2.0.la \ $(top_builddir)/gobject/libgobject-2.0.la -completiondir = $(sysconfdir)/bash_completion.d +completiondir = $(datadir)/bash-completion/completions completion_DATA = \ - gdbus-bash-completion.sh \ - gsettings-bash-completion.sh + completion/gdbus \ + completion/gsettings \ + completion/gresource EXTRA_DIST += $(completion_DATA) # ------------------------------------------------------------------------ +# gresource tool + +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 \ + $(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)'; \ @@ -673,7 +744,7 @@ dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj ../build/win32/vs10 ../build/win32/vs9/gio.vcproj: $(top_srcdir)/build/win32/vs9/gio.vcprojin 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) ;; \ + gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c|gcontenttype.c) ;; \ *.c) echo ' ' \ ;; \ esac; \ @@ -684,7 +755,7 @@ dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj ../build/win32/vs10 ../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) ;; \ + gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c|gcontenttype.c) ;; \ *.c) echo ' ' \ ;; \ esac; \ @@ -695,7 +766,7 @@ dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj ../build/win32/vs10 ../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) ;; \ + gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c|gcontenttype.c) ;; \ *.c) echo ' Source Files' \ ;; \ esac; \