[f-spot] [xbuild] Cleaned up csproj files and autogen.sh

[Stephen Shaw <sshaw src gnome org>]

commit 6033ce72e4e18342cc6c5e96dbf83a162e0d4bf0
Author: Stephen Shaw <sshaw decriptor com>
Date:   Fri Jun 29 18:06:50 2012 -0600

    [xbuild] Cleaned up csproj files and autogen.sh

 autogen.sh                               |    3 ++-
 lib/unique-sharp/unique-sharp.csproj     |    5 +++++
 lib/unique-sharp/unique-sharp.dll.config |    4 ++++
 src/Clients/MainApp/MainApp.csproj       |   16 +++++++++++-----
 src/Clients/MainApp/f-spot.in            |    2 +-
 src/Core/FSpot.Cms/FSpot.Cms.csproj      |    5 +++++
 src/Core/FSpot.Core/FSpot.Core.csproj    |    5 +++++
 src/Core/FSpot.Gui/FSpot.Gui.csproj      |    5 +++++
 8 files changed, 38 insertions(+), 7 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index c568023..a7efe78 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -93,4 +93,5 @@ fi
 run ./configure --enable-maintainer-mode $@
 
 mkdir -p external
-cp -f `pkg-config --variable Libraries gtk-sharp-beans-2.0` external
+cp -f `pkg-config --variable assemblies_dir gtk-sharp-beans-2.0`/* external
+cp -f `pkg-config --variable assemblies_dir gio-sharp-2.0`/* external
diff --git a/lib/unique-sharp/unique-sharp.csproj b/lib/unique-sharp/unique-sharp.csproj
index 69ecfe6..c1b4077 100644
--- a/lib/unique-sharp/unique-sharp.csproj
+++ b/lib/unique-sharp/unique-sharp.csproj
@@ -48,4 +48,9 @@
     <Compile Include="unique\AssemblyInfo.cs" />
     <Compile Include="unique\MessageReceivedHandler.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="unique-sharp.dll.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/lib/unique-sharp/unique-sharp.dll.config b/lib/unique-sharp/unique-sharp.dll.config
new file mode 100644
index 0000000..02e103f
--- /dev/null
+++ b/lib/unique-sharp/unique-sharp.dll.config
@@ -0,0 +1,4 @@
+<configuration>
+  <dllmap dll="libunique-1.0-0.dll" target="libunique-1.0.so.0"/>
+</configuration>
+
diff --git a/src/Clients/MainApp/MainApp.csproj b/src/Clients/MainApp/MainApp.csproj
index 1d4f555..e02025b 100644
--- a/src/Clients/MainApp/MainApp.csproj
+++ b/src/Clients/MainApp/MainApp.csproj
@@ -330,13 +330,11 @@
     <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <Private>False</Private>
     </Reference>
-    <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Private>False</Private>
-      <Package>gio-sharp-2.0</Package>
-    </Reference>
     <Reference Include="gtk-sharp-beans">
       <HintPath>..\..\..\external\gtk-sharp-beans.dll</HintPath>
-      <Private>False</Private>
+    </Reference>
+    <Reference Include="gio-sharp">
+      <HintPath>..\..\..\external\gio-sharp.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -398,5 +396,13 @@
     <None Include="f-spot.exe.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="..\..\..\external\gtk-sharp-beans.dll.config">
+      <Link>gtk-sharp-beans.dll.config</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\..\external\gio-sharp.dll.config">
+      <Link>gio-sharp.dll.config</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 </Project>
diff --git a/src/Clients/MainApp/f-spot.in b/src/Clients/MainApp/f-spot.in
index ee10345..e48edf7 100644
--- a/src/Clients/MainApp/f-spot.in
+++ b/src/Clients/MainApp/f-spot.in
@@ -56,7 +56,7 @@ for arg in "$@"; do
 	x--uninstalled)
 	    echo "*** Running uninstalled f-spot ***"
 	    EXE_TO_RUN="./f-spot.exe"
-	    export MONO_PATH=../lib/gio-sharp/gio:../lib/gtk-sharp-beans:../lib/unique-sharp/unique:../bin:$MONO_PATH
+	    export MONO_PATH=../lib/unique-sharp/unique:../bin:$MONO_PATH
 	    ;;
     esac
 done
diff --git a/src/Core/FSpot.Cms/FSpot.Cms.csproj b/src/Core/FSpot.Cms/FSpot.Cms.csproj
index aed6b8a..703ed04 100644
--- a/src/Core/FSpot.Cms/FSpot.Cms.csproj
+++ b/src/Core/FSpot.Cms/FSpot.Cms.csproj
@@ -68,4 +68,9 @@
   <ItemGroup>
     <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="FSpot.Cms.dll.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Core/FSpot.Core/FSpot.Core.csproj b/src/Core/FSpot.Core/FSpot.Core.csproj
index 77e3e71..c602e42 100644
--- a/src/Core/FSpot.Core/FSpot.Core.csproj
+++ b/src/Core/FSpot.Core/FSpot.Core.csproj
@@ -94,4 +94,9 @@
   <ItemGroup>
     <Folder Include="FSpot.Core\" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="FSpot.Core.dll.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 </Project>
diff --git a/src/Core/FSpot.Gui/FSpot.Gui.csproj b/src/Core/FSpot.Gui/FSpot.Gui.csproj
index 7ab5f1c..6c3cfc3 100644
--- a/src/Core/FSpot.Gui/FSpot.Gui.csproj
+++ b/src/Core/FSpot.Gui/FSpot.Gui.csproj
@@ -124,4 +124,9 @@
     <Folder Include="FSpot.Widgets\" />
     <Folder Include="FSpot.Gui\" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="FSpot.Gui.dll.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file