NULL =
-SUBDIRS=
+SUBDIRS = gdbus-codegen
if OS_UNIX
SUBDIRS += libasyncns xdgmime
$(uninstall_ms_lib_cmd)
gio.def: gio.symbols
- $(AM_V_GEN) (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
if OS_LINUX
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
- $(AM_V_GEN) $(glib_genmarshal) --prefix=_gio_marshal $(srcdir)/gio-marshal.list --header --internal > $@.tmp && \
- mv $@.tmp $@
-
-gio-marshal.c: gio-marshal.h gio-marshal.list
- $(AM_V_GEN) (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 \
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 = \
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 = \
gdelayedsettingsbackend.h \
gdelayedsettingsbackend.c \
gkeyfilesettingsbackend.c \
- gmemorysettingsbackend.h \
gmemorysettingsbackend.c \
- gnullsettingsbackend.h \
gnullsettingsbackend.c \
gsettingsbackendinternal.h \
gsettingsbackend.c \
gsimpleactiongroup.h \
gaction.h \
gsimpleaction.h \
+ gapplicationcommandline.h \
gapplication.h
application_sources = \
- gactiongroup.c \
- gsimpleactiongroup.c \
- gaction.c \
- gsimpleaction.c \
+ gactiongroup.c \
+ gsimpleactiongroup.c \
+ gaction.c \
+ gsimpleaction.c \
+ gapplicationcommandline.c \
+ gapplicationimpl.h \
+ gapplicationimpl-dbus.c \
gapplication.c
local_sources = \
platform_deps += win32/libgiowin32.la
endif
-
SUBDIRS += .
if HAVE_FAM
win32_more_sources_for_vcproj = \
gwin32appinfo.c \
+ gregistrysettingsbackend.c \
win32/gwin32directorymonitor.c \
win32/gwinhttpfile.c \
win32/gwinhttpfileinputstream.c \
gdummyfile.c \
gdummyproxyresolver.c \
gdummyproxyresolver.h \
+ gdummytlsbackend.c \
+ gdummytlsbackend.h \
gemblem.h \
gemblem.c \
gemblemedicon.h \
gnetworkservice.c \
goutputstream.c \
gpermission.c \
+ gpollableinputstream.c \
+ gpollableoutputstream.c \
gpollfilemonitor.c \
gpollfilemonitor.h \
gproxyresolver.c \
gproxy.c \
gproxyaddress.c \
gproxyaddressenumerator.c \
- gproxyconnection.c \
- gproxyconnection.h \
gsocketservice.c \
gsrvtarget.c \
gtcpconnection.c \
+ gtcpwrapperconnection.c \
gthreadedsocketservice.c\
gthemedicon.c \
gthreadedresolver.c \
gthreadedresolver.h \
+ gtimezonemonitor.c \
+ gtlsbackend.c \
+ gtlscertificate.c \
+ gtlsclientconnection.c \
+ gtlsconnection.c \
+ gtlsserverconnection.c \
gunionvolumemonitor.c \
gunionvolumemonitor.h \
gvfs.c \
$(settings_sources) \
$(gdbus_sources) \
$(local_sources) \
- $(marshal_sources) \
$(NULL)
-EXTRA_DIST += gnullapplication.c gdbusapplication.c strinfo.c
-
-$(libgio_2_0_la_OBJECTS): $(marshal_sources)
+EXTRA_DIST += strinfo.c
libgio_2_0_la_LIBADD = \
$(top_builddir)/glib/libglib-2.0.la \
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
gnetworkservice.h \
goutputstream.h \
gpermission.h \
+ gpollableinputstream.h \
+ gpollableoutputstream.h \
gproxyaddress.h \
gproxy.h \
gproxyaddressenumerator.h \
gsocketservice.h \
gsrvtarget.h \
gtcpconnection.h \
+ gtcpwrapperconnection.h \
gthreadedsocketservice.h\
gthemedicon.h \
+ gtimezonemonitor.h \
+ gtlsbackend.h \
+ gtlscertificate.h \
+ gtlsclientconnection.h \
+ gtlsconnection.h \
+ gtlsserverconnection.h \
gvfs.h \
gvolume.h \
gvolumemonitor.h \
# these sources (also mentioned above) are generated.
BUILT_SOURCES = \
- gio-marshal.h \
- gio-marshal.c \
gioenumtypes.h \
gioenumtypes.c \
$(NULL)
EXTRA_DIST += \
- gio-marshal.list \
gio.symbols \
gioenumtypes.h.template \
gioenumtypes.c.template \
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) > $@.tmp && mv $@.tmp $@
+
+CLEANFILES = gio-public-headers.txt
+
+all-local: gio-public-headers.txt
gioenumtypes.h: $(gio_headers) gioenumtypes.h.template
$(AM_V_GEN) ( top_builddir=`cd $(top_builddir) && pwd`; \
$(top_builddir)/gobject/libgobject-2.0.la
completiondir = $(sysconfdir)/bash_completion.d
-completion_SCRIPTS = \
+completion_DATA = \
gdbus-bash-completion.sh \
gsettings-bash-completion.sh
-EXTRA_DIST += $(completion_SCRIPTS)
+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_actual_sources) $(win32_actual_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)