NULL =
-DIST_SUBDIRS =
SUBDIRS = gdbus-2.0/codegen
if OS_UNIX
gdbusobjectmanager.h \
gdbusobjectmanagerclient.h \
gdbusobjectmanagerserver.h \
+ gtestdbus.h \
$(NULL)
gdbus_sources = \
gdbusobjectmanager.h gdbusobjectmanager.c \
gdbusobjectmanagerclient.h gdbusobjectmanagerclient.c \
gdbusobjectmanagerserver.h gdbusobjectmanagerserver.c \
- gdbus-tests.h gdbus-tests.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 \
gsimpleactiongroup.c \
gremoteactiongroup.c \
gactiongroupexporter.c \
+ gdbusactiongroup-private.h \
gdbusactiongroup.c \
gaction.c \
gsimpleaction.c \
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
gunixvolumemonitor.h \
gunixinputstream.c \
gunixoutputstream.c \
+ gcontenttype.c \
+ gcontenttypeprivate.h \
$(NULL)
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 \
if BUILD_MODULAR_TESTS
SUBDIRS += tests
-else
-DIST_SUBDIRS += tests
endif
libgio_2_0_la_SOURCES = \
gbufferedinputstream.c \
gbufferedoutputstream.c \
gcancellable.c \
- gcontenttype.c \
- gcontenttypeprivate.h \
gcharsetconverter.c \
gconverter.c \
gconverterinputstream.c \
gnativevolumemonitor.c \
gnativevolumemonitor.h \
gnetworkaddress.c \
+ gnetworking.c \
gnetworkingprivate.h \
gnetworkmonitor.c \
gnetworkmonitorbase.c \
gproxyaddressenumerator.c \
gsocketservice.c \
gsrvtarget.c \
+ gtask.c \
gtcpconnection.c \
gtcpwrapperconnection.c \
gthreadedsocketservice.c\
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 += -framework Foundation
+libgio_2_0_la_LDFLAGS += -Wl,-framework,Foundation
endif
libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)
gmountoperation.h \
gnativevolumemonitor.h \
gnetworkaddress.h \
+ gnetworking.h \
gnetworkmonitor.h \
gnetworkservice.h \
goutputstream.h \
gsocketlistener.h \
gsocketservice.h \
gsrvtarget.h \
+ gtask.h \
gtcpconnection.h \
gtcpwrapperconnection.h \
gthreadedsocketservice.h\
gconstructor_as_data.h \
gioenumtypes.h \
gioenumtypes.c \
+ gdbus-daemon-generated.c \
+ gdbus-daemon-generated.h \
+ gnetworking.h \
$(NULL)
EXTRA_DIST += \
gio.rc.in \
gschema.dtd \
gconstructor_as_data.h \
+ gnetworking.h.win32 \
$(NULL)
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 = gio-public-headers.txt gconstructor_as_data.h
+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
$(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 \
- gresource-bash-completion.sh
+ completion/gdbus \
+ completion/gsettings \
+ completion/gresource
EXTRA_DIST += $(completion_DATA)
# ------------------------------------------------------------------------
../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 ' <File RelativePath="..\..\..\gio\'$$F'" />' \
;; \
esac; \
../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 ' <ClCompile Include="..\..\..\gio\'$$F'" />' \
;; \
esac; \
../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 ' <ClCompile Include="..\..\..\gio\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
;; \
esac; \