banshee r3734 - in trunk/banshee: build src/Extensions/Banshee.Podcasting src/Extensions/Banshee.Sample src/Libraries/Migo src/Libraries/Mtp

[abock svn gnome org]

Author: abock
Date: Wed Apr  9 21:47:10 2008
New Revision: 3734
URL: http://svn.gnome.org/viewvc/banshee?rev=3734&view=rev

Log:
Lots of minor build fixes

Modified:
   trunk/banshee/build/build.rules.mk
   trunk/banshee/src/Extensions/Banshee.Podcasting/   (props changed)
   trunk/banshee/src/Extensions/Banshee.Sample/   (props changed)
   trunk/banshee/src/Libraries/Migo/   (props changed)
   trunk/banshee/src/Libraries/Mtp/   (props changed)
   trunk/banshee/src/Libraries/Mtp/Makefile.am
   trunk/banshee/src/Libraries/Mtp/Mtp.mdp

Modified: trunk/banshee/build/build.rules.mk
==============================================================================
--- trunk/banshee/build/build.rules.mk	(original)
+++ trunk/banshee/build/build.rules.mk	Wed Apr  9 21:47:10 2008
@@ -13,6 +13,7 @@
 THEME_ICONS_RELATIVE = $(subst $(srcdir)/ThemeIcons/, , $(THEME_ICONS_SOURCE))
 
 CONFIG_FILES_IN = $(wildcard $(srcdir)/*.config.in)
+CONFIG_FILES_IN_CLEAN = $(CONFIG_FILES_IN:.config.in=.config)
 
 ASSEMBLY_EXTENSION = $(strip $(patsubst library, dll, $(TARGET)))
 ASSEMBLY_FILE = $(top_builddir)/bin/$(ASSEMBLY).$(ASSEMBLY_EXTENSION)
@@ -64,7 +65,7 @@
 
 EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) $(CONFIG_FILES_IN)
 
-CLEANFILES = $(OUTPUT_FILES) *.dll *.mdb *.exe
-DISTCLEANFILES = *.pidb
+CLEANFILES = $(OUTPUT_FILES)
+DISTCLEANFILES = *.pidb $(CONFIG_FILES_IN_CLEAN)
 MAINTAINERCLEANFILES = Makefile.in
 

Modified: trunk/banshee/src/Libraries/Mtp/Makefile.am
==============================================================================
--- trunk/banshee/src/Libraries/Mtp/Makefile.am	(original)
+++ trunk/banshee/src/Libraries/Mtp/Makefile.am	Wed Apr  9 21:47:10 2008
@@ -1,10 +1,7 @@
-if ENABLE_MTP
 ASSEMBLY = Mtp
 TARGET = library
 LINK = $(REF_MTP)
 
-#EXTRA_DIST = $(ASSEMBLY_SOURCES) $(ASSEMBLY).config.in
-
 SOURCES = \
 	Mtp/FileType.cs \
 	Mtp/ErrorCode.cs \
@@ -15,5 +12,9 @@
 	Mtp/MtpDevice.cs \
 	Mtp/Track.cs
 
+if ENABLE_MTP
 include $(top_srcdir)/build/build.mk
+else
+EXTRA_DIST = $(SOURCES) *.config.in
 endif
+

Modified: trunk/banshee/src/Libraries/Mtp/Mtp.mdp
==============================================================================
--- trunk/banshee/src/Libraries/Mtp/Mtp.mdp	(original)
+++ trunk/banshee/src/Libraries/Mtp/Mtp.mdp	Wed Apr  9 21:47:10 2008
@@ -1,44 +1,25 @@
-<Project name="libmtp-sharp" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
+<Project name="Mtp" fileversion="2.0" UseParentDirectoryAsNamespace="True" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="bin/Debug" assembly="Mtp" />
+      <Output directory="../../../bin" assembly="Mtp" />
       <Build debugmode="True" target="Library" />
-      <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
-      <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
-    </Configuration>
-    <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="bin/Release" assembly="Mtp" />
-      <Build debugmode="False" target="Library" />
-      <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
   </Configurations>
   <Contents>
-    <File name="AssemblyInfo.cs" subtype="Code" buildaction="Compile" />
-    <File name="Base" subtype="Directory" buildaction="Compile" />
-    <File name="Base/MtpDeviceStruct.cs" subtype="Code" buildaction="Compile" />
-    <File name="Base/TrackStruct.cs" subtype="Code" buildaction="Compile" />
-    <File name="Base/Playlist.cs" subtype="Code" buildaction="Compile" />
-    <File name="Base/File.cs" subtype="Code" buildaction="Compile" />
-    <File name="Base/Error.cs" subtype="Code" buildaction="Compile" />
-    <File name="Base/FolderStruct.cs" subtype="Code" buildaction="Compile" />
-    <File name="Base/FileSampleData.cs" subtype="Code" buildaction="Compile" />
-    <File name="Base/DeviceStorage.cs" subtype="Code" buildaction="Compile" />
-    <File name="Base/DeviceEntry.cs" subtype="Code" buildaction="Compile" />
-    <File name="Base/Album.cs" subtype="Code" buildaction="Compile" />
-    <File name="Base/Enums.cs" subtype="Code" buildaction="Compile" />
-    <File name="Functions" subtype="Directory" buildaction="Compile" />
-    <File name="Functions/TrackManagement.cs" subtype="Code" buildaction="Compile" />
-    <File name="Functions/FunctionCalls.cs" subtype="Code" buildaction="Compile" />
-    <File name="Functions/FileManagement.cs" subtype="Code" buildaction="Compile" />
-    <File name="Functions/FolderManagement.cs" subtype="Code" buildaction="Compile" />
-    <File name="Functions/PlaylistManagement.cs" subtype="Code" buildaction="Compile" />
-    <File name="Functions/AlbumManagement.cs" subtype="Code" buildaction="Compile" />
-    <File name="MtpDevice.cs" subtype="Code" buildaction="Compile" />
-    <File name="Track.cs" subtype="Code" buildaction="Compile" />
-    <File name="Folder.cs" subtype="Code" buildaction="Compile" />
   </Contents>
   <References>
     <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   </References>
-</Project>
\ No newline at end of file
+  <Deployment.LinuxDeployData generateScript="False" />
+  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile.am">
+    <BuildFilesVar Sync="True" Name="SOURCES" />
+    <DeployFilesVar />
+    <ResourcesVar />
+    <OthersVar />
+    <GacRefVar />
+    <AsmRefVar />
+    <ProjectRefVar />
+  </MonoDevelop.Autotools.MakefileInfo>
+</Project>