Fix list of sources in the gio Visual Studio project

List the additional sources needed in gio/Makefile.am, not in
gio.vcprojin. Fix broken usage of sort. Filter out Unix-only source
files.

diff --git a/build/win32/vs9/gio.vcprojin b/build/win32/vs9/gio.vcprojin
index 1772c46..b1f2930 100644 (file)
--- a/build/win32/vs9/gio.vcprojin
+++ b/build/win32/vs9/gio.vcprojin
@@ -160,15 +160,6 @@
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
 #include "libgio.sourcefiles"
-                       <File RelativePath="..\..\..\gio\gwin32appinfo.c" />
-                       <File RelativePath="..\..\..\gio\win32\gwin32directorymonitor.c" />
-                       <File RelativePath="..\..\..\gio\gwin32mount.c" />
-                       <File RelativePath="..\..\..\gio\gwin32resolver.c" />
-                       <File RelativePath="..\..\..\gio\gwin32volumemonitor.c" />
-                       <File RelativePath="..\..\..\gio\win32\gwinhttpfile.c" />
-                       <File RelativePath="..\..\..\gio\win32\gwinhttpfileinputstream.c" />
-                       <File RelativePath="..\..\..\gio\win32\gwinhttpfileoutputstream.c" />
-                       <File RelativePath="..\..\..\gio\win32\gwinhttpvfs.c" />
                </Filter>
                <Filter
                        Name="Header Files"

diff --git a/gio/Makefile.am b/gio/Makefile.am
index b0af5df..bdc897d 100644 (file)
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -207,6 +207,14 @@ win32_sources = \
        gwin32outputstream.h \
        $(NULL)
 
+win32_more_sources_for_vcproj = \
+       gwin32appinfo.c \
+       win32/gwin32directorymonitor.c \
+       win32/gwinhttpfile.c \
+       win32/gwinhttpfileinputstream.c \
+       win32/gwinhttpfileoutputstream.c \
+       win32/gwinhttpvfs.c
+
 giowin32includedir=$(includedir)/gio-win32-2.0/gio
 giowin32include_HEADERS = \
        gwin32inputstream.h \
@@ -530,13 +538,15 @@ dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj
          cp $$d/$$f $(distdir) || exit 1; done
 
 ../build/win32/vs9/gio.vcproj: $(top_srcdir)/build/win32/vs9/gio.vcprojin
-       for F in `echo $(libgio_2_0_la_SOURCES) $(win32_sources) | tr '/' '\\' | sort -u`; do \
+       for F in `echo $(libgio_2_0_la_SOURCES) $(win32_sources) $(win32_more_sources_for_vcproj) | tr '/' '\\'`; do \
                case $$F in \
+               gunix*.c|gdesktopappinfo.c) ;; \
                *.c) echo '   <File RelativePath="..\..\..\gio\'$$F'" />' \
                     ;; \
                esac; \
-       done >libgio.sourcefiles
+       done | sort -u >libgio.sourcefiles
        $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gio.vcprojin >$@
+       rm libgio.sourcefiles
 
 if HAVE_GLIB_RUNTIME_LIBDIR
 install-data-hook: