From 1ae7c7d982b3f461dcab178b3d20a04aaa9d9d72 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Thu, 19 Jul 2012 23:15:59 +0800 Subject: [PATCH] gio/Makefile.am: Filter out gcontenttype.c for MSVC builds gcontenttype.c was split into gcontenttype.c and gcontenttype-win32.c in commit 32192ee9 ("Split gcontenttype.c"), so we don't want to include gcontenttype.c in the Visual C++ build as it is no longer a source file meant for Windows. Thanks to Thomas H.P. Anderson for pointing this out. --- gio/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gio/Makefile.am b/gio/Makefile.am index 3cdd03f84..20bcd8161 100644 --- a/gio/Makefile.am +++ b/gio/Makefile.am @@ -751,7 +751,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 ' ' \ ;; \ esac; \ @@ -762,7 +762,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 ' ' \ ;; \ esac; \ @@ -773,7 +773,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 ' Source Files' \ ;; \ esac; \