beagle r4728 - in trunk/beagle: . Filters

[dbera svn gnome org]

Author: dbera
Date: Sun Apr 20 16:20:54 2008
New Revision: 4728
URL: http://svn.gnome.org/viewvc/beagle?rev=4728&view=rev

Log:
Add taglib-sharp files to extra-dist.
Bump version to 0.3.6.1.


Modified:
   trunk/beagle/Filters/Makefile.am
   trunk/beagle/configure.in

Modified: trunk/beagle/Filters/Makefile.am
==============================================================================
--- trunk/beagle/Filters/Makefile.am	(original)
+++ trunk/beagle/Filters/Makefile.am	Sun Apr 20 16:20:54 2008
@@ -18,8 +18,6 @@
 	$(srcdir)/HtmlAgilityPack/MixedCodeDocument.cs	\
 	$(srcdir)/HtmlAgilityPack/tools.cs
 
-include TagLib/TagLib.sources
-
 include 7zip/7zip.sources
 
 # Local copy of http://svn.myrealbox.com/viewcvs/trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.RTF/
@@ -115,6 +113,8 @@
 	$(srcdir)/FilterVideo.cs	\
 	$(srcdir)/FilterXslt.cs
 
+########################################################
+
 if ENABLE_GSF_SHARP
 CSFILES += 				\
 	$(srcdir)/FilterOle.cs		\
@@ -126,11 +126,21 @@
 endif
 endif
 
+COND_CS_FILES = \
+	$(srcdir)/FilterOle.cs		\
+	$(srcdir)/FilterPPT.cs		\
+	$(srcdir)/FilterDOC.cs
+
+########################################################
+
 if HAS_LIBCHM
 CSFILES += 				\
 	$(srcdir)/FilterChm.cs
 endif
 
+COND_CS_FILES += $(srcdir)/FilterChm.cs
+
+########################################################
 
 LOCAL_ASSEMBLIES =				\
 	../Util/Util.dll			\
@@ -144,7 +154,9 @@
 	-r:System.Web			\
 	$(LOCAL_ASSEMBLIES:%=-r:%)
 
-RESOURCES =
+########################################################
+
+include TagLib/TagLib.sources
 
 if INTERNAL_TAGLIB
 CSFILES += $(TAGLIB_CSFILES)
@@ -152,6 +164,12 @@
 ASSEMBLIES += $(TAGLIB_SHARP_LIBS)
 endif
 
+COND_CS_FILES += $(TAGLIB_CSFILES)
+
+########################################################
+
+RESOURCES =
+
 $(TARGET): $(CSFILES) $(LOCAL_ASSEMBLIES)
 	$(CSC) -out:$@ $(CSFLAGS) $(CSFILES) $(ASSEMBLIES) $(RESOURCES)
 
@@ -165,12 +183,6 @@
 	rm -f $(DESTDIR)$(FILTERDIR)/$(TARGET)
 	rm -f $(DESTDIR)$(FILTERDIR)/$(TARGET).mdb
 
-COND_CS_FILES = \
-	$(srcdir)/FilterOle.cs		\
-	$(srcdir)/FilterPPT.cs		\
-	$(srcdir)/FilterDOC.cs		\
-	$(srcdir)/FilterChm.cs
-
 EXTRA_DIST =			\
 	$(CSFILES)		\
 	$(COND_CS_FILES)

Modified: trunk/beagle/configure.in
==============================================================================
--- trunk/beagle/configure.in	(original)
+++ trunk/beagle/configure.in	Sun Apr 20 16:20:54 2008
@@ -4,7 +4,7 @@
 
 AC_INIT(beagled/BeagleDaemon.cs)
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(beagle, 0.3.6)
+AM_INIT_AUTOMAKE(beagle, 0.3.6.1)
 
 ########################################################################