build: Various fixes to get "make distcheck" to work

Generate all the binaries in a toplevel bin/ folder. As the generated makefiles wipe out the build folder during distclean, having it set to the project folder leads to bad things. Use $(srcdir) to find the various .snk files, so that they are found during an out-of-tree build, as "make distcheck" does it. Go over all the various assembly references, and do not require a specific version when it's not needed. Let MonoDevelop refresh the generated code in src/Mono.Upnp/Mono.Upnp.GtkClient/gtk-gui/.
mono · Feb 8, 2012 · 4390e89 · 4390e89
1 parent bf42138
commit 4390e89
Show file tree

Hide file tree

Showing 39 changed files with 1,492 additions and 1,617 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,7 @@ Makefile.in
 TestResult.xml
 aclocal.m4
 autom4te.cache/
+bin
 config.log
 config.status
 configure

diff --git a/Mono.Upnp.sln b/Mono.Upnp.sln
@@ -148,5 +148,6 @@ Global
 		$6.inheritsSet = VisualStudio
 		$6.inheritsScope = text/plain
 		$6.scope = text/plain
+		outputpath = bin
 	EndGlobalSection
 EndGlobal
diff --git a/src/Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.csproj b/src/Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.csproj
@@ -17,7 +17,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>.</OutputPath>
+    <OutputPath>..\..\..\bin</OutputPath>
     <DefineConstants>DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>.</OutputPath>
+    <OutputPath>..\..\..\bin</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
@@ -64,7 +64,7 @@
   <ProjectExtensions>
     <MonoDevelop>
       <Properties>
-        <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" IsAutotoolsProject="true" RelativeConfigureInPath="../../..">
+        <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" RelativeConfigureInPath="../../..">
           <BuildFilesVar />
           <DeployFilesVar />
           <ResourcesVar />

diff --git a/src/Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.make b/src/Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.make
@@ -4,26 +4,26 @@
 
 if ENABLE_DEBUG
 ASSEMBLY_COMPILER_COMMAND = gmcs
-ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG" "-keyfile:mono-ssdp.snk"
-ASSEMBLY = Mono.Ssdp.dll
+ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG" "-keyfile:$(srcdir)/mono-ssdp.snk"
+ASSEMBLY = ../../../bin/Mono.Ssdp.dll
 ASSEMBLY_MDB = $(ASSEMBLY).mdb
 COMPILE_TARGET = library
 PROJECT_REFERENCES = 
-BUILD_DIR = .
+BUILD_DIR = ../../../bin
 
-MONO_SSDP_DLL_MDB_SOURCE=Mono.Ssdp.dll.mdb
+MONO_SSDP_DLL_MDB_SOURCE=../../../bin/Mono.Ssdp.dll.mdb
 MONO_SSDP_DLL_MDB=$(BUILD_DIR)/Mono.Ssdp.dll.mdb
 
 endif
 
 if ENABLE_RELEASE
 ASSEMBLY_COMPILER_COMMAND = gmcs
-ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+ "-keyfile:mono-ssdp.snk"
-ASSEMBLY = Mono.Ssdp.dll
+ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+ "-keyfile:$(srcdir)/mono-ssdp.snk"
+ASSEMBLY = ../../../bin/Mono.Ssdp.dll
 ASSEMBLY_MDB = 
 COMPILE_TARGET = library
 PROJECT_REFERENCES = 
-BUILD_DIR = .
+BUILD_DIR = ../../../bin
 
 MONO_SSDP_DLL_MDB=
 

diff --git a/...o.Upnp.Dcp/Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1/Makefile.am b/...o.Upnp.Dcp/Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1/Makefile.am
@@ -6,20 +6,20 @@ EXTRA_DIST =
 if ENABLE_DEBUG
 ASSEMBLY_COMPILER_COMMAND = gmcs
 ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG"
-ASSEMBLY = Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll
+ASSEMBLY = ../../../../bin/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll
 ASSEMBLY_MDB = $(ASSEMBLY).mdb
 COMPILE_TARGET = library
 PROJECT_REFERENCES =  \
-	../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll
-BUILD_DIR = .
+	../../../../bin/Mono.Upnp.dll
+BUILD_DIR = ../../../../bin
 
-MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL_MDB_SOURCE=Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll.mdb
+MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL_MDB_SOURCE=../../../../bin/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll.mdb
 MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL_MDB=$(BUILD_DIR)/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll.mdb
-MONO_UPNP_DLL_SOURCE=../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll
-MONO_SSDP_DLL_SOURCE=../../../Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.dll
-MONO_SSDP_DLL_MDB_SOURCE=../../../Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.dll.mdb
+MONO_UPNP_DLL_SOURCE=../../../../bin/Mono.Upnp.dll
+MONO_SSDP_DLL_SOURCE=../../../../bin/Mono.Ssdp.dll
+MONO_SSDP_DLL_MDB_SOURCE=../../../../bin/Mono.Ssdp.dll.mdb
 MONO_SSDP_DLL_MDB=$(BUILD_DIR)/Mono.Ssdp.dll.mdb
-MONO_UPNP_DLL_MDB_SOURCE=../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll.mdb
+MONO_UPNP_DLL_MDB_SOURCE=../../../../bin/Mono.Upnp.dll.mdb
 MONO_UPNP_DLL_MDB=$(BUILD_DIR)/Mono.Upnp.dll.mdb
 
 endif
@@ -31,12 +31,12 @@ ASSEMBLY = MSMediaServerRegistrar1.dll
 ASSEMBLY_MDB = 
 COMPILE_TARGET = library
 PROJECT_REFERENCES =  \
-	../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll
+	../../../../bin/Mono.Upnp.dll
 BUILD_DIR = .
 
 MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL_MDB=
-MONO_UPNP_DLL_SOURCE=../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll
-MONO_SSDP_DLL_SOURCE=../../../Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.dll
+MONO_UPNP_DLL_SOURCE=../../../../bin/Mono.Upnp.dll
+MONO_SSDP_DLL_SOURCE=../../../../bin/Mono.Ssdp.dll
 MONO_SSDP_DLL_MDB=
 MONO_UPNP_DLL_MDB=
 
@@ -73,7 +73,7 @@ EXTRAS = \
 	mono.upnp.dcp.msmediareceiverregistrar1.pc.in 
 
 REFERENCES =  \
-	../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll \
+	../../../../bin/Mono.Upnp.dll \
 	System
 
 DLL_REFERENCES = 
@@ -88,8 +88,6 @@ MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_PC = $(BUILD_DIR)/mono.upnp.dcp.msmediar
 
 $(eval $(call emit-deploy-target,MONO_UPNP_DLL))
 $(eval $(call emit-deploy-target,MONO_SSDP_DLL))
-$(eval $(call emit-deploy-target,MONO_SSDP_DLL_MDB))
-$(eval $(call emit-deploy-target,MONO_UPNP_DLL_MDB))
 $(eval $(call emit-deploy-wrapper,MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_PC,mono.upnp.dcp.msmediareceiverregistrar1.pc))
 
 

diff --git a/...r1/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.csproj b/...r1/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.csproj
@@ -14,7 +14,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>.</OutputPath>
+    <OutputPath>..\..\..\..\bin</OutputPath>
     <DefineConstants>DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

diff --git a/...ono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.FileSystem.ConsoleServer/Makefile.am b/...ono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.FileSystem.ConsoleServer/Makefile.am
@@ -6,53 +6,62 @@ EXTRA_DIST =
 if ENABLE_DEBUG
 ASSEMBLY_COMPILER_COMMAND = gmcs
 ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG"
-ASSEMBLY = Mono.Upnp.Dcp.MediaServer1.FileSystem.ConsoleServer.exe
+ASSEMBLY = ../../../../bin/Mono.Upnp.Dcp.MediaServer1.FileSystem.ConsoleServer.exe
 ASSEMBLY_MDB = $(ASSEMBLY).mdb
 COMPILE_TARGET = exe
 PROJECT_REFERENCES =  \
-	../Mono.Upnp.Dcp.MediaServer1.FileSystem/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll \
-	../Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.dll \
-	../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll \
-	../Mono.Upnp.Dcp.MSMediaReceiverRegistrar1/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll
-BUILD_DIR = .
+	../../../../bin/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll \
+	../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll \
+	../../../../bin/Mono.Upnp.dll \
+	../../../../bin/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll
+BUILD_DIR = ../../../../bin
 
-MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_CONSOLESERVER_EXE_MDB_SOURCE=Mono.Upnp.Dcp.MediaServer1.FileSystem.ConsoleServer.exe.mdb
+MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_CONSOLESERVER_EXE_MDB_SOURCE=../../../../bin/Mono.Upnp.Dcp.MediaServer1.FileSystem.ConsoleServer.exe.mdb
 MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_CONSOLESERVER_EXE_MDB=$(BUILD_DIR)/Mono.Upnp.Dcp.MediaServer1.FileSystem.ConsoleServer.exe.mdb
-MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_DLL_SOURCE=../Mono.Upnp.Dcp.MediaServer1.FileSystem/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll
-MONO_UPNP_DCP_MEDIASERVER1_DLL_SOURCE=../Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.dll
-MONO_UPNP_DLL_SOURCE=../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll
-MONO_SSDP_DLL_SOURCE=../../../Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.dll
-MONO_SSDP_DLL_MDB_SOURCE=../../../Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.dll.mdb
+MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_DLL_SOURCE=../../../../bin/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll
+MONO_UPNP_DCP_MEDIASERVER1_DLL_SOURCE=../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll
+MONO_UPNP_DLL_SOURCE=../../../../bin/Mono.Upnp.dll
+MONO_SSDP_DLL_SOURCE=../../../../bin/Mono.Ssdp.dll
+MONO_SSDP_DLL_MDB_SOURCE=../../../../bin/Mono.Ssdp.dll.mdb
 MONO_SSDP_DLL_MDB=$(BUILD_DIR)/Mono.Ssdp.dll.mdb
-MONO_UPNP_DLL_MDB_SOURCE=../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll.mdb
+MONO_UPNP_DLL_MDB_SOURCE=../../../../bin/Mono.Upnp.dll.mdb
 MONO_UPNP_DLL_MDB=$(BUILD_DIR)/Mono.Upnp.dll.mdb
-MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL_SOURCE=../Mono.Upnp.Dcp.MSMediaReceiverRegistrar1/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll
+MONO_UPNP_DCP_MEDIASERVER1_DLL_MDB_SOURCE=../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll.mdb
+MONO_UPNP_DCP_MEDIASERVER1_DLL_MDB=$(BUILD_DIR)/Mono.Upnp.Dcp.MediaServer1.dll.mdb
+MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_DLL_MDB_SOURCE=../../../../bin/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll.mdb
+MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_DLL_MDB=$(BUILD_DIR)/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll.mdb
+MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL_SOURCE=../../../../bin/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll
 MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL=$(BUILD_DIR)/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll
+MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL_MDB_SOURCE=../../../../bin/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll.mdb
+MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL_MDB=$(BUILD_DIR)/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll.mdb
 MSMEDIASERVERREGISTRAR1_DLL=
 
 endif
 
 if ENABLE_RELEASE
 ASSEMBLY_COMPILER_COMMAND = gmcs
 ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+
-ASSEMBLY = Mono.Upnp.Dcp.MediaServer1.FileSystem.ConsoleServer.exe
+ASSEMBLY = ../../../../bin/Mono.Upnp.Dcp.MediaServer1.FileSystem.ConsoleServer.exe
 ASSEMBLY_MDB = 
 COMPILE_TARGET = exe
 PROJECT_REFERENCES =  \
-	../Mono.Upnp.Dcp.MediaServer1.FileSystem/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll \
-	../Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.dll \
-	../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll \
+	../../../../bin/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll \
+	../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll \
+	../../../../bin/Mono.Upnp.dll \
 	../Mono.Upnp.Dcp.MSMediaReceiverRegistrar1/MSMediaServerRegistrar1.dll
-BUILD_DIR = .
+BUILD_DIR = ../../../../bin
 
 MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_CONSOLESERVER_EXE_MDB=
-MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_DLL_SOURCE=../Mono.Upnp.Dcp.MediaServer1.FileSystem/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll
-MONO_UPNP_DCP_MEDIASERVER1_DLL_SOURCE=../Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.dll
-MONO_UPNP_DLL_SOURCE=../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll
-MONO_SSDP_DLL_SOURCE=../../../Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.dll
+MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_DLL_SOURCE=../../../../bin/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll
+MONO_UPNP_DCP_MEDIASERVER1_DLL_SOURCE=../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll
+MONO_UPNP_DLL_SOURCE=../../../../bin/Mono.Upnp.dll
+MONO_SSDP_DLL_SOURCE=../../../../bin/Mono.Ssdp.dll
 MONO_SSDP_DLL_MDB=
 MONO_UPNP_DLL_MDB=
+MONO_UPNP_DCP_MEDIASERVER1_DLL_MDB=
+MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_DLL_MDB=
 MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL=
+MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL_MDB=
 MSMEDIASERVERREGISTRAR1_DLL_SOURCE=../Mono.Upnp.Dcp.MSMediaReceiverRegistrar1/MSMediaServerRegistrar1.dll
 MSMEDIASERVERREGISTRAR1_DLL=$(BUILD_DIR)/MSMediaServerRegistrar1.dll
 
@@ -69,7 +78,10 @@ PROGRAMFILES = \
 	$(MONO_SSDP_DLL) \
 	$(MONO_SSDP_DLL_MDB) \
 	$(MONO_UPNP_DLL_MDB) \
+	$(MONO_UPNP_DCP_MEDIASERVER1_DLL_MDB) \
+	$(MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_DLL_MDB) \
 	$(MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL) \
+	$(MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL_MDB) \
 	$(MSMEDIASERVERREGISTRAR1_DLL)  
 
 BINARIES = \
@@ -96,10 +108,10 @@ EXTRAS = \
 	mono-upnp-simple-media-server.in 
 
 REFERENCES =  \
-	../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll \
-	../Mono.Upnp.Dcp.MediaServer1.FileSystem/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll \
-	../Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.dll \
-	../Mono.Upnp.Dcp.MSMediaReceiverRegistrar1/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll \
+	../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll \
+	../../../../bin/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll \
+	../../../../bin/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll \
+	../../../../bin/Mono.Upnp.dll \
 	System
 
 DLL_REFERENCES = 
@@ -114,13 +126,6 @@ MONO_UPNP_DLL = $(BUILD_DIR)/Mono.Upnp.dll
 MONO_SSDP_DLL = $(BUILD_DIR)/Mono.Ssdp.dll
 MONO_UPNP_SIMPLE_MEDIA_SERVER = $(BUILD_DIR)/mono-upnp-simple-media-server
 
-$(eval $(call emit-deploy-target,MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_DLL))
-$(eval $(call emit-deploy-target,MONO_UPNP_DCP_MEDIASERVER1_DLL))
-$(eval $(call emit-deploy-target,MONO_UPNP_DLL))
-$(eval $(call emit-deploy-target,MONO_SSDP_DLL))
-$(eval $(call emit-deploy-target,MONO_SSDP_DLL_MDB))
-$(eval $(call emit-deploy-target,MONO_UPNP_DLL_MDB))
-$(eval $(call emit-deploy-target,MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL))
 $(eval $(call emit-deploy-wrapper,MONO_UPNP_SIMPLE_MEDIA_SERVER,mono-upnp-simple-media-server,x))
 $(eval $(call emit-deploy-target,MSMEDIASERVERREGISTRAR1_DLL))
 

diff --git a/...rver1.FileSystem.ConsoleServer/Mono.Upnp.Dcp.MediaServer1.FileSystem.ConsoleServer.csproj b/...rver1.FileSystem.ConsoleServer/Mono.Upnp.Dcp.MediaServer1.FileSystem.ConsoleServer.csproj
@@ -14,7 +14,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>.</OutputPath>
+    <OutputPath>..\..\..\..\bin</OutputPath>
     <DefineConstants>DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>.</OutputPath>
+    <OutputPath>..\..\..\..\bin</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

diff --git a/...ono.Upnp.Dcp/Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.FileSystem/Makefile.am b/...ono.Upnp.Dcp/Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.FileSystem/Makefile.am
@@ -5,44 +5,47 @@ EXTRA_DIST =
 
 if ENABLE_DEBUG
 ASSEMBLY_COMPILER_COMMAND = gmcs
-ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG" "-keyfile:mono-upnp-dcp-mediaserver1-filesystem.snk"
-ASSEMBLY = Mono.Upnp.Dcp.MediaServer1.FileSystem.dll
+ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG" "-keyfile:$(srcdir)/mono-upnp-dcp-mediaserver1-filesystem.snk"
+ASSEMBLY = ../../../../bin/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll
 ASSEMBLY_MDB = $(ASSEMBLY).mdb
 COMPILE_TARGET = library
 PROJECT_REFERENCES =  \
-	../Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.dll \
-	../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll
-BUILD_DIR = .
+	../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll \
+	../../../../bin/Mono.Upnp.dll
+BUILD_DIR = ../../../../bin
 
-MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_DLL_MDB_SOURCE=Mono.Upnp.Dcp.MediaServer1.FileSystem.dll.mdb
+MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_DLL_MDB_SOURCE=../../../../bin/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll.mdb
 MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_DLL_MDB=$(BUILD_DIR)/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll.mdb
-MONO_UPNP_DCP_MEDIASERVER1_DLL_SOURCE=../Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.dll
-MONO_UPNP_DLL_SOURCE=../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll
-MONO_SSDP_DLL_SOURCE=../../../Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.dll
-MONO_SSDP_DLL_MDB_SOURCE=../../../Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.dll.mdb
+MONO_UPNP_DCP_MEDIASERVER1_DLL_SOURCE=../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll
+MONO_UPNP_DLL_SOURCE=../../../../bin/Mono.Upnp.dll
+MONO_SSDP_DLL_SOURCE=../../../../bin/Mono.Ssdp.dll
+MONO_SSDP_DLL_MDB_SOURCE=../../../../bin/Mono.Ssdp.dll.mdb
 MONO_SSDP_DLL_MDB=$(BUILD_DIR)/Mono.Ssdp.dll.mdb
-MONO_UPNP_DLL_MDB_SOURCE=../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll.mdb
+MONO_UPNP_DLL_MDB_SOURCE=../../../../bin/Mono.Upnp.dll.mdb
 MONO_UPNP_DLL_MDB=$(BUILD_DIR)/Mono.Upnp.dll.mdb
+MONO_UPNP_DCP_MEDIASERVER1_DLL_MDB_SOURCE=../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll.mdb
+MONO_UPNP_DCP_MEDIASERVER1_DLL_MDB=$(BUILD_DIR)/Mono.Upnp.Dcp.MediaServer1.dll.mdb
 
 endif
 
 if ENABLE_RELEASE
 ASSEMBLY_COMPILER_COMMAND = gmcs
-ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+ "-keyfile:mono-upnp-dcp-mediaserver1-filesystem.snk"
-ASSEMBLY = Mono.Upnp.Dcp.MediaServer1.FileSystem.dll
+ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+ "-keyfile:$(srcdir)/mono-upnp-dcp-mediaserver1-filesystem.snk"
+ASSEMBLY = ../../../../bin/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll
 ASSEMBLY_MDB = 
 COMPILE_TARGET = library
 PROJECT_REFERENCES =  \
-	../Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.dll \
-	../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll
-BUILD_DIR = .
+	../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll \
+	../../../../bin/Mono.Upnp.dll
+BUILD_DIR = ../../../../bin
 
 MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_DLL_MDB=
-MONO_UPNP_DCP_MEDIASERVER1_DLL_SOURCE=../Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.dll
-MONO_UPNP_DLL_SOURCE=../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll
-MONO_SSDP_DLL_SOURCE=../../../Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.dll
+MONO_UPNP_DCP_MEDIASERVER1_DLL_SOURCE=../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll
+MONO_UPNP_DLL_SOURCE=../../../../bin/Mono.Upnp.dll
+MONO_SSDP_DLL_SOURCE=../../../../bin/Mono.Ssdp.dll
 MONO_SSDP_DLL_MDB=
 MONO_UPNP_DLL_MDB=
+MONO_UPNP_DCP_MEDIASERVER1_DLL_MDB=
 
 endif
 
@@ -55,7 +58,8 @@ PROGRAMFILES = \
 	$(MONO_UPNP_DLL) \
 	$(MONO_SSDP_DLL) \
 	$(MONO_SSDP_DLL_MDB) \
-	$(MONO_UPNP_DLL_MDB)  
+	$(MONO_UPNP_DLL_MDB) \
+	$(MONO_UPNP_DCP_MEDIASERVER1_DLL_MDB)  
 
 LINUX_PKGCONFIG = \
 	$(MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_PC)  
@@ -91,8 +95,8 @@ EXTRAS = \
 	mono.upnp.dcp.mediaserver1.filesystem.pc.in 
 
 REFERENCES =  \
-	../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll \
-	../Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.dll \
+	../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll \
+	../../../../bin/Mono.Upnp.dll \
 	-pkg:taglib-sharp \
 	System
 
@@ -107,11 +111,6 @@ MONO_UPNP_DLL = $(BUILD_DIR)/Mono.Upnp.dll
 MONO_SSDP_DLL = $(BUILD_DIR)/Mono.Ssdp.dll
 MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_PC = $(BUILD_DIR)/mono.upnp.dcp.mediaserver1.filesystem.pc
 
-$(eval $(call emit-deploy-target,MONO_UPNP_DCP_MEDIASERVER1_DLL))
-$(eval $(call emit-deploy-target,MONO_UPNP_DLL))
-$(eval $(call emit-deploy-target,MONO_SSDP_DLL))
-$(eval $(call emit-deploy-target,MONO_SSDP_DLL_MDB))
-$(eval $(call emit-deploy-target,MONO_UPNP_DLL_MDB))
 $(eval $(call emit-deploy-wrapper,MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_PC,mono.upnp.dcp.mediaserver1.filesystem.pc))