GNOME.org
 

[tomboy] Build all assemblies directly into top-level bin directory

commit b41913cd1435e092ecbf6d90fc074c05e30e8b4e
Author: Sandy Armstrong <sanfordarmstrong gmail com>
Date:   Sat Jun 26 07:02:23 2010 -0700

    Build all assemblies directly into top-level bin directory
    
    https://bugzilla.gnome.org/show_bug.cgi?id=431833

 Makefile.include                                |    3 ++-
 Tomboy/Addins/Backlinks/Makefile.am             |    6 +++---
 Tomboy/Addins/Bugzilla/Makefile.am              |    6 +++---
 Tomboy/Addins/Evolution/Makefile.am             |    6 +++---
 Tomboy/Addins/ExportToHtml/Makefile.am          |    6 +++---
 Tomboy/Addins/FileSystemSyncService/Makefile.am |    6 +++---
 Tomboy/Addins/FixedWidth/Makefile.am            |    6 +++---
 Tomboy/Addins/GalagoPresence/Makefile.am        |    6 +++---
 Tomboy/Addins/InsertTimestamp/Makefile.am       |    6 +++---
 Tomboy/Addins/NoteDirectoryWatcher/Makefile.am  |    6 +++---
 Tomboy/Addins/NoteOfTheDay/Makefile.am          |    6 +++---
 Tomboy/Addins/PrintNotes/Makefile.am            |    6 +++---
 Tomboy/Addins/Sketching/Makefile.am             |    6 +++---
 Tomboy/Addins/SshSyncService/Makefile.am        |    6 +++---
 Tomboy/Addins/StickyNoteImport/Makefile.am      |    6 +++---
 Tomboy/Addins/Tasks/Makefile.am                 |    6 +++---
 Tomboy/Addins/Tasque/Makefile.am                |    6 +++---
 Tomboy/Addins/Underline/Makefile.am             |    6 +++---
 Tomboy/Addins/VoiceNotes/Makefile.am            |    6 +++---
 Tomboy/Addins/WebDavSyncService/Makefile.am     |    6 +++---
 Tomboy/Addins/WebSyncService/Makefile.am        |    6 +++---
 Tomboy/Makefile.am                              |   14 ++++++++------
 test/Makefile.am                                |    8 ++++----
 23 files changed, 74 insertions(+), 71 deletions(-)
---
diff --git a/Makefile.include b/Makefile.include
index aec9311..543202f 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -2,8 +2,9 @@
 
 ## Links
 
+TOMBOY_EXE_PATH = $(top_builddir)/bin/Tomboy.exe
 LINK_TOMBOY_EXE =					\
-	-r:$(top_builddir)/Tomboy/Tomboy.exe
+	-r:$(TOMBOY_EXE_PATH)
 
 LINK_MONO_ADDINS = $(MONO_ADDINS_LIBS)
 
diff --git a/Tomboy/Addins/Backlinks/Makefile.am b/Tomboy/Addins/Backlinks/Makefile.am
index 1216aa4..4ce98c1 100644
--- a/Tomboy/Addins/Backlinks/Makefile.am
+++ b/Tomboy/Addins/Backlinks/Makefile.am
@@ -12,7 +12,7 @@ ASSEMBLIES = 					\
 	-r:Mono.Posix
 
 ADDIN_NAME = Backlinks
-TARGET = $(ADDIN_NAME).dll
+TARGET = $(top_builddir)/bin/addins/$(ADDIN_NAME).dll
 CSFILES = \
 	$(srcdir)/BacklinkMenuItem.cs		\
 	$(srcdir)/BacklinksNoteAddin.cs
@@ -21,8 +21,8 @@ RESOURCES = \
 
 $(TARGET).mdb: $(TARGET)
 
-$(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
-	$(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
+$(TARGET): $(CSFILES) $(TOMBOY_EXE_PATH)
+	mkdir -p `dirname $(TARGET)` && $(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
 
 
 addinsdir = $(pkglibdir)/addins
diff --git a/Tomboy/Addins/Bugzilla/Makefile.am b/Tomboy/Addins/Bugzilla/Makefile.am
index 20b1fea..acd387c 100644
--- a/Tomboy/Addins/Bugzilla/Makefile.am
+++ b/Tomboy/Addins/Bugzilla/Makefile.am
@@ -12,7 +12,7 @@ ASSEMBLIES = 					\
 	-r:Mono.Posix
 
 ADDIN_NAME = Bugzilla
-TARGET = $(ADDIN_NAME).dll
+TARGET = $(top_builddir)/bin/addins/$(ADDIN_NAME).dll
 CSFILES = \
 	$(srcdir)/BugzillaLink.cs		\
 	$(srcdir)/BugzillaNoteAddin.cs		\
@@ -26,8 +26,8 @@ RESOURCES = \
 
 $(TARGET).mdb: $(TARGET)
 
-$(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
-	$(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
+$(TARGET): $(CSFILES) $(TOMBOY_EXE_PATH)
+	mkdir -p `dirname $(TARGET)` && $(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
 
 
 addinsdir = $(pkglibdir)/addins
diff --git a/Tomboy/Addins/Evolution/Makefile.am b/Tomboy/Addins/Evolution/Makefile.am
index 3c40eb3..6ccce55 100644
--- a/Tomboy/Addins/Evolution/Makefile.am
+++ b/Tomboy/Addins/Evolution/Makefile.am
@@ -19,15 +19,15 @@ CSFILES = \
 
 
 if ENABLE_EVOLUTION
-TARGET = $(ADDIN_NAME).dll
+TARGET = $(top_builddir)/bin/addins/$(ADDIN_NAME).dll
 RESOURCES = \
 	-resource:$(srcdir)/$(ADDIN_NAME).addin.xml \
 	-resource:$(srcdir)/mail.png,mail.png
 
 $(TARGET).mdb: $(TARGET)
 
-$(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
-	$(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
+$(TARGET): $(CSFILES) $(TOMBOY_EXE_PATH)
+	mkdir -p `dirname $(TARGET)` && $(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
 
 addinsdir = $(pkglibdir)/addins
 addins_DATA = 			\
diff --git a/Tomboy/Addins/ExportToHtml/Makefile.am b/Tomboy/Addins/ExportToHtml/Makefile.am
index 7f86b20..bba56b6 100644
--- a/Tomboy/Addins/ExportToHtml/Makefile.am
+++ b/Tomboy/Addins/ExportToHtml/Makefile.am
@@ -12,7 +12,7 @@ ASSEMBLIES = 					\
 	-r:Mono.Posix
 
 ADDIN_NAME = ExportToHtml
-TARGET = $(ADDIN_NAME).dll
+TARGET = $(top_builddir)/bin/addins/$(ADDIN_NAME).dll
 CSFILES = \
 	$(srcdir)/ExportToHtmlDialog.cs		\
 	$(srcdir)/ExportToHtmlNoteAddin.cs		\
@@ -24,8 +24,8 @@ RESOURCES = \
 
 $(TARGET).mdb: $(TARGET)
 
-$(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
-	$(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
+$(TARGET): $(CSFILES) $(TOMBOY_EXE_PATH)
+	mkdir -p `dirname $(TARGET)` && $(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
 
 
 addinsdir = $(pkglibdir)/addins
diff --git a/Tomboy/Addins/FileSystemSyncService/Makefile.am b/Tomboy/Addins/FileSystemSyncService/Makefile.am
index 8522284..b5d40d2 100644
--- a/Tomboy/Addins/FileSystemSyncService/Makefile.am
+++ b/Tomboy/Addins/FileSystemSyncService/Makefile.am
@@ -15,7 +15,7 @@ ASSEMBLIES = 					\
 # Local File System Sync Service Addin
 #
 
-TARGET = FileSystemSyncService.dll
+TARGET = $(top_builddir)/bin/addins/FileSystemSyncService.dll
 CSFILES = \
 	$(srcdir)/FileSystemSyncServiceAddin.cs
 RESOURCES = \
@@ -23,8 +23,8 @@ RESOURCES = \
 
 $(TARGET).mdb: $(TARGET)
 
-$(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
-	$(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
+$(TARGET): $(CSFILES) $(TOMBOY_EXE_PATH)
+	mkdir -p `dirname $(TARGET)` && $(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
 
 
 addinsdir = $(pkglibdir)/addins
diff --git a/Tomboy/Addins/FixedWidth/Makefile.am b/Tomboy/Addins/FixedWidth/Makefile.am
index af4fc3b..0a0dce1 100644
--- a/Tomboy/Addins/FixedWidth/Makefile.am
+++ b/Tomboy/Addins/FixedWidth/Makefile.am
@@ -12,7 +12,7 @@ ASSEMBLIES = 					\
 	-r:Mono.Posix
 
 ADDIN_NAME = FixedWidth
-TARGET = $(ADDIN_NAME).dll
+TARGET = $(top_builddir)/bin/addins/$(ADDIN_NAME).dll
 CSFILES = \
 	$(srcdir)/FixedWidthMenuItem.cs		\
 	$(srcdir)/FixedWidthNoteAddin.cs		\
@@ -22,8 +22,8 @@ RESOURCES = \
 
 $(TARGET).mdb: $(TARGET)
 
-$(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
-	$(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
+$(TARGET): $(CSFILES) $(TOMBOY_EXE_PATH)
+	mkdir -p `dirname $(TARGET)` && $(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
 
 
 addinsdir = $(pkglibdir)/addins
diff --git a/Tomboy/Addins/GalagoPresence/Makefile.am b/Tomboy/Addins/GalagoPresence/Makefile.am
index 2e47b74..365d424 100644
--- a/Tomboy/Addins/GalagoPresence/Makefile.am
+++ b/Tomboy/Addins/GalagoPresence/Makefile.am
@@ -18,14 +18,14 @@ CSFILES = \
 
 
 if ENABLE_GALAGO
-TARGET = $(ADDIN_NAME).dll
+TARGET = $(top_builddir)/bin/addins/$(ADDIN_NAME).dll
 RESOURCES = \
 	-resource:$(srcdir)/$(ADDIN_NAME).addin.xml
 
 $(TARGET).mdb: $(TARGET)
 
-$(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
-	$(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
+$(TARGET): $(CSFILES) $(TOMBOY_EXE_PATH)
+	mkdir -p `dirname $(TARGET)` && $(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
 
 
 addinsdir = $(pkglibdir)/addins
diff --git a/Tomboy/Addins/InsertTimestamp/Makefile.am b/Tomboy/Addins/InsertTimestamp/Makefile.am
index 60256d9..34e4da5 100644
--- a/Tomboy/Addins/InsertTimestamp/Makefile.am
+++ b/Tomboy/Addins/InsertTimestamp/Makefile.am
@@ -12,7 +12,7 @@ ASSEMBLIES = 					\
 	-r:Mono.Posix
 
 ADDIN_NAME = InsertTimestamp
-TARGET = $(ADDIN_NAME).dll
+TARGET = $(top_builddir)/bin/addins/$(ADDIN_NAME).dll
 CSFILES = \
 	$(srcdir)/InsertTimestampNoteAddin.cs		\
 	$(srcdir)/InsertTimestampPreferences.cs		\
@@ -22,8 +22,8 @@ RESOURCES = \
 
 $(TARGET).mdb: $(TARGET)
 
-$(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
-	$(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
+$(TARGET): $(CSFILES) $(TOMBOY_EXE_PATH)
+	mkdir -p `dirname $(TARGET)` && $(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
 
 
 addinsdir = $(pkglibdir)/addins
diff --git a/Tomboy/Addins/NoteDirectoryWatcher/Makefile.am b/Tomboy/Addins/NoteDirectoryWatcher/Makefile.am
index 8250fd2..9f90673 100644
--- a/Tomboy/Addins/NoteDirectoryWatcher/Makefile.am
+++ b/Tomboy/Addins/NoteDirectoryWatcher/Makefile.am
@@ -12,7 +12,7 @@ ASSEMBLIES = 					\
 	-r:Mono.Posix
 
 ADDIN_NAME = NoteDirectoryWatcher
-TARGET = $(ADDIN_NAME).dll
+TARGET = $(top_builddir)/bin/addins/$(ADDIN_NAME).dll
 CSFILES = \
 	$(srcdir)/NoteDirectoryWatcherApplicationAddin.cs		
 RESOURCES = \
@@ -20,8 +20,8 @@ RESOURCES = \
 
 $(TARGET).mdb: $(TARGET)
 
-$(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
-	$(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
+$(TARGET): $(CSFILES) $(TOMBOY_EXE_PATH)
+	mkdir -p `dirname $(TARGET)` && $(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
 
 
 addinsdir = $(pkglibdir)/addins
diff --git a/Tomboy/Addins/NoteOfTheDay/Makefile.am b/Tomboy/Addins/NoteOfTheDay/Makefile.am
index d210d63..f9c08b3 100644
--- a/Tomboy/Addins/NoteOfTheDay/Makefile.am
+++ b/Tomboy/Addins/NoteOfTheDay/Makefile.am
@@ -12,7 +12,7 @@ ASSEMBLIES = 					\
 	-r:Mono.Posix
 
 ADDIN_NAME = NoteOfTheDay
-TARGET = $(ADDIN_NAME).dll
+TARGET = $(top_builddir)/bin/addins/$(ADDIN_NAME).dll
 CSFILES = \
 	$(srcdir)/NoteOfTheDay.cs		\
 	$(srcdir)/NoteOfTheDayApplicationAddin.cs		\
@@ -23,8 +23,8 @@ RESOURCES = \
 
 $(TARGET).mdb: $(TARGET)
 
-$(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
-	$(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
+$(TARGET): $(CSFILES) $(TOMBOY_EXE_PATH)
+	mkdir -p `dirname $(TARGET)` && $(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
 
 
 addinsdir = $(pkglibdir)/addins
diff --git a/Tomboy/Addins/PrintNotes/Makefile.am b/Tomboy/Addins/PrintNotes/Makefile.am
index f52fa13..069a864 100644
--- a/Tomboy/Addins/PrintNotes/Makefile.am
+++ b/Tomboy/Addins/PrintNotes/Makefile.am
@@ -13,14 +13,14 @@ ASSEMBLIES = 					\
 	-r:Mono.Cairo
 
 ADDIN_NAME = PrintNotes
-TARGET = $(ADDIN_NAME).dll
+TARGET = $(top_builddir)/bin/addins/$(ADDIN_NAME).dll
 CSFILES = \
 	$(srcdir)/PrintNotesNoteAddin.cs
 RESOURCES = \
 	-resource:$(srcdir)/$(ADDIN_NAME).addin.xml
 
-$(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
-	$(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
+$(TARGET): $(CSFILES) $(TOMBOY_EXE_PATH)
+	mkdir -p `dirname $(TARGET)` && $(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
 
 
 addinsdir = $(pkglibdir)/addins
diff --git a/Tomboy/Addins/Sketching/Makefile.am b/Tomboy/Addins/Sketching/Makefile.am
index 0ddc01b..53d1251 100644
--- a/Tomboy/Addins/Sketching/Makefile.am
+++ b/Tomboy/Addins/Sketching/Makefile.am
@@ -22,14 +22,14 @@ CSFILES = \
 	$(srcdir)/Stroke.cs
 
 if ENABLE_SKETCHING
-TARGET = $(ADDIN_NAME).dll
+TARGET = $(top_builddir)/bin/addins/$(ADDIN_NAME).dll
 RESOURCES = \
 	-resource:$(srcdir)/$(ADDIN_NAME).addin.xml
 
 $(TARGET).mdb: $(TARGET)
 
-$(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
-	$(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
+$(TARGET): $(CSFILES) $(TOMBOY_EXE_PATH)
+	mkdir -p `dirname $(TARGET)` && $(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
 
 addinsdir = $(pkglibdir)/addins
 addins_DATA = 			\
diff --git a/Tomboy/Addins/SshSyncService/Makefile.am b/Tomboy/Addins/SshSyncService/Makefile.am
index 255c3be..4e7659e 100644
--- a/Tomboy/Addins/SshSyncService/Makefile.am
+++ b/Tomboy/Addins/SshSyncService/Makefile.am
@@ -15,7 +15,7 @@ ASSEMBLIES = 					\
 # SSH Sync Service Addin
 #
 
-TARGET = SshSyncServiceAddin.dll
+TARGET = $(top_builddir)/bin/addins/SshSyncServiceAddin.dll
 CSFILES = \
 	$(srcdir)/SshSyncServiceAddin.cs
 RESOURCES = \
@@ -23,8 +23,8 @@ RESOURCES = \
 
 $(TARGET).mdb: $(TARGET)
 
-$(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
-	$(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
+$(TARGET): $(CSFILES) $(TOMBOY_EXE_PATH)
+	mkdir -p `dirname $(TARGET)` && $(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
 
 
 addinsdir = $(pkglibdir)/addins
diff --git a/Tomboy/Addins/StickyNoteImport/Makefile.am b/Tomboy/Addins/StickyNoteImport/Makefile.am
index 6ffa6f1..dd33ef7 100644
--- a/Tomboy/Addins/StickyNoteImport/Makefile.am
+++ b/Tomboy/Addins/StickyNoteImport/Makefile.am
@@ -12,7 +12,7 @@ ASSEMBLIES = 					\
 	-r:Mono.Posix
 
 ADDIN_NAME = StickyNoteImport
-TARGET = $(ADDIN_NAME).dll
+TARGET = $(top_builddir)/bin/addins/$(ADDIN_NAME).dll
 CSFILES = \
 	$(srcdir)/StickyNoteImportNoteAddin.cs
 RESOURCES = \
@@ -20,8 +20,8 @@ RESOURCES = \
 
 $(TARGET).mdb: $(TARGET)
 
-$(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
-	$(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
+$(TARGET): $(CSFILES) $(TOMBOY_EXE_PATH)
+	mkdir -p `dirname $(TARGET)` && $(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
 
 
 addinsdir = $(pkglibdir)/addins
diff --git a/Tomboy/Addins/Tasks/Makefile.am b/Tomboy/Addins/Tasks/Makefile.am
index 156d5f2..4c53ff4 100644
--- a/Tomboy/Addins/Tasks/Makefile.am
+++ b/Tomboy/Addins/Tasks/Makefile.am
@@ -15,7 +15,7 @@ ASSEMBLIES = 					\
 # Tasks Addin
 #
 
-TASKS_TARGET = Tasks.dll
+TASKS_TARGET = $(top_builddir)/bin/addins/Tasks.dll
 TASKS_CSFILES = \
 	$(srcdir)/CellRendererDate.cs \
 	$(srcdir)/ComplexMenuItem.cs \
@@ -42,8 +42,8 @@ TASKS_EXTRA_DIST = \
 
 $(TASKS_TARGET).mdb: $(TARGET)
 
-$(TASKS_TARGET): $(TASKS_CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
-	$(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(TASKS_CSFILES) $(TASKS_RESOURCES)
+$(TASKS_TARGET): $(TASKS_CSFILES) $(TOMBOY_EXE_PATH)
+	mkdir -p `dirname $(TASKS_TARGET)` && $(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(TASKS_CSFILES) $(TASKS_RESOURCES)
 
 
 addinsdir = $(pkglibdir)/addins
diff --git a/Tomboy/Addins/Tasque/Makefile.am b/Tomboy/Addins/Tasque/Makefile.am
index 777fc25..4b40800 100644
--- a/Tomboy/Addins/Tasque/Makefile.am
+++ b/Tomboy/Addins/Tasque/Makefile.am
@@ -16,7 +16,7 @@ ASSEMBLIES = 					\
 
 ADDIN_NAME = Tasque
 
-TARGET = $(ADDIN_NAME).Addin.dll
+TARGET = $(top_builddir)/bin/addins/$(ADDIN_NAME).Addin.dll
 CSFILES = \
 	$(srcdir)/TasqueNoteAddin.cs \
 	$(srcdir)/RemoteControl.cs
@@ -26,8 +26,8 @@ RESOURCES = \
 
 $(TARGET).mdb: $(TARGET)
 
-$(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
-	$(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
+$(TARGET): $(CSFILES) $(TOMBOY_EXE_PATH)
+	mkdir -p `dirname $(TARGET)` && $(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
 
 
 addinsdir = $(pkglibdir)/addins
diff --git a/Tomboy/Addins/Underline/Makefile.am b/Tomboy/Addins/Underline/Makefile.am
index eb9d3a0..05ff10a 100644
--- a/Tomboy/Addins/Underline/Makefile.am
+++ b/Tomboy/Addins/Underline/Makefile.am
@@ -12,7 +12,7 @@ ASSEMBLIES = 					\
 	-r:Mono.Posix
 
 ADDIN_NAME = Underline
-TARGET = $(ADDIN_NAME).dll
+TARGET = $(top_builddir)/bin/addins/$(ADDIN_NAME).dll
 CSFILES = \
 	$(srcdir)/UnderlineMenuItem.cs		\
 	$(srcdir)/UnderlineNoteAddin.cs		\
@@ -22,8 +22,8 @@ RESOURCES = \
 
 $(TARGET).mdb: $(TARGET)
 
-$(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
-	$(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
+$(TARGET): $(CSFILES) $(TOMBOY_EXE_PATH)
+	mkdir -p `dirname $(TARGET)` && $(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
 
 
 addinsdir = $(pkglibdir)/addins
diff --git a/Tomboy/Addins/VoiceNotes/Makefile.am b/Tomboy/Addins/VoiceNotes/Makefile.am
index c7e7e1c..75c878a 100644
--- a/Tomboy/Addins/VoiceNotes/Makefile.am
+++ b/Tomboy/Addins/VoiceNotes/Makefile.am
@@ -13,7 +13,7 @@ ASSEMBLIES = 					\
 
 if ENABLE_GST
 ADDIN_NAME = VoiceNote
-TARGET = $(ADDIN_NAME).Addin.dll
+TARGET = $(top_builddir)/bin/addins/$(ADDIN_NAME).Addin.dll
 CSFILES = \
 	$(srcdir)/VoiceNote.cs
 RESOURCES = \
@@ -22,8 +22,8 @@ RESOURCES = \
 
 $(TARGET).mdb: $(TARGET)
 
-$(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
-	$(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
+$(TARGET): $(CSFILES) $(TOMBOY_EXE_PATH)
+	mkdir -p `dirname $(TARGET)` && $(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
 
 
 addinsdir = $(pkglibdir)/addins
diff --git a/Tomboy/Addins/WebDavSyncService/Makefile.am b/Tomboy/Addins/WebDavSyncService/Makefile.am
index 7355628..5e1006d 100644
--- a/Tomboy/Addins/WebDavSyncService/Makefile.am
+++ b/Tomboy/Addins/WebDavSyncService/Makefile.am
@@ -15,7 +15,7 @@ ASSEMBLIES = 					\
 # WebDav Sync Service Addin
 #
 
-TARGET = WebDavSyncService.dll
+TARGET = $(top_builddir)/bin/addins/WebDavSyncService.dll
 CSFILES = \
 	$(srcdir)/WebDavSyncServiceAddin.cs
 RESOURCES = \
@@ -23,8 +23,8 @@ RESOURCES = \
 
 $(TARGET).mdb: $(TARGET)
 
-$(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
-	$(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
+$(TARGET): $(CSFILES) $(TOMBOY_EXE_PATH)
+	mkdir -p `dirname $(TARGET)` && $(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
 
 
 addinsdir = $(pkglibdir)/addins
diff --git a/Tomboy/Addins/WebSyncService/Makefile.am b/Tomboy/Addins/WebSyncService/Makefile.am
index 75387ad..d50eadb 100644
--- a/Tomboy/Addins/WebSyncService/Makefile.am
+++ b/Tomboy/Addins/WebSyncService/Makefile.am
@@ -21,7 +21,7 @@ ASSEMBLIES = \
 # Web Sync Service Addin
 #
 
-TARGET = WebSyncServiceAddin.dll
+TARGET = $(top_builddir)/bin/addins/WebSyncServiceAddin.dll
 CSFILES = \
 	$(srcdir)/NoteConvert.cs       	\
 	$(srcdir)/WebSyncPreferencesWidget.cs   \
@@ -40,8 +40,8 @@ RESOURCES = \
 
 $(TARGET).mdb: $(TARGET)
 
-$(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
-	$(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
+$(TARGET): $(CSFILES) $(TOMBOY_EXE_PATH)
+	mkdir -p `dirname $(TARGET)` && $(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
 
 
 addinsdir = $(pkglibdir)/addins
diff --git a/Tomboy/Makefile.am b/Tomboy/Makefile.am
index 34d7bdd..48feb25 100644
--- a/Tomboy/Makefile.am
+++ b/Tomboy/Makefile.am
@@ -2,7 +2,8 @@ include $(top_srcdir)/Makefile.include
 
 SUBDIRS = . Addins
 
-TARGET = Tomboy.exe
+TARGET_NAME = Tomboy.exe
+TARGET = $(top_builddir)/bin/$(TARGET_NAME)
 WRAPPER = tomboy
 PANEL_WRAPPER = tomboy-panel
 
@@ -168,7 +169,7 @@ RESOURCES = 										\
 $(TARGET).mdb: $(TARGET)
 
 $(TARGET): $(CSFILES) Defines.cs
-	$(CSC) -out:$@ $(CSFLAGS) $^ $(ASSEMBLIES) $(RESOURCES)
+	mkdir -p `dirname $(TARGET)` && $(CSC) -out:$@ $(CSFLAGS) $^ $(ASSEMBLIES) $(RESOURCES)
 
 tomboylibdir = $(pkglibdir)
 tomboylib_DATA = $(TARGET) $(TARGET).config $(TARGET).mdb
@@ -180,10 +181,11 @@ bin_SCRIPTS += $(PANEL_WRAPPER)
 endif
 
 $(WRAPPER): $(srcdir)/$(WRAPPER).in Makefile
+	mkdir -p `dirname $(WRAPPER)` && 		\
 	sed -e "s|\ prefix\@|$(prefix)|g" 		\
 	    -e "s|\ pkglibdir\@|$(pkglibdir)|g" 	\
 	    -e "s|\ bindir\@|$(bindir)|g"		\
-	    -e "s|\ target\@|$(TARGET)|g" 		\
+	    -e "s|\ target\@|$(TARGET_NAME)|g" 		\
 	    -e "s|\ wrapper\@|$(WRAPPER)|g"		\
 	    -e "s|\ extragac\@|$(EXTRA_GAC_PREFIX)|g"	\
 	    -e "s|\ srcdir\@|$(PWD)|g"	\
@@ -194,14 +196,14 @@ $(PANEL_WRAPPER): $(srcdir)/$(PANEL_WRAPPER).in Makefile
 	sed -e "s|\ prefix\@|$(prefix)|g" 		\
 	    -e "s|\ pkglibdir\@|$(pkglibdir)|g" 	\
 	    -e "s|\ bindir\@|$(bindir)|g"		\
-	    -e "s|\ target\@|$(TARGET)|g" 		\
+	    -e "s|\ target\@|$(TARGET_NAME)|g" 		\
 	    -e "s|\ wrapper\@|$(WRAPPER)|g"		\
 	    -e "s|\ extragac\@|$(EXTRA_GAC_PREFIX)|g"	\
 	    -e "s|\ srcdir\@|$(PWD)|g"	\
 	    < $< > $@
 	chmod +x $(PANEL_WRAPPER)
 
-$(TARGET).config: $(srcdir)/$(TARGET).config.in Makefile
+$(TARGET).config: $(srcdir)/$(TARGET_NAME$).config.in Makefile
 	sed -e "s|\ pkglibdir\@|$(pkglibdir)|" \
 	    < $< > $@
 
@@ -220,7 +222,7 @@ EXTRA_DIST =            		\
 	$(PANELAPPLET_CSFILES)		\
 	$(WRAPPER).in			\
 	$(PANEL_WRAPPER).in		\
-	$(TARGET).config.in		\
+	$(TARGET_NAME).config.in		\
 	$(srcdir)/Defines.cs.in		\
 	$(srcdir)/Tomboy.addin.xml
 
diff --git a/test/Makefile.am b/test/Makefile.am
index 2885ca1..8371988 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,6 +1,6 @@
 CSC = $(GMCS)
 
-TARGET = TomboyTest.dll
+TARGET = $(top_builddir)/bin/TomboyTest.dll
 
 CSFLAGS =				\
 	-debug				\
@@ -17,14 +17,14 @@ CSFILES =					\
 ASSEMBLIES =							\
 	$(NUNIT_LIBS)						\
 	$(TOMBOY_LIBS)						\
-	-r:$(top_builddir)/Tomboy/Tomboy.exe			\
-	-r:$(top_builddir)/Tomboy/Plugins/ExportToHTML.dll
+	-r:$(LINK_TOMBOY_EXE)			\
+	-r:$(top_builddir)/bin/ExportToHTML.dll
 
 MONO_PATH = $(top_builddir)/Tomboy:$(top_builddir)/Tomboy/Plugins
 
 RESSOURCES =
 
-$(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
+$(TARGET): $(CSFILES) $(TOMBOY_EXE_PATH)
 	$(CSC) -out:$@ $(CSFLAGS) $(CSFILES) $(ASSEMBLIES) $(RESSOURCES)
 
 test: $(TARGET)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]