NULL =
-SUBDIRS=
+SUBDIRS = gdbus-2.0/codegen
if OS_UNIX
-SUBDIRS += libasyncns xdgmime
+SUBDIRS += xdgmime
endif
if OS_WIN32_AND_DLL_COMPILATION
$(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 && \
+ $(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
-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
+TESTS = abicheck.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_THREADS_MANDATORY \
-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 $@
-
-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 $@
-
gdbus_headers = \
gdbusauthobserver.h \
gcredentials.h \
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 \
$(NULL)
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 \
$(NULL)
settings_headers = \
gvdb/gvdb-reader.c \
gdelayedsettingsbackend.h \
gdelayedsettingsbackend.c \
- gkeyfilesettingsbackend.h \
gkeyfilesettingsbackend.c \
- gmemorysettingsbackend.h \
gmemorysettingsbackend.c \
- gnullsettingsbackend.h \
gnullsettingsbackend.c \
gsettingsbackendinternal.h \
gsettingsbackend.c \
gsettings-mapping.c \
gsettings.c
+if OS_WIN32
+settings_sources += \
+ gregistrysettingsbackend.h \
+ gregistrysettingsbackend.c
+endif
+
+application_headers = \
+ gactiongroup.h \
+ gsimpleactiongroup.h \
+ gaction.h \
+ gsimpleaction.h \
+ gapplicationcommandline.h \
+ gapplication.h
+
+application_sources = \
+ gactiongroup.c \
+ gsimpleactiongroup.c \
+ gaction.c \
+ gsimpleaction.c \
+ gapplicationcommandline.c \
+ gapplicationimpl.h \
+ gapplicationimpl-dbus.c \
+ gapplication.c
+
local_sources = \
glocaldirectorymonitor.c \
glocaldirectorymonitor.h \
glocalfileiostream.h \
glocalvfs.c \
glocalvfs.h \
+ gsocks4proxy.c \
+ gsocks4proxy.h \
+ gsocks4aproxy.c \
+ gsocks4aproxy.h \
+ gsocks5proxy.c \
+ gsocks5proxy.h \
$(NULL)
platform_libadd =
platform_deps += win32/libgiowin32.la
endif
-
SUBDIRS += .
if HAVE_FAM
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 $(RESOLVER_LIBADD)
+platform_deps += xdgmime/libxdgmime.la
unix_sources = \
gfiledescriptorbased.c \
gunixconnection.c \
gunixmount.c \
gunixmount.h \
gunixmounts.c \
- gunixresolver.c \
- gunixresolver.h \
gunixsocketaddress.c \
gunixvolume.c \
gunixvolume.h \
$(NULL)
endif
-if OS_WIN32
-appinfo_sources += gwin32appinfo.c gwin32appinfo.h
-platform_libadd += -lshlwapi -lws2_32 -ldnsapi
-win32_sources = \
+win32_actual_sources = \
gwin32mount.c \
gwin32mount.h \
- gwin32resolver.c \
- gwin32resolver.h \
gwin32volumemonitor.c \
gwin32volumemonitor.h \
gwin32inputstream.c \
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
+win32_sources = $(win32_actual_sources)
+
giowin32includedir=$(includedir)/gio-win32-2.0/gio
giowin32include_HEADERS = \
gwin32inputstream.h \
gdrive.c \
gdummyfile.h \
gdummyfile.c \
+ gdummyproxyresolver.c \
+ gdummyproxyresolver.h \
+ gdummytlsbackend.c \
+ gdummytlsbackend.h \
gemblem.h \
gemblem.c \
gemblemedicon.h \
gnetworkingprivate.h \
gnetworkservice.c \
goutputstream.c \
+ gpermission.c \
+ gpollableinputstream.c \
+ gpollableoutputstream.c \
gpollfilemonitor.c \
gpollfilemonitor.h \
+ gproxyresolver.c \
gresolver.c \
gseekable.c \
gsimpleasyncresult.c \
+ gsimplepermission.c \
gsocket.c \
gsocketaddress.c \
gsocketaddressenumerator.c \
gsocketlistener.c \
gsocketoutputstream.c \
gsocketoutputstream.h \
+ gproxy.c \
+ gproxyaddress.c \
+ gproxyaddressenumerator.c \
gsocketservice.c \
gsrvtarget.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 \
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)
-$(libgio_2_0_la_OBJECTS): $(marshal_sources)
+EXTRA_DIST += strinfo.c
libgio_2_0_la_LIBADD = \
$(top_builddir)/glib/libglib-2.0.la \
$(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
install-def-file:
uninstall-def-file:
-export_symbols = -export-symbols-regex '^g_.*'
+export_symbols = $(LIBTOOL_EXPORT_OPTIONS)
endif
install-data-local: install-ms-lib install-def-file
uninstall-local: uninstall-ms-lib uninstall-def-file
-libgio_2_0_la_LDFLAGS = \
+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)
gnetworkaddress.h \
gnetworkservice.h \
goutputstream.h \
+ gpermission.h \
+ gpollableinputstream.h \
+ gpollableoutputstream.h \
+ gproxyaddress.h \
+ gproxy.h \
+ gproxyaddressenumerator.h \
+ gproxyresolver.h \
gresolver.h \
gseekable.h \
gsimpleasyncresult.h \
+ gsimplepermission.h \
gsocket.h \
gsocketaddress.h \
gsocketaddressenumerator.h \
gsocketservice.h \
gsrvtarget.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)
# these sources (also mentioned above) are generated.
BUILT_SOURCES = \
- gio-marshal.h \
- gio-marshal.c \
- gioalias.h \
- gioaliasdef.c \
gioenumtypes.h \
gioenumtypes.c \
$(NULL)
EXTRA_DIST += \
- gio-marshal.list \
gio.symbols \
gioenumtypes.h.template \
gioenumtypes.c.template \
makefile.msc \
- makegioalias.pl \
abicheck.sh \
- pltcheck.sh \
gio.rc.in \
gschema.dtd \
$(NULL)
BUILT_EXTRA_DIST = \
gio.rc
-CLEANFILES = \
- $(marshal_sources) \
- $(NULL)
+# 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 $@
+
+CLEANFILES = gio-public-headers.txt
+
+all-local: gio-public-headers.txt
gioenumtypes.h: $(gio_headers) gioenumtypes.h.template
- ( top_builddir=`cd $(top_builddir) && pwd`; \
+ $(AM_V_GEN) ( top_builddir=`cd $(top_builddir) && pwd`; \
cd $(srcdir) && $$top_builddir/gobject/glib-mkenums --template gioenumtypes.h.template $(gio_headers) ) > \
gioenumtypes.h.tmp && mv gioenumtypes.h.tmp gioenumtypes.h
gioenumtypes.c: $(gio_headers) gioenumtypes.c.template
- ( top_builddir=`cd $(top_builddir) && pwd`; \
+ $(AM_V_GEN) ( top_builddir=`cd $(top_builddir) && pwd`; \
cd $(srcdir) && $$top_builddir/gobject/glib-mkenums --template gioenumtypes.c.template $(gio_headers) ) > \
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:$@
-dist_bin_SCRIPTS = gsettings-schema-convert
bin_PROGRAMS = gio-querymodules glib-compile-schemas gsettings
gio_querymodules_SOURCES = gio-querymodules.c
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 \
bin_PROGRAMS += gdbus
gdbus_SOURCES = gdbus-tool.c
-gdbus_LDADD = libgio-2.0.la
+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
-completion_SCRIPTS = gdbus-bash-completion.sh
-EXTRA_DIST += $(completion_SCRIPTS)
+completion_DATA = \
+ gdbus-bash-completion.sh \
+ gsettings-bash-completion.sh
+EXTRA_DIST += $(completion_DATA)
# ------------------------------------------------------------------------
-dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj
+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) ;; \
*.c) echo ' <File RelativePath="..\..\..\gio\'$$F'" />' \
$(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) ;; \
+ *.c) echo ' <ClCompile Include="..\..\..\gio\'$$F'" />' \
+ ;; \
+ 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) ;; \
+ *.c) echo ' <ClCompile Include="..\..\..\gio\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
+ ;; \
+ 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)
projects / platform / upstream / glib.git / blobdiff