[kdbus] Integrate kdbus core with new API.
[platform/upstream/glib.git] / gio / Makefile.am
index 86e2aef..bc77dc1 100644 (file)
@@ -1,6 +1,4 @@
-include $(top_srcdir)/Makefile.decl
-
-NULL =
+include $(top_srcdir)/glib.mk
 
 SUBDIRS = gdbus-2.0/codegen
 
@@ -10,7 +8,7 @@ endif
 
 if OS_WIN32_AND_DLL_COMPILATION
 if MS_LIB_AVAILABLE
-noinst_DATA = gio-2.0.lib
+noinst_DATA += gio-2.0.lib
 
 install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir)
 uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gio-2.0.lib
@@ -23,16 +21,6 @@ install-ms-lib:
 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
-
-if OS_LINUX
-if HAVE_GNUC_VISIBILITY
-TESTS = abicheck.sh
-endif
-endif
-
 AM_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"GLib-GIO\"                     \
        $(gmodule_INCLUDES)                             \
@@ -40,6 +28,8 @@ AM_CPPFLAGS = \
        -DGIO_COMPILATION                               \
        -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"  
 
+AM_CFLAGS = $(GLIB_WARN_CFLAGS)
+
 lib_LTLIBRARIES = libgio-2.0.la
 
 gdbus_headers =                        \
@@ -64,6 +54,7 @@ gdbus_headers =                       \
        gdbusobjectmanager.h            \
        gdbusobjectmanagerclient.h      \
        gdbusobjectmanagerserver.h      \
+       gtestdbus.h                     \
        $(NULL)
 
 gdbus_sources =                                                        \
@@ -93,8 +84,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               \
@@ -124,23 +129,58 @@ 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                       \
+       gpropertyaction.h               \
        gsimpleaction.h                 \
-       gapplicationcommandline.h       \
-       gapplication.h
+                                       \
+       gmenumodel.h                    \
+       gmenu.h                         \
+       gmenuexporter.h                 \
+       gdbusmenumodel.h                \
+       gnotification.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                               \
+       gpropertyaction.c                       \
        gsimpleaction.c                         \
-       gapplicationcommandline.c               \
-       gapplicationimpl.h                      \
-       gapplicationimpl-dbus.c                 \
-       gapplication.c
+                                               \
+       gmenumodel.c                            \
+       gmenu.c                                 \
+       gmenuexporter.c                         \
+       gdbusmenumodel.c                        \
+       gnotification-private.h                 \
+       gnotificationbackend.h                  \
+       gnotification.c                         \
+       gnotificationbackend.c                  \
+       $(NULL)
 
 local_sources = \
        glocaldirectorymonitor.c        \
@@ -167,6 +207,8 @@ local_sources = \
        gsocks4aproxy.h                 \
        gsocks5proxy.c                  \
        gsocks5proxy.h                  \
+       thumbnail-verify.h              \
+       thumbnail-verify.c              \
        $(NULL)
 
 platform_libadd =
@@ -179,6 +221,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
@@ -192,7 +240,7 @@ platform_libadd += win32/libgiowin32.la
 platform_deps += win32/libgiowin32.la
 endif
 
-SUBDIRS += .
+SUBDIRS += . tests
 
 if HAVE_FAM
 SUBDIRS += fam
@@ -200,7 +248,7 @@ endif
 
 if OS_UNIX
 appinfo_sources += gdesktopappinfo.c
-platform_libadd += xdgmime/libxdgmime.la $(RESOLVER_LIBADD)
+platform_libadd += xdgmime/libxdgmime.la
 platform_deps += xdgmime/libxdgmime.la
 unix_sources = \
        gfiledescriptorbased.c  \
@@ -218,6 +266,10 @@ unix_sources = \
        gunixvolumemonitor.h    \
        gunixinputstream.c      \
        gunixoutputstream.c     \
+       gcontenttype.c          \
+       gcontenttypeprivate.h   \
+       gfdonotificationbackend.c \
+       ggtknotificationbackend.c \
        $(NULL)
 
 
@@ -243,7 +295,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 \
@@ -264,7 +325,7 @@ win32_more_sources_for_vcproj = \
 
 if OS_WIN32
 appinfo_sources += gwin32appinfo.c gwin32appinfo.h
-platform_libadd += -lshlwapi -lws2_32 -ldnsapi
+platform_libadd += -lshlwapi -lws2_32 -ldnsapi -liphlpapi
 win32_sources = $(win32_actual_sources)
 
 giowin32includedir=$(includedir)/gio-win32-2.0/gio
@@ -275,24 +336,23 @@ giowin32include_HEADERS = \
 
 endif
 
-SUBDIRS += tests
-
 libgio_2_0_la_SOURCES =                \
        gappinfo.c              \
+       gappinfoprivate.h       \
        gasynchelper.c          \
        gasynchelper.h          \
        gasyncinitable.c        \
        gasyncresult.c          \
        gbufferedinputstream.c  \
        gbufferedoutputstream.c \
+       gbytesicon.c            \
        gcancellable.c          \
-       gcontenttype.c          \
-       gcontenttypeprivate.h   \
        gcharsetconverter.c     \
        gconverter.c            \
        gconverterinputstream.c \
        gconverteroutputstream.c        \
        gcredentials.c          \
+       gcredentialsprivate.h   \
        gdatainputstream.c      \
        gdataoutputstream.c     \
        gdrive.c                \
@@ -332,7 +392,11 @@ libgio_2_0_la_SOURCES =            \
        giomodule-priv.h        \
        gioscheduler.c          \
        giostream.c             \
+       gioprivate.h            \
+       giowin32-priv.h         \
        gloadableicon.c         \
+       gkdbus.c                \
+       gkdbusconnection.c      \
        gmount.c                \
        gmemoryinputstream.c    \
        gmemoryoutputstream.c   \
@@ -340,6 +404,7 @@ libgio_2_0_la_SOURCES =             \
        gnativevolumemonitor.c  \
        gnativevolumemonitor.h  \
        gnetworkaddress.c       \
+       gnetworking.c           \
        gnetworkingprivate.h    \
        gnetworkmonitor.c       \
        gnetworkmonitorbase.c   \
@@ -349,10 +414,17 @@ libgio_2_0_la_SOURCES =           \
        gpermission.c           \
        gpollableinputstream.c  \
        gpollableoutputstream.c \
+       gpollableutils.c        \
        gpollfilemonitor.c      \
        gpollfilemonitor.h      \
+       gproxy.c                \
+       gproxyaddress.c         \
+       gproxyaddressenumerator.c \
        gproxyresolver.c        \
        gresolver.c             \
+       gresource.c             \
+       gresourcefile.c         \
+       gresourcefile.h         \
        gseekable.c             \
        gsimpleasyncresult.c    \
        gsimplepermission.c     \
@@ -368,11 +440,13 @@ libgio_2_0_la_SOURCES =           \
        gsocketlistener.c       \
        gsocketoutputstream.c   \
        gsocketoutputstream.h   \
-       gproxy.c                \
-       gproxyaddress.c         \
-       gproxyaddressenumerator.c \
+       gsubprocesslauncher.c   \
+       gsubprocess.c           \
+       gsubprocesslauncher-private.h   \
        gsocketservice.c        \
        gsrvtarget.c            \
+       gsimpleproxyresolver.c  \
+       gtask.c                 \
        gtcpconnection.c        \
        gtcpwrapperconnection.c \
        gthreadedsocketservice.c\
@@ -410,9 +484,9 @@ libgio_2_0_la_SOURCES =             \
 EXTRA_DIST += strinfo.c
 
 libgio_2_0_la_LIBADD = \
-       $(top_builddir)/glib/libglib-2.0.la             \
        $(top_builddir)/gobject/libgobject-2.0.la       \
        $(top_builddir)/gmodule/libgmodule-2.0.la       \
+       $(top_builddir)/glib/libglib-2.0.la             \
        $(platform_libadd)                              \
        $(ZLIB_LIBS)                                    \
        $(SELINUX_LIBS)                                 \
@@ -428,33 +502,26 @@ no_undefined = -no-undefined
 endif
 
 if OS_WIN32_AND_DLL_COMPILATION
-export_symbols = -export-symbols 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
-
-uninstall-def-file:
-       -rm $(DESTDIR)$(libdir)/gio-2.0.def
-else
-install-def-file:
-uninstall-def-file:
-
-export_symbols = $(LIBTOOL_EXPORT_OPTIONS)
 endif
 
-install-data-local: install-ms-lib install-def-file
+install-data-local: install-ms-lib
        $(mkinstalldirs) $(DESTDIR)$(GIO_MODULE_DIR)
 
-uninstall-local: uninstall-ms-lib uninstall-def-file
+uninstall-local: uninstall-ms-lib
 
+libgio_2_0_la_CFLAGS = $(AM_CFLAGS) $(GLIB_HIDDEN_VISIBILITY_CFLAGS)
 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)
+       -export-dynamic $(no_undefined)
+
+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)
 
@@ -467,6 +534,7 @@ gio_headers =                       \
        gasyncresult.h          \
        gbufferedinputstream.h  \
        gbufferedoutputstream.h \
+       gbytesicon.h            \
        gcancellable.h          \
        gcontenttype.h          \
        gcharsetconverter.h     \
@@ -503,6 +571,8 @@ gio_headers =                       \
        giomodule.h             \
        gioscheduler.h          \
        giostream.h             \
+       gkdbus.h                \
+       gkdbusconnection.h      \
        gloadableicon.h         \
        gmount.h                \
        gmemoryinputstream.h    \
@@ -516,11 +586,13 @@ gio_headers =                     \
        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     \
@@ -534,6 +606,10 @@ gio_headers =                      \
        gsocketlistener.h       \
        gsocketservice.h        \
        gsrvtarget.h            \
+       gsimpleproxyresolver.h  \
+       gtask.h                 \
+       gsubprocess.h           \
+       gsubprocesslauncher.h   \
        gtcpconnection.h        \
        gtcpwrapperconnection.h \
        gthreadedsocketservice.h\
@@ -562,67 +638,96 @@ gioinclude_HEADERS =              \
        $(gio_headers)          \
        gioenumtypes.h
 
+nodist_gioinclude_HEADERS =    \
+       gnetworking.h           \
+       $(NULL)
+
 # these sources (also mentioned above) are generated.
-BUILT_SOURCES =                \
+BUILT_SOURCES +=               \
+       gconstructor_as_data.h  \
        gioenumtypes.h          \
        gioenumtypes.c          \
+       gdbus-daemon-generated.c \
+       gdbus-daemon-generated.h \
+       gnetworking.h           \
        $(NULL)
 
 EXTRA_DIST +=                  \
-       gio.symbols             \
+       data-to-c.pl            \
        gioenumtypes.h.template \
        gioenumtypes.c.template \
        makefile.msc            \
-       abicheck.sh             \
        gio.rc.in               \
        gschema.dtd             \
+       gconstructor_as_data.h  \
+       gnetworking.h.win32     \
        $(NULL)
 
-BUILT_EXTRA_DIST             \
+BUILT_EXTRA_DIST +=            \
        gio.rc
 
 # 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
 
 gioenumtypes.h: $(gio_headers) gioenumtypes.h.template
-       $(AM_V_GEN) ( top_builddir=`cd $(top_builddir) && pwd`; \
-         cd $(srcdir) && $$top_builddir/gobject/glib-mkenums --template gioenumtypes.h.template $(gio_headers) ) > \
+       $(AM_V_GEN) $(top_builddir)/gobject/glib-mkenums --template $(filter %.template,$^) $(filter-out %.template,$^) > \
            gioenumtypes.h.tmp && mv gioenumtypes.h.tmp gioenumtypes.h
 
 gioenumtypes.c: $(gio_headers) gioenumtypes.c.template
-       $(AM_V_GEN) ( top_builddir=`cd $(top_builddir) && pwd`; \
-         cd $(srcdir) && $$top_builddir/gobject/glib-mkenums --template gioenumtypes.c.template $(gio_headers) ) > \
+       $(AM_V_GEN) $(top_builddir)/gobject/glib-mkenums --template $(filter %.template,$^) $(filter-out %.template,$^) > \
            gioenumtypes.c.tmp && mv gioenumtypes.c.tmp gioenumtypes.c
 
+gio.def: libgio-2.0.la
+       $(AM_V_GEN) dumpbin.exe -exports .libs/libgio-2.0-0.dll | awk 'BEGIN { print "EXPORTS" } / +[[:digit:]]+ +[[:xdigit:]]+ +[[:xdigit:]]+/{ print $$4 }' > gio.def.tmp && mv gio.def.tmp gio.def
+
 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:$@
+       $(AM_V_GEN) lib.exe -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 gsettings
+bin_PROGRAMS = gio-querymodules glib-compile-schemas glib-compile-resources gsettings
+
+glib_compile_resources_LDADD = libgio-2.0.la           \
+       $(top_builddir)/gobject/libgobject-2.0.la       \
+       $(top_builddir)/glib/libglib-2.0.la             \
+       $(NULL)
+
+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  = \
-       $(top_builddir)/glib/libglib-2.0.la             \
+gio_querymodules_LDADD  = libgio-2.0.la                \
        $(top_builddir)/gobject/libgobject-2.0.la       \
        $(top_builddir)/gmodule/libgmodule-2.0.la       \
-       libgio-2.0.la                                   \
+       $(top_builddir)/glib/libglib-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             \
        glib-compile-schemas.c
 
-gsettings_LDADD = \
-       $(top_builddir)/glib/libglib-2.0.la             \
+gsettings_LDADD = libgio-2.0.la                        \
        $(top_builddir)/gobject/libgobject-2.0.la       \
-       libgio-2.0.la
+       $(top_builddir)/glib/libglib-2.0.la             \
+       $(NULL)
 gsettings_SOURCES = gsettings-tool.c
 
 schemadir = $(datadir)/glib-2.0/schemas
@@ -633,17 +738,42 @@ dist_schema_DATA = gschema.dtd
 
 bin_PROGRAMS += gdbus
 gdbus_SOURCES = gdbus-tool.c
-gdbus_LDADD = libgio-2.0.la \
-       $(top_builddir)/glib/libglib-2.0.la             \
-       $(top_builddir)/gobject/libgobject-2.0.la
+gdbus_LDADD = libgio-2.0.la                            \
+       $(top_builddir)/gobject/libgobject-2.0.la       \
+       $(top_builddir)/glib/libglib-2.0.la             \
+       $(NULL)
+
+if OS_UNIX
+# ------------------------------------------------------------------------
+# gapplication(1) tool
+bin_PROGRAMS += gapplication
+gapplication_SOURCES = gapplication-tool.c
+gapplication_LDADD = libgio-2.0.la                     \
+       $(top_builddir)/gobject/libgobject-2.0.la       \
+       $(top_builddir)/glib/libglib-2.0.la             \
+       $(NULL)
+endif
 
-completiondir = $(sysconfdir)/bash_completion.d
+completiondir = $(datadir)/bash-completion/completions
 completion_DATA = \
-       gdbus-bash-completion.sh                \
-       gsettings-bash-completion.sh
+       completion/gapplication                         \
+       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)/gobject/libgobject-2.0.la       \
+       $(top_builddir)/glib/libglib-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)'; \
@@ -654,7 +784,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; \
@@ -665,7 +795,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; \
@@ -676,7 +806,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; \