projects / platform / upstream / glib.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix distcheck
[platform/upstream/glib.git] / gio / Makefile.am
diff --git a/gio/Makefile.am b/gio/Makefile.am
index f34dfa3..2bb4450 100644 (file)
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -2,7 +2,6 @@ include $(top_srcdir)/Makefile.decl
 
 NULL =
 
-DIST_SUBDIRS =
 SUBDIRS = gdbus-2.0/codegen
 
 if OS_UNIX
@@ -65,6 +64,7 @@ gdbus_headers =                       \
        gdbusobjectmanager.h            \
        gdbusobjectmanagerclient.h      \
        gdbusobjectmanagerserver.h      \
+       gtestdbus.h                     \
        $(NULL)
 
 gdbus_sources =                                                        \
@@ -94,8 +94,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               \
@@ -160,6 +174,7 @@ application_sources = \
        gsimpleactiongroup.c                    \
        gremoteactiongroup.c                    \
        gactiongroupexporter.c                  \
+       gdbusactiongroup-private.h              \
        gdbusactiongroup.c                      \
        gaction.c                               \
        gsimpleaction.c                         \
@@ -207,6 +222,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
@@ -246,6 +267,8 @@ unix_sources = \
        gunixvolumemonitor.h    \
        gunixinputstream.c      \
        gunixoutputstream.c     \
+       gcontenttype.c          \
+       gcontenttypeprivate.h   \
        $(NULL)
 
 
@@ -271,7 +294,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 \
@@ -305,8 +337,6 @@ endif
 
 if BUILD_MODULAR_TESTS
 SUBDIRS += tests 
-else
-DIST_SUBDIRS += tests
 endif
 
 libgio_2_0_la_SOURCES =                \
@@ -318,8 +348,6 @@ libgio_2_0_la_SOURCES =             \
        gbufferedinputstream.c  \
        gbufferedoutputstream.c \
        gcancellable.c          \
-       gcontenttype.c          \
-       gcontenttypeprivate.h   \
        gcharsetconverter.c     \
        gconverter.c            \
        gconverterinputstream.c \
@@ -372,6 +400,7 @@ libgio_2_0_la_SOURCES =             \
        gnativevolumemonitor.c  \
        gnativevolumemonitor.h  \
        gnetworkaddress.c       \
+       gnetworking.c           \
        gnetworkingprivate.h    \
        gnetworkmonitor.c       \
        gnetworkmonitorbase.c   \
@@ -409,6 +438,7 @@ libgio_2_0_la_SOURCES =             \
        gproxyaddressenumerator.c \
        gsocketservice.c        \
        gsrvtarget.c            \
+       gtask.c                 \
        gtcpconnection.c        \
        gtcpwrapperconnection.c \
        gthreadedsocketservice.c\
@@ -495,7 +525,7 @@ libgio_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
 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)
@@ -552,6 +582,7 @@ gio_headers =                       \
        gmountoperation.h       \
        gnativevolumemonitor.h  \
        gnetworkaddress.h       \
+       gnetworking.h           \
        gnetworkmonitor.h       \
        gnetworkservice.h       \
        goutputstream.h         \
@@ -578,6 +609,7 @@ gio_headers =                       \
        gsocketlistener.h       \
        gsocketservice.h        \
        gsrvtarget.h            \
+       gtask.h                 \
        gtcpconnection.h        \
        gtcpwrapperconnection.h \
        gthreadedsocketservice.h\
@@ -611,6 +643,9 @@ BUILT_SOURCES =             \
        gconstructor_as_data.h  \
        gioenumtypes.h          \
        gioenumtypes.c          \
+       gdbus-daemon-generated.c \
+       gdbus-daemon-generated.h \
+       gnetworking.h           \
        $(NULL)
 
 EXTRA_DIST +=                  \
@@ -623,6 +658,7 @@ EXTRA_DIST +=                       \
        gio.rc.in               \
        gschema.dtd             \
        gconstructor_as_data.h  \
+       gnetworking.h.win32     \
        $(NULL)
 
 BUILT_EXTRA_DIST =             \
@@ -630,9 +666,14 @@ 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
 
@@ -699,11 +740,11 @@ 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            \
-       gresource-bash-completion.sh
+       completion/gdbus                                \
+       completion/gsettings                            \
+       completion/gresource
 EXTRA_DIST += $(completion_DATA)
 
 # ------------------------------------------------------------------------
@@ -728,7 +769,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 '   <File RelativePath="..\..\..\gio\'$$F'" />' \
                     ;; \
                esac; \
@@ -739,7 +780,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 '    <ClCompile Include="..\..\..\gio\'$$F'" />' \
                     ;; \
                esac; \
@@ -750,7 +791,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 '    <ClCompile Include="..\..\..\gio\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
                     ;; \
                esac; \
Domain: System / Base;