beagle r4599 - in branches/beagle-win32-branch/src: Beagle.Daemon Beagle.Daemon/Beagle.Daemon Beagle.Engine Beagle.Engine/Beagle.Engine

From: llipka svn gnome org
To: svn-commits-list gnome org
Subject: beagle r4599 - in branches/beagle-win32-branch/src: Beagle.Daemon Beagle.Daemon/Beagle.Daemon Beagle.Engine Beagle.Engine/Beagle.Engine
Date: Mon, 10 Mar 2008 00:17:16 +0000 (GMT)
Author: llipka
Date: Mon Mar 10 00:17:16 2008
New Revision: 4599
URL: http://svn.gnome.org/viewvc/beagle?rev=4599&view=rev

Log:
Get this building and able to run (althought it still crashes) on Linux.

Added:
   branches/beagle-win32-branch/src/Beagle.Daemon/Beagle.Daemon/RemoteIndexer.cs
      - copied, changed from r4579, /branches/beagle-win32-branch/src/Beagle.Engine/Beagle.Engine/RemoteIndexer.cs
Removed:
   branches/beagle-win32-branch/src/Beagle.Engine/Beagle.Engine/RemoteIndexer.cs
Modified:
   branches/beagle-win32-branch/src/Beagle.Daemon/Beagle.Daemon/BeagleDaemon.cs
   branches/beagle-win32-branch/src/Beagle.Daemon/Makefile.am
   branches/beagle-win32-branch/src/Beagle.Engine/AssemblyInfo.cs.in

Modified: branches/beagle-win32-branch/src/Beagle.Daemon/Beagle.Daemon/BeagleDaemon.cs
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Daemon/Beagle.Daemon/BeagleDaemon.cs	(original)
+++ branches/beagle-win32-branch/src/Beagle.Daemon/Beagle.Daemon/BeagleDaemon.cs	Mon Mar 10 00:17:16 2008
@@ -34,6 +34,7 @@
 using Thread = System.Threading.Thread;
 using GLib;
 
+using Beagle.Engine;
 using Beagle.Util;
 using Log = Beagle.Util.Log;
 using Stopwatch = Beagle.Util.Stopwatch;

Copied: branches/beagle-win32-branch/src/Beagle.Daemon/Beagle.Daemon/RemoteIndexer.cs (from r4579, /branches/beagle-win32-branch/src/Beagle.Engine/Beagle.Engine/RemoteIndexer.cs)
==============================================================================
--- /branches/beagle-win32-branch/src/Beagle.Engine/Beagle.Engine/RemoteIndexer.cs	(original)
+++ branches/beagle-win32-branch/src/Beagle.Daemon/Beagle.Daemon/RemoteIndexer.cs	Mon Mar 10 00:17:16 2008
@@ -31,10 +31,11 @@
 using Mono.Unix;
 
 using Beagle;
+using Beagle.Engine;
 using Beagle.Util;
 using Stopwatch = Beagle.Util.Stopwatch;
 
-namespace Beagle.Engine {
+namespace Beagle.Daemon {
 
 	public class RemoteIndexer : IIndexer {
 

Modified: branches/beagle-win32-branch/src/Beagle.Daemon/Makefile.am
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Daemon/Makefile.am	(original)
+++ branches/beagle-win32-branch/src/Beagle.Daemon/Makefile.am	Mon Mar 10 00:17:16 2008
@@ -1,30 +1,12 @@
-# Warnings we don't want to see.
-# Most of these are thanks to DotLucene.  It would be nice if we could use
-# "#pragma warning" on these.
-#
-# 0162 = Unreachable code detected
-# 0164 = This label has not been referenced
-# 0168 = The variable 'foo' is declared but never used
-# 0169 = The private method/field 'foo' is never used
-# 0219 = Variable is assigned but never used
-
 CSC = $(MCS) -debug
+CSC_FLAGS = -target:exe $(BEAGLE_DEFINES)
 
+if ENABLE_AVAHI
+CSC_FLAGS += -define:ENABLE_AVAHI
+endif
 
-PLUGIN_LOCAL_ASSEMBLIES =			\
-	../Util/Util.dll			\
-	../BeagleClient/Beagle.dll
-
-PLUGIN_ASSEMBLIES =				\
-	-r:Mono.Posix				\
-	$(BEAGLED_LIBS)                 	\
-	$(PLUGIN_LOCAL_ASSEMBLIES:%=-r:%)
-
-
-$(PLUGIN_TARGET): $(PLUGIN_CSFILES) $(PLUGIN_LOCAL_ASSEMBLIES)
-	$(CSC) -out:$@ $(PLUGIN_CSFLAGS) $(PLUGIN_CSFILES) $(PLUGIN_ASSEMBLIES)
-
-############################################################
+ASSEMBLY_NAME = Beagle.Daemon
+ASSEMBLY = $(ASSEMBLY_NAME).exe
 
 WRAPPER_IN = wrapper.in
 WRAPPER_SED = sed 					\
@@ -36,988 +18,45 @@
 	-e "s|\ bash\@|$(BASH)|"			\
 	-e "s|\ wrapper\@|$@|g"
 
-############################################################
-
-lucenedir = $(srcdir)/Lucene.Net
-
-LUCENE_1_9_CSFILES =							\
-	$(lucenedir)/Analysis/Standard/CharStream.cs			\
-	$(lucenedir)/Analysis/Standard/FastCharStream.cs		\
-	$(lucenedir)/Analysis/Standard/ParseException.cs		\
-	$(lucenedir)/Analysis/Standard/StandardAnalyzer.cs		\
-	$(lucenedir)/Analysis/Standard/StandardFilter.cs		\
-	$(lucenedir)/Analysis/Standard/StandardTokenizer.cs		\
-	$(lucenedir)/Analysis/Standard/StandardTokenizerConstants.cs	\
-	$(lucenedir)/Analysis/Standard/StandardTokenizerTokenManager.cs	\
-	$(lucenedir)/Analysis/Standard/Token.cs				\
-	$(lucenedir)/Analysis/Standard/TokenMgrError.cs			\
-	$(lucenedir)/Analysis/Analyzer.cs				\
-	$(lucenedir)/Analysis/CharTokenizer.cs				\
-	$(lucenedir)/Analysis/ISOLatin1AccentFilter.cs			\
-	$(lucenedir)/Analysis/KeywordAnalyzer.cs			\
-	$(lucenedir)/Analysis/KeywordTokenizer.cs			\
-	$(lucenedir)/Analysis/LengthFilter.cs				\
-	$(lucenedir)/Analysis/LetterTokenizer.cs			\
-	$(lucenedir)/Analysis/LowerCaseFilter.cs			\
-	$(lucenedir)/Analysis/LowerCaseTokenizer.cs			\
-	$(lucenedir)/Analysis/PerFieldAnalyzerWrapper.cs		\
-	$(lucenedir)/Analysis/PorterStemFilter.cs			\
-	$(lucenedir)/Analysis/PorterStemmer.cs				\
-	$(lucenedir)/Analysis/SimpleAnalyzer.cs				\
-	$(lucenedir)/Analysis/StopAnalyzer.cs				\
-	$(lucenedir)/Analysis/StopFilter.cs				\
-	$(lucenedir)/Analysis/Token.cs					\
-	$(lucenedir)/Analysis/TokenFilter.cs				\
-	$(lucenedir)/Analysis/Tokenizer.cs				\
-	$(lucenedir)/Analysis/TokenStream.cs				\
-	$(lucenedir)/Analysis/WhitespaceAnalyzer.cs			\
-	$(lucenedir)/Analysis/WhitespaceTokenizer.cs			\
-	$(lucenedir)/Analysis/WordlistLoader.cs				\
-	$(lucenedir)/Document/DateField.cs				\
-	$(lucenedir)/Document/DateTools.cs				\
-	$(lucenedir)/Document/Document.cs				\
-	$(lucenedir)/Document/Field.cs					\
-	$(lucenedir)/Document/NumberTools.cs				\
-	$(lucenedir)/Index/CompoundFileReader.cs			\
-	$(lucenedir)/Index/CompoundFileWriter.cs			\
-	$(lucenedir)/Index/DocumentWriter.cs				\
-	$(lucenedir)/Index/FieldInfo.cs					\
-	$(lucenedir)/Index/FieldInfos.cs				\
-	$(lucenedir)/Index/FieldsReader.cs				\
-	$(lucenedir)/Index/FieldsWriter.cs				\
-	$(lucenedir)/Index/FilterIndexReader.cs				\
-	$(lucenedir)/Index/IndexFileNameFilter.cs			\
-	$(lucenedir)/Index/IndexFileNames.cs				\
-	$(lucenedir)/Index/IndexModifier.cs				\
-	$(lucenedir)/Index/IndexReader.cs				\
-	$(lucenedir)/Index/IndexWriter.cs				\
-	$(lucenedir)/Index/MultipleTermPositions.cs			\
-	$(lucenedir)/Index/MultiReader.cs				\
-	$(lucenedir)/Index/ParallelReader.cs				\
-	$(lucenedir)/Index/SegmentInfo.cs				\
-	$(lucenedir)/Index/SegmentInfos.cs				\
-	$(lucenedir)/Index/SegmentMergeInfo.cs				\
-	$(lucenedir)/Index/SegmentMergeQueue.cs				\
-	$(lucenedir)/Index/SegmentMerger.cs				\
-	$(lucenedir)/Index/SegmentReader.cs				\
-	$(lucenedir)/Index/SegmentTermDocs.cs				\
-	$(lucenedir)/Index/SegmentTermEnum.cs				\
-	$(lucenedir)/Index/SegmentTermPositions.cs			\
-	$(lucenedir)/Index/SegmentTermPositionVector.cs			\
-	$(lucenedir)/Index/SegmentTermVector.cs				\
-	$(lucenedir)/Index/Term.cs					\
-	$(lucenedir)/Index/TermBuffer.cs				\
-	$(lucenedir)/Index/TermDocs.cs					\
-	$(lucenedir)/Index/TermEnum.cs					\
-	$(lucenedir)/Index/TermFreqVector.cs				\
-	$(lucenedir)/Index/TermInfo.cs					\
-	$(lucenedir)/Index/TermInfosReader.cs				\
-	$(lucenedir)/Index/TermInfosWriter.cs				\
-	$(lucenedir)/Index/TermPositions.cs				\
-	$(lucenedir)/Index/TermPositionVector.cs			\
-	$(lucenedir)/Index/TermVectorOffsetInfo.cs			\
-	$(lucenedir)/Index/TermVectorsReader.cs				\
-	$(lucenedir)/Index/TermVectorsWriter.cs				\
-	$(lucenedir)/QueryParser/CharStream.cs				\
-	$(lucenedir)/QueryParser/FastCharStream.cs			\
-	$(lucenedir)/QueryParser/MultiFieldQueryParser.cs		\
-	$(lucenedir)/QueryParser/ParseException.cs			\
-	$(lucenedir)/QueryParser/QueryParser.cs				\
-	$(lucenedir)/QueryParser/QueryParserConstants.cs		\
-	$(lucenedir)/QueryParser/QueryParserTokenManager.cs		\
-	$(lucenedir)/QueryParser/Token.cs				\
-	$(lucenedir)/QueryParser/TokenMgrError.cs			\
-	$(lucenedir)/Search/Regex/RegexQuery.cs				\
-	$(lucenedir)/Search/Regex/RegexTermEnum.cs			\
-	$(lucenedir)/Search/Regex/SpanRegexQuery.cs			\
-	$(lucenedir)/Search/Spans/NearSpans.cs				\
-	$(lucenedir)/Search/Spans/SpanFirstQuery.cs			\
-	$(lucenedir)/Search/Spans/SpanNearQuery.cs			\
-	$(lucenedir)/Search/Spans/SpanNotQuery.cs			\
-	$(lucenedir)/Search/Spans/SpanOrQuery.cs			\
-	$(lucenedir)/Search/Spans/SpanQuery.cs				\
-	$(lucenedir)/Search/Spans/Spans.cs				\
-	$(lucenedir)/Search/Spans/SpanScorer.cs				\
-	$(lucenedir)/Search/Spans/SpanTermQuery.cs			\
-	$(lucenedir)/Search/Spans/SpanWeight.cs				\
-	$(lucenedir)/Search/BooleanClause.cs				\
-	$(lucenedir)/Search/BooleanQuery.cs				\
-	$(lucenedir)/Search/BooleanScorer.cs				\
-	$(lucenedir)/Search/BooleanScorer2.cs				\
-	$(lucenedir)/Search/CachingWrapperFilter.cs			\
-	$(lucenedir)/Search/ConjunctionScorer.cs			\
-	$(lucenedir)/Search/ConstantScoreQuery.cs			\
-	$(lucenedir)/Search/ConstantScoreRangeQuery.cs			\
-	$(lucenedir)/Search/DateFilter.cs				\
-	$(lucenedir)/Search/DefaultSimilarity.cs			\
-	$(lucenedir)/Search/DisjunctionMaxQuery.cs			\
-	$(lucenedir)/Search/DisjunctionMaxScorer.cs			\
-	$(lucenedir)/Search/DisjunctionSumScorer.cs			\
-	$(lucenedir)/Search/ExactPhraseScorer.cs			\
-	$(lucenedir)/Search/Explanation.cs				\
-	$(lucenedir)/Search/FieldCache.cs				\
-	$(lucenedir)/Search/FieldCacheImpl.cs				\
-	$(lucenedir)/Search/FieldDoc.cs					\
-	$(lucenedir)/Search/FieldDocSortedHitQueue.cs			\
-	$(lucenedir)/Search/FieldSortedHitQueue.cs			\
-	$(lucenedir)/Search/Filter.cs					\
-	$(lucenedir)/Search/FilteredQuery.cs				\
-	$(lucenedir)/Search/FilteredTermEnum.cs				\
-	$(lucenedir)/Search/FuzzyQuery.cs				\
-	$(lucenedir)/Search/FuzzyTermEnum.cs				\
-	$(lucenedir)/Search/Hit.cs					\
-	$(lucenedir)/Search/HitCollector.cs				\
-	$(lucenedir)/Search/HitIterator.cs				\
-	$(lucenedir)/Search/HitQueue.cs					\
-	$(lucenedir)/Search/Hits.cs					\
-	$(lucenedir)/Search/IndexSearcher.cs				\
-	$(lucenedir)/Search/MatchAllDocsQuery.cs			\
-	$(lucenedir)/Search/MultiPhraseQuery.cs				\
-	$(lucenedir)/Search/MultiSearcher.cs				\
-	$(lucenedir)/Search/MultiTermQuery.cs				\
-	$(lucenedir)/Search/NonMatchingScorer.cs			\
-	$(lucenedir)/Search/ParallelMultiSearcher.cs			\
-	$(lucenedir)/Search/PhrasePositions.cs				\
-	$(lucenedir)/Search/PhrasePrefixQuery.cs			\
-	$(lucenedir)/Search/PhraseQuery.cs				\
-	$(lucenedir)/Search/PhraseQueue.cs				\
-	$(lucenedir)/Search/PhraseScorer.cs				\
-	$(lucenedir)/Search/PrefixQuery.cs				\
-	$(lucenedir)/Search/Query.cs					\
-	$(lucenedir)/Search/QueryFilter.cs				\
-	$(lucenedir)/Search/QueryTermVector.cs				\
-	$(lucenedir)/Search/RangeFilter.cs				\
-	$(lucenedir)/Search/RangeQuery.cs				\
-	$(lucenedir)/Search/ReqExclScorer.cs				\
-	$(lucenedir)/Search/ReqOptSumScorer.cs				\
-	$(lucenedir)/Search/ScoreDoc.cs					\
-	$(lucenedir)/Search/ScoreDocComparator.cs			\
-	$(lucenedir)/Search/Scorer.cs					\
-	$(lucenedir)/Search/Searchable.cs				\
-	$(lucenedir)/Search/Searcher.cs					\
-	$(lucenedir)/Search/Similarity.cs				\
-	$(lucenedir)/Search/SimilarityDelegator.cs			\
-	$(lucenedir)/Search/SloppyPhraseScorer.cs			\
-	$(lucenedir)/Search/Sort.cs					\
-	$(lucenedir)/Search/SortComparator.cs				\
-	$(lucenedir)/Search/SortComparatorSource.cs			\
-	$(lucenedir)/Search/SortField.cs				\
-	$(lucenedir)/Search/TermQuery.cs				\
-	$(lucenedir)/Search/TermScorer.cs				\
-	$(lucenedir)/Search/TopDocs.cs					\
-	$(lucenedir)/Search/TopFieldDocs.cs				\
-	$(lucenedir)/Search/Weight.cs					\
-	$(lucenedir)/Search/WildcardQuery.cs				\
-	$(lucenedir)/Search/WildcardTermEnum.cs				\
-	$(lucenedir)/Store/BufferedIndexInput.cs			\
-	$(lucenedir)/Store/BufferedIndexOutput.cs			\
-	$(lucenedir)/Store/Directory.cs					\
-	$(lucenedir)/Store/FSDirectory.cs				\
-	$(lucenedir)/Store/IndexInput.cs				\
-	$(lucenedir)/Store/IndexOutput.cs				\
-	$(lucenedir)/Store/InputStream.cs				\
-	$(lucenedir)/Store/Lock.cs					\
-	$(lucenedir)/Store/MMapDirectory.cs				\
-	$(lucenedir)/Store/OutputStream.cs				\
-	$(lucenedir)/Store/RAMDirectory.cs				\
-	$(lucenedir)/Store/RAMFile.cs					\
-	$(lucenedir)/Store/RAMInputStream.cs				\
-	$(lucenedir)/Store/RAMOutputStream.cs				\
-	$(lucenedir)/Util/BitVector.cs					\
-	$(lucenedir)/Util/Constants.cs					\
-	$(lucenedir)/Util/Parameter.cs					\
-	$(lucenedir)/Util/PriorityQueue.cs				\
-	$(lucenedir)/Util/SmallFloat.cs					\
-	$(lucenedir)/Util/StringHelper.cs				\
-	$(lucenedir)/Util/ToStringUtils.cs				\
-	$(lucenedir)/LucenePackage.cs					\
-	$(lucenedir)/SharpZipLibAdapter.cs				\
-	$(lucenedir)/SupportClass.cs
-
-# Stuff we don't build because we don't use it and it
-# introduces additional library dependencies.
-IGNORED_LUCENE_CSFILES =			\
-        $(lucenedir)/Search/RemoteSearchable.cs
-
-LUCENE_CSFILES = $(LUCENE_1_9_CSFILES)
-
-############################################################
-
-snowballdir = $(srcdir)/Snowball.Net
-
-SNOWBALL_CSFILES =							\
-	$(snowballdir)/Lucene.Net/Analysis/Snowball/SnowballAnalyzer.cs	\
-	$(snowballdir)/Lucene.Net/Analysis/Snowball/SnowballFilter.cs	\
-	$(snowballdir)/SF/Snowball/Ext/ItalianStemmer.cs		\
-	$(snowballdir)/SF/Snowball/Ext/RussianStemmer.cs		\
-	$(snowballdir)/SF/Snowball/Ext/NorwegianStemmer.cs		\
-	$(snowballdir)/SF/Snowball/Ext/EnglishStemmer.cs		\
-	$(snowballdir)/SF/Snowball/Ext/German2Stemmer.cs		\
-	$(snowballdir)/SF/Snowball/Ext/FinnishStemmer.cs		\
-	$(snowballdir)/SF/Snowball/Ext/PortugueseStemmer.cs		\
-	$(snowballdir)/SF/Snowball/Ext/SpanishStemmer.cs		\
-	$(snowballdir)/SF/Snowball/Ext/FrenchStemmer.cs			\
-	$(snowballdir)/SF/Snowball/Ext/DanishStemmer.cs			\
-	$(snowballdir)/SF/Snowball/Ext/SwedishStemmer.cs		\
-	$(snowballdir)/SF/Snowball/Ext/DutchStemmer.cs			\
-	$(snowballdir)/SF/Snowball/Ext/GermanStemmer.cs			\
-	$(snowballdir)/SF/Snowball/Ext/LovinsStemmer.cs			\
-	$(snowballdir)/SF/Snowball/Ext/KpStemmer.cs			\
-	$(snowballdir)/SF/Snowball/Ext/PorterStemmer.cs			\
-	$(snowballdir)/SF/Snowball/Among.cs				\
-	$(snowballdir)/SF/Snowball/SnowballProgram.cs
-
-############################################################
-
-DAEMON_DLL_TARGET = BeagleDaemonLib.dll
-
-DAEMON_DLL_CSFLAGS = -target:library $(BEAGLE_DEFINES)
-
-fsqueryabledir = $(srcdir)/FileSystemQueryable
-FILE_SYSTEM_QUERYABLE_CSFILES =					\
-	$(fsqueryabledir)/DirectoryModel.cs			\
-	$(fsqueryabledir)/DirectoryState.cs			\
-	$(fsqueryabledir)/TreeCrawlTask.cs			\
-	$(fsqueryabledir)/FileCrawlTask.cs			\
-	$(fsqueryabledir)/DirectoryIndexableGenerator.cs	\
-	$(fsqueryabledir)/FileNameFilter.cs			\
-	$(fsqueryabledir)/InternalUriManager.cs			\
-	$(fsqueryabledir)/FileSystemQueryable.cs		\
-	$(fsqueryabledir)/IFileEventBackend.cs			\
-	$(fsqueryabledir)/InotifyBackend.cs			\
-	$(fsqueryabledir)/NullFileEventBackend.cs		\
-	$(fsqueryabledir)/XmpSidecarStore.cs
-
-
-
-pidginqueryable = $(srcdir)/PidginQueryable
-PIDGIN_QUERYABLE_CSFILES =					\
-	$(pidginqueryable)/PidginIndexableGenerator.cs		\
-	$(pidginqueryable)/PidginQueryable.cs
-
-tomboyqueryable = $(srcdir)/TomboyQueryable
-TOMBOY_QUERYABLE_CSFILES =					\
-	$(tomboyqueryable)/TomboyQueryable.cs
-
-labyrinthqueryable = $(srcdir)/LabyrinthQueryable
-LABYRINTH_QUERYABLE_CSFILES =					\
-	$(labyrinthqueryable)/LabyrinthQueryable.cs
-
-kmailqueryable = $(srcdir)/KMailQueryable
-KMAIL_QUERYABLE_CSFILES =					\
-	$(kmailqueryable)/KMailQueryable.cs			\
-	$(kmailqueryable)/KMailIndexableGenerator.cs		\
-	$(kmailqueryable)/KMailIndexer.cs
-
-blamqueryable = $(srcdir)/BlamQueryable
-BLAM_QUERYABLE_CSFILES =					\
-	$(blamqueryable)/BlamQueryable.cs
-
-lifereaqueryable = $(srcdir)/LifereaQueryable
-LIFEREA_QUERYABLE_CSFILES =					\
-	$(lifereaqueryable)/LifereaQueryable.cs
-
-akregatorqueryable = $(srcdir)/AkregatorQueryable
-AKREGATOR_QUERYABLE_CSFILES =					\
-	$(akregatorqueryable)/AkregatorQueryable.cs
-
-konqhistoryqueryable = $(srcdir)/KonqHistoryQueryable
-KONQHISTORY_QUERYABLE_CSFILES =					\
-	$(konqhistoryqueryable)/KonqQueryable.cs
-
-konqbookmarkqueryable = $(srcdir)/KonqBookmarkQueryable
-KONQBOOKMARK_QUERYABLE_CSFILES =				\
-	$(konqbookmarkqueryable)/KonqBookmarkQueryable.cs
-
-kopetequeryable = $(srcdir)/KopeteQueryable
-KOPETE_QUERYABLE_CSFILES =					\
-	$(kopetequeryable)/KopeteQueryable.cs 	 		\
-	$(kopetequeryable)/KopeteCrawler.cs
-
-empathyqueryable = $(srcdir)/EmpathyQueryable
-EMPATHY_QUERYABLE_CSFILES =					\
-	$(empathyqueryable)/EmpathyQueryable.cs 	 		\
-	$(empathyqueryable)/EmpathyCrawler.cs
-
-knotesqueryable = $(srcdir)/KNotesQueryable
-KNOTES_QUERYABLE_CSFILES =					\
-	$(knotesqueryable)/KNotesQueryable.cs
-
-korganizerqueryable = $(srcdir)/KOrganizerQueryable
-KORGANIZER_QUERYABLE_CSFILES =					\
-	$(korganizerqueryable)/KOrganizerQueryable.cs
-
-kabcqueryable = $(srcdir)/KAddressBookQueryable
-KABC_QUERYABLE_CSFILES =					\
-	$(kabcqueryable)/KabcQueryable.cs
-
-konversationqueryable = $(srcdir)/KonversationQueryable
-KONVERSATION_QUERYABLE_CSFILES =				\
-	$(konversationqueryable)/KonversationQueryable.cs
-
-indexingservicequeryable = $(srcdir)/IndexingServiceQueryable
-INDEXING_SERVICE_QUERYABLE_CSFILES =				\
-	$(indexingservicequeryable)/IndexingServiceQueryable.cs
-
-operaqueryable = $(srcdir)/OperaQueryable
-OPERA_QUERYABLE_CSFILES =					\
-	$(operaqueryable)/OperaIndexableGenerator.cs		\
-	$(operaqueryable)/OperaIndexer.cs			\
-	$(operaqueryable)/OperaQueryable.cs
-
-nautilusqueryable = $(srcdir)/NautilusMetadataQueryable
-NAUTILUS_QUERYABLE_CSFILES =					\
-	$(nautilusqueryable)/NautilusMetadataQueryable.cs
-
-networkservicesqueryable = $(srcdir)/NetworkServicesQueryable
-NETWORK_SERVICES_QUERYABLE =					\
-	$(networkservicesqueryable)/NetworkServicesQueryable.cs	\
-	$(networkservicesqueryable)/HttpTransport.cs
-
-DAEMON_DLL_CSFILES = 						\
-	$(LUCENE_CSFILES)					\
-	$(SNOWBALL_CSFILES)					\
-	$(KMAIL_QUERYABLE_CSFILES)				\
-	$(FILE_SYSTEM_QUERYABLE_CSFILES)			\
-	$(PIDGIN_QUERYABLE_CSFILES)				\
-	$(INDEXING_SERVICE_QUERYABLE_CSFILES)			\
-	$(TOMBOY_QUERYABLE_CSFILES)				\
-	$(LABYRINTH_QUERYABLE_CSFILES)				\
-	$(BLAM_QUERYABLE_CSFILES)				\
-	$(LIFEREA_QUERYABLE_CSFILES)				\
-	$(AKREGATOR_QUERYABLE_CSFILES)				\
-	$(KONQHISTORY_QUERYABLE_CSFILES)			\
-	$(KONQBOOKMARK_QUERYABLE_CSFILES)			\
-	$(KNOTES_QUERYABLE_CSFILES)				\
-	$(KORGANIZER_QUERYABLE_CSFILES)				\
-	$(KABC_QUERYABLE_CSFILES)				\
-	$(KOPETE_QUERYABLE_CSFILES)				\
-	$(KONVERSATION_QUERYABLE_CSFILES)			\
-	$(OPERA_QUERYABLE_CSFILES)				\
-	$(NAUTILUS_QUERYABLE_CSFILES)				\
-	$(NETWORK_SERVICES_QUERYABLE)				\
-	$(EMPATHY_QUERYABLE_CSFILES)			\
-	$(srcdir)/AssemblyInfo.cs				\
-	$(srcdir)/BatteryMonitor.cs				\
-	$(srcdir)/ExternalMetadataQueryable.cs			\
-	$(srcdir)/FileAttributes.cs				\
-	$(srcdir)/FileAttributesStore.cs			\
-	$(srcdir)/FileAttributesStore_ExtendedAttribute.cs	\
-	$(srcdir)/FileAttributesStore_Mixed.cs			\
-	$(srcdir)/FileAttributesStore_Sqlite.cs			\
-	$(srcdir)/FilterFactory.cs				\
-	$(srcdir)/IFileAttributesStore.cs			\
-	$(srcdir)/IIndexer.cs					\
-	$(srcdir)/IndexSynchronization.cs			\
-	$(srcdir)/IndexerReceipts.cs				\
-	$(srcdir)/IndexerRequest.cs				\
-	$(srcdir)/InformationalMessagesRequestExecutor.cs	\
-	$(srcdir)/IQueryResult.cs				\
-	$(srcdir)/IQueryWorker.cs               		\
-	$(srcdir)/IQueryable.cs					\
-	$(srcdir)/LuceneBitArray.cs				\
-	$(srcdir)/LuceneCommon.cs				\
-	$(srcdir)/LuceneIndexingDriver.cs			\
-	$(srcdir)/LuceneQueryingDriver.cs			\
-	$(srcdir)/LuceneFileQueryable.cs			\
-	$(srcdir)/LuceneQueryable.cs				\
-	$(srcdir)/NoiseFilter.cs				\
-	$(srcdir)/PropertyKeywordFu.cs				\
-	$(srcdir)/QueryDriver.cs				\
-	$(srcdir)/QueryExecutor.cs				\
-	$(srcdir)/QueryResult.cs				\
-	$(srcdir)/QueryStringParser.cs				\
-	$(srcdir)/Queryable.cs					\
-	$(srcdir)/QueryableFlavor.cs				\
-	$(srcdir)/RemoteControlExecutors.cs			\
-	$(srcdir)/RemoteIndexerRequest.cs			\
-	$(srcdir)/RemoteIndexerResponse.cs			\
-	$(srcdir)/Server.cs					\
-	$(srcdir)/Shutdown.cs					\
-	$(srcdir)/SnippetExecutor.cs				\
-	$(srcdir)/SnippetFu.cs					\
-	$(srcdir)/SqliteUtils.cs				\
-	$(srcdir)/StaticQueryable.cs				\
-	$(srcdir)/TextCache.cs					\
-	$(srcdir)/WebServer.cs
-
-DAEMON_DLL_LOCAL_ASSEMBLIES =					\
-	../Util/Util.dll					\
-	../BeagleClient/Beagle.dll				\
-	./$(PLUGIN_TARGET)
-
-DAEMON_DLL_ASSEMBLIES = 					\
-	$(BEAGLED_LIBS)                 			\
-	$(DAEMON_DLL_LOCAL_ASSEMBLIES:%=-r:%)			\
-	$(SHARPZIPLIB_LIBS)					\
-	$(NDESK_DBUS_GLIB_LIBS)					\
-	-r:Mono.Data.Sqlite					\
-	-r:Mono.Posix
-
-if ENABLE_AVAHI
-DAEMON_DLL_CSFLAGS += -define:ENABLE_AVAHI
-DAEMON_DLL_ASSEMBLIES += $(AVAHI_SHARP_LIBS)
-DAEMON_DLL_CSFILES +=						\
-	$(srcdir)/Zeroconf.cs
-endif
-
-$(DAEMON_DLL_TARGET): $(DAEMON_DLL_CSFILES) $(DAEMON_DLL_LOCAL_ASSEMBLIES)
-	$(CSC) -out:$@ $(DAEMON_DLL_CSFLAGS) $(DAEMON_DLL_CSFILES) $(DAEMON_DLL_ASSEMBLIES)
-
-############################################################
-
-###
-### Pluggable backend support
-###
-
-BACKEND_CSFLAGS = -target:library
-BACKEND_LOCAL_ASSEMBLIES =			\
-	../Util/Util.dll			\
-	../BeagleClient/Beagle.dll		\
-	./$(DAEMON_DLL_TARGET)
-
-BACKEND_ASSEMBLIES =				\
-	$(SHARPZIPLIB_LIBS)			\
-	$(BACKEND_LOCAL_ASSEMBLIES:%=-r:%)	\
-	-r:Mono.Posix
-
-############################################################
-
-###
-### Evolution backend
-###
-
-edsqueryable = $(srcdir)/EvolutionDataServerQueryable
-EDS_QUERYABLE_CSFILES =                                 \
-	$(edsqueryable)/BookContainer.cs		\
-	$(edsqueryable)/CalContainer.cs			\
-	$(edsqueryable)/Container.cs			\
-	$(edsqueryable)/EvolutionDataServerQueryable.cs	\
-	$(edsqueryable)/SchedulingIndexableGenerator.cs	\
-	$(edsqueryable)/SourcesHandler.cs
-
-evomailqueryable = $(srcdir)/EvolutionMailQueryable
-EVO_MAIL_QUERYABLE_CSFILES =					\
-	$(evomailqueryable)/EvolutionMailQueryable.cs		\
-	$(evomailqueryable)/EvolutionMailIndexableGenerator.cs	\
-	$(evomailqueryable)/EvolutionSummaryTracker.cs		\
-	$(evomailqueryable)/GConfThreadHelper.cs		\
-	$(evomailqueryable)/MailCrawler.cs
-
-EVO_DLL_TARGET = EvolutionBackends.dll
-EVO_DLL_CSFLAGS = $(BACKEND_CSFLAGS)
-EVO_DLL_CSFILES = 					\
-	$(srcdir)/EvolutionBackendsAssemblyInfo.cs 	\
-	$(EDS_QUERYABLE_CSFILES) 			\
-	$(EVO_MAIL_QUERYABLE_CSFILES)
-EVO_DLL_ASSEMBLIES = 			\
-	$(BACKEND_ASSEMBLIES)		\
-	$(EVO_LIBS)			\
-	-r:Mono.Data.Sqlite
-
-$(EVO_DLL_TARGET): $(EVO_DLL_CSFILES) $(DAEMON_DLL_LOCAL_ASSEMBLIES) $(DAEMON_DLL_TARGET)
-	$(CSC) -out:$@ $(EVO_DLL_CSFLAGS) $(EVO_DLL_CSFILES) $(EVO_DLL_ASSEMBLIES)
-
-############################################################
-
-###
-### Thunderbird backend
-###
-
-THUNDERBIRD_DIR = $(srcdir)/ThunderbirdQueryable
-
-THUNDERBIRD_TARGET = ThunderbirdBackends.dll
-
-THUNDERBIRD_CSFLAGS = $(BACKEND_CSFLAGS)
-
-THUNDERBIRD_CSFILES =						\
-	$(THUNDERBIRD_DIR)/ThunderbirdQueryable.cs
-
-THUNDERBIRD_LOCAL_ASSEMBLIES =					\
-	../Util/Util.dll					\
-	../BeagleClient/Beagle.dll				\
-	./BeagleDaemonLib.dll
-
-THUNDERBIRD_ASSEMBLIES =					\
-	-r:Mono.Posix						\
-	$(BEAGLED_LIBS)                 			\
-	$(THUNDERBIRD_LOCAL_ASSEMBLIES:%=-r:%)
-
-
-$(THUNDERBIRD_TARGET): $(THUNDERBIRD_CSFILES) $(THUNDERBIRD_LOCAL_ASSEMBLIES)
-	$(CSC) -out:$@ $(THUNDERBIRD_CSFLAGS) $(THUNDERBIRD_CSFILES) $(THUNDERBIRD_ASSEMBLIES)
-
-############################################################
-
 DAEMON_WRAPPER = beagled
 DAEMON_WRAPPER_IN = beagled.in
 DAEMON_TARGET = BeagleDaemon.exe
 
 $(DAEMON_WRAPPER): $(srcdir)/$(DAEMON_WRAPPER_IN)
-	$(WRAPPER_SED) -e "s|\ target\@|$(DAEMON_TARGET)|g" < $(srcdir)/$(DAEMON_WRAPPER_IN) > $@
+	$(WRAPPER_SED) -e "s|\ target\@|$(ASSEMBLY)|g" < $(srcdir)/$(DAEMON_WRAPPER_IN) > $@
 	chmod +x $(DAEMON_WRAPPER)
 
-DAEMON_CSFLAGS =				\
-	-target:exe				\
-	$(BEAGLE_DEFINES)
-
-DAEMON_CSFILES =				\
-	$(srcdir)/AssemblyInfo.cs		\
-	$(srcdir)/BeagleDaemon.cs		\
-	$(srcdir)/RemoteIndexer.cs
-
-DAEMON_LOCAL_ASSEMBLIES =			\
-	../Util/Util.dll			\
-	../BeagleClient/Beagle.dll		\
-	./$(PLUGIN_TARGET)			\
-	./$(DAEMON_DLL_TARGET)
-
-DAEMON_ASSEMBLIES =				\
-	$(BEAGLED_LIBS)				\
-	$(SHARPZIPLIB_LIBS)			\
-	$(NDESK_DBUS_GLIB_LIBS)			\
-	$(DAEMON_LOCAL_ASSEMBLIES:%=-r:%)	\
-	-r:Mono.Posix
-
-if ENABLE_AVAHI
-DAEMON_CSFLAGS += -define:ENABLE_AVAHI
-endif
-
-$(DAEMON_TARGET): $(DAEMON_CSFILES) $(DAEMON_LOCAL_ASSEMBLIES)
-	$(CSC) -out:$@ $(DAEMON_CSFLAGS) $(DAEMON_CSFILES) $(DAEMON_ASSEMBLIES)
-
-############################################################
-############################################################
-############################################################
-
-# This next section is a very good example of why we need real mono support in
-# automake.  This is a massive wart on our development platform.
-
-INDEX_HELPER_WRAPPER = beagled-index-helper
-INDEX_HELPER_WRAPPER_IN = $(INDEX_HELPER_WRAPPER).in
-INDEX_HELPER_TARGET = IndexHelper.exe
-
-$(INDEX_HELPER_WRAPPER): $(srcdir)/$(INDEX_HELPER_WRAPPER_IN)
-	$(WRAPPER_SED) -e "s|\ target\@|$(INDEX_HELPER_TARGET)|g" < $(srcdir)/$(INDEX_HELPER_WRAPPER_IN) > $@
-	chmod +x $(INDEX_HELPER_WRAPPER)
-
-INDEX_HELPER_CSFLAGS = -target:exe $(BEAGLE_DEFINES)
-
-indexhelperdir = $(srcdir)/IndexHelper
-
-INDEX_HELPER_CSFILES =	\
-	$(indexhelperdir)/IndexHelper.cs		\
-	$(indexhelperdir)/RemoteIndexerExecutor.cs
-
-
-INDEX_HELPER_LOCAL_ASSEMBLIES =		\
-	../Util/Util.dll		\
-	../BeagleClient/Beagle.dll	\
-	./$(DAEMON_DLL_TARGET)		\
-	./$(PLUGIN_TARGET)
-
-INDEX_HELPER_ASSEMBLIES = \
-	$(BEAGLED_LIBS)				\
-	$(SHARPZIPLIB_LIBS)			\
-	$(INDEX_HELPER_LOCAL_ASSEMBLIES:%=-r:%)	\
-	$(NDESK_DBUS_GLIB_LIBS)			\
-	-r:Mono.Posix
-
-$(INDEX_HELPER_TARGET): $(INDEX_HELPER_CSFILES) $(INDEX_HELPER_LOCAL_ASSEMBLIES)
-	$(CSC) -out:$@ $(INDEX_HELPER_CSFLAGS) $(INDEX_HELPER_CSFILES) $(INDEX_HELPER_ASSEMBLIES)
-
-############################################################
-
-EXTRACT_CONTENT_WRAPPER = beagle-extract-content
-EXTRACT_CONTENT_TARGET = ExtractContent.exe
-
-$(EXTRACT_CONTENT_WRAPPER): $(srcdir)/$(WRAPPER_IN)
-	$(WRAPPER_SED) -e "s|\ target\@|$(EXTRACT_CONTENT_TARGET)|g" < $(srcdir)/$(WRAPPER_IN) > $@
-	chmod +x $(EXTRACT_CONTENT_WRAPPER)
-
-
-EXTRACT_CONTENT_CSFLAGS = \
-	-target:exe
-
-EXTRACT_CONTENT_CSFILES = \
-	$(srcdir)/ExtractContent.cs		\
-	$(srcdir)/NoiseFilter.cs
-
-EXTRACT_CONTENT_LOCAL_ASSEMBLIES = \
-	../Util/Util.dll			\
-	../BeagleClient/Beagle.dll		\
-	./$(PLUGIN_TARGET)			\
-	./$(DAEMON_DLL_TARGET)
-
-EXTRACT_CONTENT_ASSEMBLIES = \
-	$(BEAGLED_LIBS)				\
-	$(SHARPZIPLIB_LIBS)			\
-	$(DAEMON_LOCAL_ASSEMBLIES:%=-r:%)	\
+ASSEMBLY_SOURCES = \
+	$(srcdir)/AssemblyInfo.cs \
+	$(srcdir)/Beagle.Daemon/BeagleDaemon.cs \
+	$(srcdir)/Beagle.Daemon/RemoteIndexer.cs
+
+ASSEMBLY_REFERENCES = \
+	-r:../Beagle.Util/Beagle.Util.dll \
+	-r:../Beagle/Beagle.dll \
+	-r:../Beagle.Filters/Beagle.Filters.dll \
+	-r:../Beagle.Engine/Beagle.Engine.dll \
+	$(BEAGLED_LIBS) \
+	$(SHARPZIPLIB_LIBS) \
+	$(NDESK_DBUS_GLIB_LIBS) \
 	-r:Mono.Posix
 
-$(EXTRACT_CONTENT_TARGET): $(EXTRACT_CONTENT_CSFILES) $(EXTRACT_CONTENT_LOCAL_ASSEMBLIES)
-	$(CSC) -out:$@ $(EXTRACT_CONTENT_CSFLAGS) $(EXTRACT_CONTENT_CSFILES) $(EXTRACT_CONTENT_ASSEMBLIES)
+$(ASSEMBLY): $(ASSEMBLY_SOURCES)
+	$(CSC) -out:$@ $(CSC_FLAGS) $(ASSEMBLY_SOURCES) $(ASSEMBLY_REFERENCES)
 
-############################################################
+all: $(ASSEMBLY) $(DAEMON_WRAPPER)
 
-DUMP_INDEX_WRAPPER = beagle-dump-index
-DUMP_INDEX_TARGET = DumpIndex.exe
-
-$(DUMP_INDEX_WRAPPER): $(srcdir)/$(WRAPPER_IN)
-	$(WRAPPER_SED) -e "s|\ target\@|$(DUMP_INDEX_TARGET)|g" < $(srcdir)/$(WRAPPER_IN) > $@
-	chmod +x $(DUMP_INDEX_WRAPPER)
-
-DUMP_INDEX_CSFLAGS = \
-	-target:exe
-
-DUMP_INDEX_CSFILES = \
-	$(srcdir)/DumpIndex.cs
-
-DUMP_INDEX_LOCAL_ASSEMBLIES = \
-	../Util/Util.dll			\
-	../BeagleClient/Beagle.dll		\
-	./$(PLUGIN_TARGET)			\
-	./$(DAEMON_DLL_TARGET)
-
-DUMP_INDEX_ASSEMBLIES = \
-	$(BEAGLED_LIBS)				\
-	$(SHARPZIPLIB_LIBS)			\
-	$(DAEMON_LOCAL_ASSEMBLIES:%=-r:%)	\
-	-r:Mono.Posix
-
-$(DUMP_INDEX_TARGET): $(DUMP_INDEX_CSFILES) $(DUMP_INDEX_LOCAL_ASSEMBLIES)
-	$(CSC) -out:$@ $(DUMP_INDEX_CSFLAGS) $(DUMP_INDEX_CSFILES) $(DUMP_INDEX_ASSEMBLIES)
-
-############################################################
-
-MASTER_DELETE_WRAPPER = beagle-master-delete-button
-MASTER_DELETE_TARGET = MasterDelete.exe
-
-$(MASTER_DELETE_WRAPPER): $(srcdir)/$(WRAPPER_IN)
-	$(WRAPPER_SED) -e "s|\ target\@|$(MASTER_DELETE_TARGET)|g" < $(srcdir)/$(WRAPPER_IN) > $@
-	chmod +x $(MASTER_DELETE_WRAPPER)
-
-
-MASTER_DELETE_CSFLAGS =	\
-	-target:exe
-
-MASTER_DELETE_CSFILES =	\
-	$(srcdir)/MasterDelete.cs
-
-MASTER_DELETE_LOCAL_ASSEMBLIES = \
-	../Util/Util.dll			\
-	../BeagleClient/Beagle.dll		\
-	./$(PLUGIN_TARGET)			\
-	./$(DAEMON_DLL_TARGET)
-
-MASTER_DELETE_ASSEMBLIES = \
-	$(BEAGLED_LIBS)				\
-	$(SHARPZIPLIB_LIBS)			\
-	$(DAEMON_LOCAL_ASSEMBLIES:%=-r:%)	\
-	-r:Mono.Posix
-
-$(MASTER_DELETE_TARGET): $(MASTER_DELETE_CSFILES) $(MASTER_DELETE_LOCAL_ASSEMBLIES)
-	$(CSC) -out:$@ $(MASTER_DELETE_CSFLAGS) $(MASTER_DELETE_CSFILES) $(MASTER_DELETE_ASSEMBLIES)
-
-############################################################
-
-SNIPPET_TEST_WRAPPER = beagle-snippet-test
-SNIPPET_TEST_TARGET = SnippetTest.exe
-
-$(SNIPPET_TEST_WRAPPER): $(srcdir)/$(WRAPPER_IN)
-	$(WRAPPER_SED) -e "s|\ target\@|$(SNIPPET_TEST_TARGET)|g" < $(srcdir)/$(WRAPPER_IN) > $@
-	chmod +x $(SNIPPET_TEST_WRAPPER)
-
-SNIPPET_TEST_CSFLAGS = \
-	-target:exe
-
-SNIPPET_TEST_CSFILES = \
-	$(srcdir)/SnippetTest.cs
-
-SNIPPET_TEST_LOCAL_ASSEMBLIES =	\
-	../Util/Util.dll			\
-	../BeagleClient/Beagle.dll		\
-	./$(PLUGIN_TARGET)			\
-	./$(DAEMON_DLL_TARGET)
-
-SNIPPET_TEST_ASSEMBLIES = \
-	$(BEAGLED_LIBS)				\
-	$(SHARPZIPLIB_LIBS)			\
-	$(DAEMON_LOCAL_ASSEMBLIES:%=-r:%)	\
-	-r:Mono.Posix
-
-$(SNIPPET_TEST_TARGET): $(SNIPPET_TEST_CSFILES) $(SNIPPET_TEST_LOCAL_ASSEMBLIES)
-	$(CSC) -out:$@ $(SNIPPET_TEST_CSFLAGS) $(SNIPPET_TEST_CSFILES) $(SNIPPET_TEST_ASSEMBLIES)
-
-############################################################
-
-BUILD_INDEX_WRAPPER = beagle-build-index
-BUILD_INDEX_TARGET = BuildIndex.exe
-
-$(BUILD_INDEX_WRAPPER): $(srcdir)/$(WRAPPER_IN)
-	$(WRAPPER_SED) -e "s|\ target\@|$(BUILD_INDEX_TARGET)|g" < $(srcdir)/$(WRAPPER_IN) > $@
-	chmod +x $(BUILD_INDEX_WRAPPER)
-
-BUILD_INDEX_CSFLAGS = \
-	-target:exe
-
-BUILD_INDEX_CSFILES = \
-	$(srcdir)/BuildIndex.cs
-
-BUILD_INDEX_LOCAL_ASSEMBLIES = \
-	../Util/Util.dll			\
-	../BeagleClient/Beagle.dll		\
-	./$(PLUGIN_TARGET)			\
-	./$(DAEMON_DLL_TARGET)
-
-BUILD_INDEX_ASSEMBLIES = \
-	$(BEAGLED_LIBS)				\
-	$(DAEMON_LOCAL_ASSEMBLIES:%=-r:%)	\
-	$(NDESK_DBUS_GLIB_LIBS)			\
-	-r:Mono.Posix
-
-$(BUILD_INDEX_TARGET): $(BUILD_INDEX_CSFILES) $(BUILD_INDEX_LOCAL_ASSEMBLIES)
-	$(CSC) -out:$@ $(BUILD_INDEX_CSFLAGS) $(BUILD_INDEX_CSFILES) $(BUILD_INDEX_ASSEMBLIES)
-
-############################################################
-
-MANAGE_INDEX_WRAPPER = beagle-manage-index
-MANAGE_INDEX_TARGET = ManageIndex.exe
-
-$(MANAGE_INDEX_WRAPPER): $(srcdir)/$(WRAPPER_IN)
-	$(WRAPPER_SED) -e "s|\ target\@|$(MANAGE_INDEX_TARGET)|g" < $(srcdir)/$(WRAPPER_IN) > $@
-	chmod +x $(MANAGE_INDEX_WRAPPER)
-
-MANAGE_INDEX_CSFLAGS = \
-	-target:exe
-
-MANAGE_INDEX_CSFILES = \
-	$(srcdir)/ManageIndex.cs
-
-MANAGE_INDEX_LOCAL_ASSEMBLIES = \
-	../Util/Util.dll			\
-	../BeagleClient/Beagle.dll		\
-	./$(PLUGIN_TARGET)			\
-	./$(DAEMON_DLL_TARGET)
-
-MANAGE_INDEX_ASSEMBLIES = \
-	$(BEAGLED_LIBS)				\
-	$(DAEMON_LOCAL_ASSEMBLIES:%=-r:%)	\
-	-r:Mono.Posix
-
-$(MANAGE_INDEX_TARGET): $(MANAGE_INDEX_CSFILES) $(MANAGE_INDEX_LOCAL_ASSEMBLIES)
-	$(CSC) -out:$@ $(MANAGE_INDEX_CSFLAGS) $(MANAGE_INDEX_CSFILES) $(MANAGE_INDEX_ASSEMBLIES)
-
-############################################################
-
-CRAWL_SYSTEM_IN = beagle-crawl-system.in
-CRAWL_SYSTEM = beagle-crawl-system
-
-$(CRAWL_SYSTEM): $(srcdir)/$(CRAWL_SYSTEM_IN)
-	$(WRAPPER_SED) -e "s|\ target\@|$(CRAWL_SYSTEM)|g" < $(srcdir)/$(CRAWL_SYSTEM_IN) > $@
-	chmod +x $(CRAWL_SYSTEM)
-
-# OK, now back to our regularly scheduled program.  But notice all of the
-# EXTRA_DIST and CLEANFILES stuff at the bottom of the file.  Yuck.
-
-############################################################
-############################################################
-############################################################
-
-ALL_TARGETS = 				\
-	$(PLUGIN_TARGET)		\
-	$(DAEMON_DLL_TARGET)		\
-	$(DAEMON_TARGET)		\
-	$(DAEMON_WRAPPER)		\
-	$(INDEX_HELPER_TARGET)		\
-	$(INDEX_HELPER_WRAPPER)		\
-	$(BUILD_INDEX_TARGET)		\
-	$(BUILD_INDEX_WRAPPER)		\
-	$(EXTRACT_CONTENT_TARGET)	\
-	$(EXTRACT_CONTENT_WRAPPER)	\
-	$(DUMP_INDEX_TARGET)		\
-	$(DUMP_INDEX_WRAPPER)		\
-	$(SNIPPET_TEST_TARGET)		\
-	$(SNIPPET_TEST_WRAPPET)		\
-	$(MANAGE_INDEX_TARGET)		\
-	$(MANAGE_INDEX_WRAPPER)		\
-	$(MASTER_DELETE_TARGET)		\
-	$(MASTER_DELETE_WRAPPER)	\
-	$(WEBINTERFACE_INDEX_XML)
-
-if ENABLE_THUNDERBIRD
-ALL_TARGETS += $(THUNDERBIRD_TARGET)
-endif
-
-if ENABLE_EVOLUTION
-ALL_TARGETS +=				\
-	$(EVO_DLL_TARGET)
-endif
-
-man_MANS = 				\
-	beagled.1			\
-	beagle-build-index.8		\
-	beagle-dump-index.1		\
-	beagle-extract-content.8	\
-	beagle-imlogviewer.8		\
-	beagle-manage-index.8
-
-all: $(ALL_TARGETS)
-
-install-data-local: $(ALL_TARGETS)
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	$(mkinstalldirs) $(DESTDIR)$(sbindir)
+install-data-local: $(ASSEMBLY)
 	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
-	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-	$(mkinstalldirs) $(DESTDIR)$(BACKENDDIR)
-if ENABLE_EVOLUTION
-	$(INSTALL_DATA) $(EVO_DLL_TARGET) $(EVO_DLL_TARGET).mdb $(DESTDIR)$(BACKENDDIR)
-endif
-	@for i in $(BIN_WRAPPERS); do						\
-		sed -e "s|\#installed=1|installed=1|" < $$i > $$i.tmp;		\
-		echo "$(INSTALL_SCRIPT) $$i.tmp $(DESTDIR)$(bindir)/$$i";	\
-		$(INSTALL_SCRIPT) $$i.tmp $(DESTDIR)$(bindir)/$$i || exit 1;	\
-		rm -f $$i.tmp;							\
-	done
-
-	@for i in $(SBIN_WRAPPERS); do						\
-		sed -e "s|\#installed=1|installed=1|" < $$i > $$i.tmp;		\
-		echo "$(INSTALL_SCRIPT) $$i.tmp $(DESTDIR)$(sbindir)/$$i";	\
-		$(INSTALL_SCRIPT) $$i.tmp $(DESTDIR)$(sbindir)/$$i || exit 1;	\
-		rm -f $$i.tmp;							\
-	done
-
-	@sed -e "s|\#installed=1|installed=1|" < $(INDEX_HELPER_WRAPPER) > $(INDEX_HELPER_WRAPPER).tmp
-	$(INSTALL_SCRIPT) $(INDEX_HELPER_WRAPPER).tmp $(DESTDIR)$(pkglibdir)/$(INDEX_HELPER_WRAPPER)
-	@rm -f $(INDEX_HELPER_WRAPPER).tmp
-
-	$(INSTALL_DATA) $(PLUGIN_TARGET)                 $(DESTDIR)$(pkglibdir)
-	$(INSTALL_DATA) $(PLUGIN_TARGET).mdb             $(DESTDIR)$(pkglibdir)
-	$(INSTALL_DATA) $(DAEMON_DLL_TARGET)             $(DESTDIR)$(pkglibdir)
-	$(INSTALL_DATA) $(DAEMON_DLL_TARGET).mdb         $(DESTDIR)$(pkglibdir)
-	$(INSTALL_DATA) $(DAEMON_TARGET)                 $(DESTDIR)$(pkglibdir)
-	$(INSTALL_DATA) $(DAEMON_TARGET).mdb             $(DESTDIR)$(pkglibdir)
-	$(INSTALL_DATA) $(EXTRACT_CONTENT_TARGET)        $(DESTDIR)$(pkglibdir)
-	$(INSTALL_DATA) $(EXTRACT_CONTENT_TARGET).mdb    $(DESTDIR)$(pkglibdir)
-	$(INSTALL_DATA) $(INDEX_HELPER_TARGET)           $(DESTDIR)$(pkglibdir)
-	$(INSTALL_DATA) $(INDEX_HELPER_TARGET).mdb       $(DESTDIR)$(pkglibdir)
-	$(INSTALL_DATA) $(BUILD_INDEX_TARGET)            $(DESTDIR)$(pkglibdir)
-	$(INSTALL_DATA) $(BUILD_INDEX_TARGET).mdb        $(DESTDIR)$(pkglibdir)
-	$(INSTALL_DATA) $(DUMP_INDEX_TARGET)             $(DESTDIR)$(pkglibdir)
-	$(INSTALL_DATA) $(DUMP_INDEX_TARGET).mdb         $(DESTDIR)$(pkglibdir)
-	$(INSTALL_DATA) $(MANAGE_INDEX_TARGET)           $(DESTDIR)$(pkglibdir)
-	$(INSTALL_DATA) $(MANAGE_INDEX_TARGET).mdb       $(DESTDIR)$(pkglibdir)
-if ENABLE_THUNDERBIRD
-	$(INSTALL_DATA) $(THUNDERBIRD_TARGET)                 $(DESTDIR)$(BACKENDDIR)
-	$(INSTALL_DATA) $(THUNDERBIRD_TARGET).mdb             $(DESTDIR)$(BACKENDDIR)
-endif
+	$(INSTALL_DATA) $(ASSEMBLY) $(ASSEMBLY).mdb $(DESTDIR)$(pkglibdir)
 
 uninstall-local:
-if ENABLE_THUNDERBIRD
-	rm -f $(DESTDIR)$(BACKENDDIR)/$(THUNDERBIRD_TARGET)
-	rm -f $(DESTDIR)$(BACKENDDIR)/$(THUNDERBIRD_TARGET).mdb
-endif
-if ENABLE_EVOLUTION
-	rm -f $(DESTDIR)$(BACKENDDIR)/$(EVO_DLL_TARGET)
-	rm -f $(DESTDIR)$(BACKENDDIR)/$(EVO_DLL_TARGET).mdb
-endif
-
-	@for i in $(BIN_WRAPPERS); do				\
-		echo "rm -f $(DESTDIR)$(bindir)/$$i";		\
-		rm -f $(DESTDIR)$(bindir)/$$i || exit 1;	\
-	done
-
-	@for i in $(SBIN_WRAPPERS); do				\
-		echo "rm -f $(DESTDIR)$(sbindir)/$$i";		\
-		rm -f $(DESTDIR)$(sbindir)/$$i || exit 1;	\
-	done
-
-	rm -f $(DESTDIR)$(pkglibdir)/$(PLUGIN_TARGET)
-	rm -f $(DESTDIR)$(pkglibdir)/$(PLUGIN_TARGET).mdb
-	rm -f $(DESTDIR)$(pkglibdir)/$(DAEMON_DLL_TARGET)
-	rm -f $(DESTDIR)$(pkglibdir)/$(DAEMON_DLL_TARGET).mdb
-	rm -f $(DESTDIR)$(pkglibdir)/$(DAEMON_TARGET)
-	rm -f $(DESTDIR)$(pkglibdir)/$(DAEMON_TARGET).mdb
-	rm -f $(DESTDIR)$(pkglibdir)/$(INDEX_HELPER_TARGET)
-	rm -f $(DESTDIR)$(pkglibdir)/$(INDEX_HELPER_TARGET).mdb
-	rm -f $(DESTDIR)$(pkglibdir)/$(INDEX_HELPER_WRAPPER)
-	rm -f $(DESTDIR)$(pkglibdir)/$(INDEX_HELPER_WRAPPER).mdb
-	rm -f $(DESTDIR)$(pkglibdir)/$(EXTRACT_CONTENT_TARGET)
-	rm -f $(DESTDIR)$(pkglibdir)/$(EXTRACT_CONTENT_TARGET).mdb
-	rm -f $(DESTDIR)$(pkglibdir)/$(BUILD_INDEX_TARGET)
-	rm -f $(DESTDIR)$(pkglibdir)/$(BUILD_INDEX_TARGET).mdb
-	rm -f $(DESTDIR)$(pkglibdir)/$(DUMP_INDEX_TARGET)
-	rm -f $(DESTDIR)$(pkglibdir)/$(DUMP_INDEX_TARGET).mdb
-	rm -f $(DESTDIR)$(pkglibdir)/$(MANAGE_INDEX_TARGET)
-	rm -f $(DESTDIR)$(pkglibdir)/$(MANAGE_INDEX_TARGET).mdb
-
-BIN_WRAPPERS = \
-	$(DAEMON_WRAPPER)		\
-	$(EXTRACT_CONTENT_WRAPPER)
-
-SBIN_WRAPPERS = \
-	$(BUILD_INDEX_WRAPPER)		\
-	$(DUMP_INDEX_WRAPPER)		\
-	$(MANAGE_INDEX_WRAPPER)		\
-	$(MASTER_DELETE_WRAPPER)
-
-noinst_SCRIPTS=	\
-	$(SNIPPET_TEST_WRAPPER)
+	rm -f $(DESTDIR)$(pkglibdir)/$(ASSEMBLY) $(DESTDIR)$(pkglibdir)/$(ASSEMBLY).mdb
 
 EXTRA_DIST = \
-	$(srcdir)/Zeroconf.cs			\
-	$(autostart_DATA)			\
-	$(WEBINTERFACE_INDEX_XML_IN)		\
-	$(webinterface_DATA)			\
-	$(webinterfaceimages_DATA)		\
-	$(WRAPPER_IN)   			\
-	$(DAEMON_WRAPPER_IN)			\
-	$(INDEX_HELPER_WRAPPER_IN)		\
-	$(man_MANS)				\
-	$(PLUGIN_CSFILES)			\
-	$(DAEMON_DLL_CSFILES)			\
-	$(DAEMON_CSFILES)			\
-	$(EVO_DLL_CSFILES)			\
-	$(THUNDERBIRD_CSFILES)			\
-	$(EXTRACT_CONTENT_CSFILES)		\
-	$(DUMP_INDEX_CSFILES)			\
-	$(SNIPPET_TEST_CSFILES)			\
-	$(INDEX_HELPER_CSFILES)			\
-	$(MASTER_DELETE_CSFILES)		\
-	$(MANAGE_INDEX_CSFILES)			\
-	$(BUILD_INDEX_CSFILES)
+	$(ASSEMBLY_SOURCES)
 
 CLEANFILES = \
-	$(PLUGIN_TARGET)       			\
-	$(PLUGIN_TARGET).mdb   			\
-	$(DAEMON_DLL_TARGET)			\
-	$(DAEMON_DLL_TARGET).mdb		\
-	$(DAEMON_TARGET)       			\
-	$(DAEMON_TARGET).mdb   			\
-	$(DAEMON_WRAPPER)      			\
-	$(EVO_DLL_TARGET)			\
-	$(EVO_DLL_TARGET).mdb			\
-	$(INDEX_HELPER_TARGET)			\
-	$(INDEX_HELPER_TARGET).mdb		\
-	$(INDEX_HELPER_WRAPPER)			\
-	$(EXTRACT_CONTENT_TARGET)		\
-	$(EXTRACT_CONTENT_TARGET).mdb		\
-	$(EXTRACT_CONTENT_WRAPPER)		\
-	$(DUMP_INDEX_TARGET)			\
-	$(DUMP_INDEX_TARGET).mdb		\
-	$(DUMP_INDEX_WRAPPER)			\
-	$(MASTER_DELETE_TARGET)			\
-	$(MASTER_DELETE_TARGET).mdb		\
-	$(MASTER_DELETE_WRAPPER)		\
-	$(SNIPPET_TEST_TARGET)			\
-	$(SNIPPET_TEST_TARGET).mdb		\
-	$(SNIPPET_TEST_WRAPPER)			\
-	$(MANAGE_INDEX_TARGET)			\
-	$(MANAGE_INDEX_TARGET).mdb		\
-	$(MANAGE_INDEX_WRAPPER)			\
-	$(BUILD_INDEX_TARGET)			\
-	$(BUILD_INDEX_TARGET).mdb		\
-	$(BUILD_INDEX_WRAPPER)			\
-	$(THUNDERBIRD_TARGET)			\
-	$(THUNDERBIRD_TARGET).mdb		\
-	$(WEBINTERFACE_INDEX_XML)
+	$(ASSEMBLY) \
+	$(ASSEMBLY).mdb
+

Modified: branches/beagle-win32-branch/src/Beagle.Engine/AssemblyInfo.cs.in
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Engine/AssemblyInfo.cs.in	(original)
+++ branches/beagle-win32-branch/src/Beagle.Engine/AssemblyInfo.cs.in	Mon Mar 10 00:17:16 2008
@@ -7,7 +7,7 @@
 using System.Reflection;
 
 using Beagle;
-using Beagle.Daemon;
+using Beagle.Engine;
 
 [assembly: AssemblyVersion("@VERSION@")]
 [assembly: AssemblyTitle ("Beagle.Engine")]
@@ -35,7 +35,7 @@
 )]
 
 // All backends in this assembly must be registered here.
-[assembly: IQueryableTypes (
+/*[assembly: IQueryableTypes (
 	typeof (Beagle.Daemon.AkregatorQueryable.AkregatorQueryable),
 	typeof (Beagle.Daemon.BlamQueryable.BlamQueryable),
 	typeof (Beagle.Daemon.FileSystemQueryable.FileSystemQueryable),
@@ -57,4 +57,4 @@
 	typeof (Beagle.Daemon.StaticQueryable),
 	typeof (Beagle.Daemon.TomboyQueryable.TomboyQueryable),
 	typeof (Beagle.Daemon.EmpathyQueryable.EmpathyQueryable)                   
-)]
+)]*/
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]