From b1ffb52b9ae5778a0dcf629f5833db1e810947b4 Mon Sep 17 00:00:00 2001
From: Leonardo Robol <leo@robol.it>
Date: Tue, 9 Feb 2010 10:22:23 +0100
Subject: [PATCH] Aggiornati makefile per coincidere con i nuovi spostamenti.

---
 Dizzy.make       | 38 ++++++++++++++++++++------------------
 Makefile.include |  2 ++
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/Dizzy.make b/Dizzy.make
index fad8ed1..8e873e8 100644
--- a/Dizzy.make
+++ b/Dizzy.make
@@ -11,7 +11,7 @@ COMPILE_TARGET = exe
 PROJECT_REFERENCES = 
 BUILD_DIR = bin/Debug
 
-SQLITE3_DLL_SOURCE=sqlite3.dll
+SQLITE3_DLL_SOURCE=Dizzy/sqlite3.dll
 TAMIR_SHARPSSH_DLL_SOURCE=Tamir.SharpSSH.dll
 DIFFIEHELLMAN_DLL_SOURCE=DiffieHellman.dll
 ORG_MENTALIS_SECURITY_DLL_SOURCE=Org.Mentalis.Security.dll
@@ -30,7 +30,7 @@ COMPILE_TARGET = exe
 PROJECT_REFERENCES = 
 BUILD_DIR = bin/Release
 
-SQLITE3_DLL_SOURCE=sqlite3.dll
+SQLITE3_DLL_SOURCE=Dizzy/sqlite3.dll
 TAMIR_SHARPSSH_DLL_SOURCE=Tamir.SharpSSH.dll
 DIFFIEHELLMAN_DLL_SOURCE=DiffieHellman.dll
 ORG_MENTALIS_SECURITY_DLL_SOURCE=Org.Mentalis.Security.dll
@@ -42,8 +42,10 @@ endif
 AL=al2
 SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll
 
+PROGRAMFILES_DIZZY = \
+	$(SQLITE3_DLL)  
+
 PROGRAMFILES = \
-	$(SQLITE3_DLL) \
 	$(TAMIR_SHARPSSH_DLL) \
 	$(DIFFIEHELLMAN_DLL) \
 	$(ORG_MENTALIS_SECURITY_DLL) \
@@ -56,30 +58,30 @@ BINARIES = \
 
 RESGEN=resgen2
 	
-all: $(ASSEMBLY) $(PROGRAMFILES) $(BINARIES) 
+all: $(ASSEMBLY) $(PROGRAMFILES_DIZZY) $(PROGRAMFILES) $(BINARIES) 
 
 FILES = \
 	gtk-gui/generated.cs \
-	MainWindow.cs \
 	gtk-gui/MainWindow.cs \
-	Main.cs \
-	AssemblyInfo.cs \
-	File.cs \
-	FileTreeView.cs \
-	TaskTreeView.cs \
-	Protocol.cs \
-	GlobalConfig.cs \
-	AuthDialog.cs \
-	gtk-gui/Dizzy.AuthDialog.cs 
+	gtk-gui/Dizzy.AuthDialog.cs \
+	Dizzy/AuthDialog.cs \
+	Dizzy/File.cs \
+	Dizzy/FileTreeView.cs \
+	Dizzy/GlobalConfig.cs \
+	Dizzy/Main.cs \
+	Dizzy/MainWindow.cs \
+	Dizzy/Protocol.cs \
+	Dizzy/TaskTreeView.cs \
+	Dizzy/AssemblyInfo.cs 
 
 DATA_FILES = 
 
 RESOURCES = \
 	gtk-gui/gui.stetic \
-	sqlite3.dll,Dizzy.sqlite3.dll 
+	Dizzy/sqlite3.dll,Dizzy.Dizzy.sqlite3.dll 
 
 EXTRAS = \
-	app.desktop \
+	Dizzy/app.desktop \
 	dizzy.in 
 
 REFERENCES =  \
@@ -95,11 +97,11 @@ DLL_REFERENCES =  \
 	DiffieHellman.dll \
 	System.Data.SQLite.dll
 
-CLEANFILES = $(PROGRAMFILES) $(BINARIES) 
+CLEANFILES = $(PROGRAMFILES_DIZZY) $(PROGRAMFILES) $(BINARIES) 
 
 include $(top_srcdir)/Makefile.include
 
-SQLITE3_DLL = $(BUILD_DIR)/sqlite3.dll
+SQLITE3_DLL = $(BUILD_DIR)/Dizzy/sqlite3.dll
 TAMIR_SHARPSSH_DLL = $(BUILD_DIR)/Tamir.SharpSSH.dll
 DIFFIEHELLMAN_DLL = $(BUILD_DIR)/DiffieHellman.dll
 ORG_MENTALIS_SECURITY_DLL = $(BUILD_DIR)/Org.Mentalis.Security.dll
diff --git a/Makefile.include b/Makefile.include
index eb200ad..79e6aed 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -65,6 +65,8 @@ DISTCLEANFILES = $(GENERATED_FILES) $(pc_files) $(BUILD_DIR)/*
 pkglib_SCRIPTS = $(ASSEMBLY)
 bin_SCRIPTS = $(BINARIES)
 
+programfilesdizzydir = @libdir@/@PACKAGE@/Dizzy
+programfilesdizzy_DATA = $(PROGRAMFILES_DIZZY)
 programfilesdir = @libdir@/@PACKAGE@
 programfiles_DATA = $(PROGRAMFILES)
 
-- 
2.1.4