Fix distcheck
[platform/upstream/glib.git] / gio / Makefile.am
index b715e3c..2bb4450 100644 (file)
@@ -24,8 +24,8 @@ 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
+       $(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) > $(builddir)/gio.def.tmp && \
+         mv $(builddir)/gio.def.tmp $(builddir)/gio.def
 
 if OS_LINUX
 if HAVE_GNUC_VISIBILITY
@@ -64,6 +64,7 @@ gdbus_headers =                       \
        gdbusobjectmanager.h            \
        gdbusobjectmanagerclient.h      \
        gdbusobjectmanagerserver.h      \
+       gtestdbus.h                     \
        $(NULL)
 
 gdbus_sources =                                                        \
@@ -93,10 +94,25 @@ 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               \
        gsettings.h
 
 settings_sources = \
@@ -111,6 +127,7 @@ settings_sources = \
        gsettingsbackendinternal.h      \
        gsettingsbackend.c              \
        gsettingsschema.h               \
+       gsettingsschema-internal.h      \
        gsettingsschema.c               \
        gsettings-mapping.h             \
        gsettings-mapping.c             \
@@ -122,23 +139,51 @@ 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                 \
-       gapplicationcommandline.h       \
-       gapplication.h
+                                       \
+       gmenumodel.h                    \
+       gmenu.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                         \
-       gapplicationcommandline.c               \
-       gapplicationimpl.h                      \
-       gapplicationimpl-dbus.c                 \
-       gapplication.c
+                                               \
+       gmenumodel.c                            \
+       gmenu.c                                 \
+       gmenuexporter.c                         \
+       gdbusmenumodel.c                        \
+       $(NULL)
 
 local_sources = \
        glocaldirectorymonitor.c        \
@@ -177,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
@@ -216,6 +267,8 @@ unix_sources = \
        gunixvolumemonitor.h    \
        gunixinputstream.c      \
        gunixoutputstream.c     \
+       gcontenttype.c          \
+       gcontenttypeprivate.h   \
        $(NULL)
 
 
@@ -232,9 +285,25 @@ giounixinclude_HEADERS = \
        gunixoutputstream.h     \
        gunixsocketaddress.h    \
        $(NULL)
+
+if HAVE_NETLINK
+unix_sources +=                         \
+       gnetworkmonitornetlink.c \
+       gnetworkmonitornetlink.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 \
@@ -266,7 +335,9 @@ giowin32include_HEADERS = \
 
 endif
 
-SUBDIRS += tests
+if BUILD_MODULAR_TESTS
+SUBDIRS += tests 
+endif
 
 libgio_2_0_la_SOURCES =                \
        gappinfo.c              \
@@ -277,8 +348,6 @@ libgio_2_0_la_SOURCES =             \
        gbufferedinputstream.c  \
        gbufferedoutputstream.c \
        gcancellable.c          \
-       gcontenttype.c          \
-       gcontenttypeprivate.h   \
        gcharsetconverter.c     \
        gconverter.c            \
        gconverterinputstream.c \
@@ -313,6 +382,7 @@ libgio_2_0_la_SOURCES =             \
        gfilteroutputstream.c   \
        gicon.c                 \
        ginetaddress.c          \
+       ginetaddressmask.c      \
        ginetsocketaddress.c    \
        ginitable.c             \
        ginputstream.c          \
@@ -330,16 +400,24 @@ libgio_2_0_la_SOURCES =           \
        gnativevolumemonitor.c  \
        gnativevolumemonitor.h  \
        gnetworkaddress.c       \
+       gnetworking.c           \
        gnetworkingprivate.h    \
+       gnetworkmonitor.c       \
+       gnetworkmonitorbase.c   \
+       gnetworkmonitorbase.h   \
        gnetworkservice.c       \
        goutputstream.c         \
        gpermission.c           \
        gpollableinputstream.c  \
        gpollableoutputstream.c \
+       gpollableutils.c        \
        gpollfilemonitor.c      \
        gpollfilemonitor.h      \
        gproxyresolver.c        \
        gresolver.c             \
+       gresource.c             \
+       gresourcefile.c         \
+       gresourcefile.h         \
        gseekable.c             \
        gsimpleasyncresult.c    \
        gsimplepermission.c     \
@@ -360,6 +438,7 @@ libgio_2_0_la_SOURCES =             \
        gproxyaddressenumerator.c \
        gsocketservice.c        \
        gsrvtarget.c            \
+       gtask.c                 \
        gtcpconnection.c        \
        gtcpwrapperconnection.c \
        gthreadedsocketservice.c\
@@ -415,14 +494,14 @@ no_undefined = -no-undefined
 endif
 
 if OS_WIN32_AND_DLL_COMPILATION
-export_symbols = -export-symbols gio.def
+export_symbols = -export-symbols $(builddir)/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
+       $(INSTALL) $(builddir)/gio.def $(DESTDIR)$(libdir)/gio-2.0.def
 
 uninstall-def-file:
        -rm $(DESTDIR)$(libdir)/gio-2.0.def
@@ -443,6 +522,12 @@ libgio_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
        -export-dynamic $(no_undefined) $(export_symbols)
 
+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)
 
 gio-win32-res.o: gio.rc
@@ -479,6 +564,7 @@ gio_headers =                       \
        gfilteroutputstream.h   \
        gicon.h                 \
        ginetaddress.h          \
+       ginetaddressmask.h      \
        ginetsocketaddress.h    \
        ginputstream.h          \
        ginitable.h             \
@@ -496,16 +582,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     \
@@ -519,6 +609,7 @@ gio_headers =                       \
        gsocketlistener.h       \
        gsocketservice.h        \
        gsrvtarget.h            \
+       gtask.h                 \
        gtcpconnection.h        \
        gtcpwrapperconnection.h \
        gthreadedsocketservice.h\
@@ -549,11 +640,16 @@ 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 +=                  \
+       data-to-c.pl            \
        gio.symbols             \
        gioenumtypes.h.template \
        gioenumtypes.c.template \
@@ -561,6 +657,8 @@ EXTRA_DIST +=                       \
        abicheck.sh             \
        gio.rc.in               \
        gschema.dtd             \
+       gconstructor_as_data.h  \
+       gnetworking.h.win32     \
        $(NULL)
 
 BUILT_EXTRA_DIST =             \
@@ -568,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 = 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
 
@@ -585,9 +688,20 @@ gioenumtypes.c: $(gio_headers) gioenumtypes.c.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
 
-bin_PROGRAMS = gio-querymodules glib-compile-schemas gsettings
+glib_compile_resources_LDADD = \
+       $(top_builddir)/glib/libglib-2.0.la \
+       $(top_builddir)/gobject/libgobject-2.0.la       \
+       libgio-2.0.la
+
+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  = \
@@ -597,8 +711,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             \
@@ -622,13 +740,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)'; \
@@ -639,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) ;; \
+               gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c|gcontenttype.c) ;; \
                *.c) echo '   <File RelativePath="..\..\..\gio\'$$F'" />' \
                     ;; \
                esac; \
@@ -650,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) ;; \
+               gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c|gcontenttype.c) ;; \
                *.c) echo '    <ClCompile Include="..\..\..\gio\'$$F'" />' \
                     ;; \
                esac; \
@@ -661,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) ;; \
+               gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c|gcontenttype.c) ;; \
                *.c) echo '    <ClCompile Include="..\..\..\gio\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
                     ;; \
                esac; \