2007-09-20 Ben Motmans <ben.motmans@gmail.com>

	* Makefile.am: changed reference to contrib/Sqlite and contrib/MySql

svn path=/trunk/monodevelop/; revision=86089

4 files changed, 55 insertions, 32 deletions

diff --git a/Extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/ChangeLog b/Extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/ChangeLog
index de2bf1080e..fbd3298aa4 100644
--- a/Extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/ChangeLog
+++ b/Extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-20 Ben Motmans <ben.motmans@gmail.com> 
+
+	* Makefile.am: changed reference to contrib/MySql
+
 2007-09-16  Ben Motmans <ben.motmans@gmail.com> 
 
 	* Makefile.am: link to the correct Mono.Addins dll
diff --git a/Extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/Makefile.am b/Extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/Makefile.am
index fcdd679d61..9647432a2d 100644
--- a/Extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/Makefile.am
+++ b/Extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/Makefile.am
@@ -2,16 +2,20 @@ ADDIN_BUILD = $(top_builddir)/build/AddIns/MonoDevelop.Database
 ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.Database.Sql.MySql.dll
 REFS =  \
 	$(GTK_SHARP_LIBS) \
+	-r:$(top_builddir)/build/AddIns/MonoDevelop.Components.dll \
+	-r:$(top_builddir)/build/AddIns/MonoDevelop.Core.Gui.dll \
 	-r:$(top_builddir)/build/AddIns/MonoDevelop.Database/MonoDevelop.Database.Components.dll \
 	-r:$(top_builddir)/build/AddIns/MonoDevelop.Database/MonoDevelop.Database.Designer.dll \
 	-r:$(top_builddir)/build/AddIns/MonoDevelop.Database/MonoDevelop.Database.Sql.dll \
-	-r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \
+	-r:$(top_builddir)/build/AddIns/MonoDevelop.Ide.dll \
+	-r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
-	-r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
-	-r:$(top_builddir)/build/bin/MonoDevelop.Ide.dll \
-	-r:$(top_builddir)/build/bin/MonoDevelop.Projects.dll \
-	-r:$(top_builddir)/build/bin/MonoDevelop.Projects.Gui.dll \
-	-r:$(top_srcdir)/build/bin/contrib/Mono.Addins.dll \
+	-r:$(top_srcdir)/build/AddIns/MonoDevelop.Components.dll \
+	-r:$(top_srcdir)/build/AddIns/MonoDevelop.Core.Gui.dll \
+	-r:$(top_srcdir)/build/AddIns/MonoDevelop.Ide.dll \
+	-r:$(top_srcdir)/build/AddIns/MonoDevelop.Projects.dll \
+	-r:$(top_srcdir)/build/bin/MonoDevelop.Core.dll \
+	-r:$(top_srcdir)/build/bin/Mono.Addins.dll \
 	-r:$(top_srcdir)/contrib/MySql/MySql.Data.dll \
 	-r:System \
 	-r:System.Data
@@ -25,17 +29,16 @@ FILES =  \
 	MySqlSchemaProvider.cs
 
 MYSQL_FILES = \
-	libs/MySql.Data.dll
+	MySql.Data.dll
 
 RES = MonoDevelop.Database.Sql.MySql.addin.xml
 
+SRC_MYSQL_FILES = $(addprefix $(top_builddir)/contrib/MySql/, $(MYSQL_FILES))
+BUILD_MYSQL_FILES = $(addprefix $(ADDIN_BUILD)/, $(notdir $(MYSQL_FILES)))
+
 ADDIN = MonoDevelop.Database.Sql.MySql.addin.xml
 
-if ENABLE_MYSQL
-all: $(ASSEMBLY) $(ADDIN_BUILD)/$(ADDIN)
-else

-all:

-endif
+all: $(ASSEMBLY) $(ADDIN_BUILD)/$(ADDIN) $(BUILD_MYSQL_FILES)
 
 $(ADDIN_BUILD)/$(ADDIN): $(srcdir)/$(ADDIN)
 	mkdir -p $(ADDIN_BUILD)
@@ -45,17 +48,19 @@ $(ADDIN_BUILD)/%: $(srcdir)/lib/%
 	mkdir -p $(ADDIN_BUILD)
 	cp $< $@
 
+$(BUILD_MYSQL_FILES): $(SRC_MYSQL_FILES)
+	mkdir -p $(ADDIN_BUILD)
+	cp $(SRC_MYSQL_FILES) $(ADDIN_BUILD)/.
+
 $(ASSEMBLY): $(FILES) $(build_resources)
 	mkdir -p $(ADDIN_BUILD)
 	$(CSC) $(CSC_FLAGS) $(REFS) $(build_resources:%=/resource:%) $(build_sources) -out:$@ -target:library
 
 
-if ENABLE_MYSQL
 assemblydir = $(MD_ADDIN_DIR)/MonoDevelop.Database
-assembly_DATA = $(ASSEMBLY) $(ADDIN)
-endif
+assembly_DATA = $(ASSEMBLY) $(ADDIN) $(SRC_MYSQL_FILES)
 
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
-EXTRA_DIST = 
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(BUILD_MYSQL_FILES)
+EXTRA_DIST = $(SRC_MYSQL_FILES)
 
 include $(top_srcdir)/Makefile.include
diff --git a/Extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/ChangeLog b/Extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/ChangeLog
index ef7b393ab3..b4866c7f7d 100644
--- a/Extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/ChangeLog
+++ b/Extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-20  Ben Motmans <ben.motmans@gmail.com> 
+
+	* Makefile.am: changed reference to contrib/Sqlite
+
 2007-09-19  Ben Motmans <ben.motmans@gmail.com> 
 
 	* MonoDevelop.Database.Sql.Sqlite.addin.xml: temporarily disabled the Create
diff --git a/Extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/Makefile.am b/Extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/Makefile.am
index 3e4489e66b..4a83c339c6 100644
--- a/Extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/Makefile.am
+++ b/Extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/Makefile.am
@@ -2,15 +2,20 @@ ADDIN_BUILD = $(top_builddir)/build/AddIns/MonoDevelop.Database
 ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.Database.Sql.Sqlite.dll
 REFS =  \
 	$(GTK_SHARP_LIBS) \
+	-r:$(top_builddir)/build/AddIns/MonoDevelop.Components.dll \
+	-r:$(top_builddir)/build/AddIns/MonoDevelop.Core.Gui.dll \
 	-r:$(top_builddir)/build/AddIns/MonoDevelop.Database/MonoDevelop.Database.Components.dll \
 	-r:$(top_builddir)/build/AddIns/MonoDevelop.Database/MonoDevelop.Database.Designer.dll \
 	-r:$(top_builddir)/build/AddIns/MonoDevelop.Database/MonoDevelop.Database.Sql.dll \
-	-r:$(top_builddir)/build/bin/Mono.Addins.dll \
-	-r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \
+	-r:$(top_builddir)/build/AddIns/MonoDevelop.Ide.dll \
+	-r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
-	-r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
-	-r:$(top_builddir)/build/bin/MonoDevelop.Ide.dll \
-	-r:$(top_builddir)/build/bin/MonoDevelop.Projects.dll \
+	-r:$(top_srcdir)/build/AddIns/MonoDevelop.Components.dll \
+	-r:$(top_srcdir)/build/AddIns/MonoDevelop.Core.Gui.dll \
+	-r:$(top_srcdir)/build/AddIns/MonoDevelop.Ide.dll \
+	-r:$(top_srcdir)/build/AddIns/MonoDevelop.Projects.dll \
+	-r:$(top_srcdir)/build/bin/MonoDevelop.Core.dll \
+	-r:$(top_srcdir)/build/bin/Mono.Addins.dll \
 	-r:$(top_srcdir)/contrib/Sqlite/Mono.Data.Sqlite.dll \
 	-r:Mono.Data \
 	-r:System \
@@ -26,13 +31,15 @@ FILES =  \
 
 RES = MonoDevelop.Database.Sql.Sqlite.addin.xml
 
+SQLITE_FILES = \
+	Mono.Data.Sqlite.dll
+
+SRC_SQLITE_FILES = $(addprefix $(top_builddir)/contrib/Sqlite/, $(SQLITE_FILES))
+BUILD_SQLITE_FILES = $(addprefix $(ADDIN_BUILD)/, $(notdir $(SQLITE_FILES)))
+
 ADDIN = MonoDevelop.Database.Sql.Sqlite.addin.xml
 
-if ENABLE_SQLITE
-all: $(ASSEMBLY) $(ADDIN_BUILD)/$(ADDIN)
-else

-all:

-endif
+all: $(ASSEMBLY) $(ADDIN_BUILD)/$(ADDIN) $(BUILD_SQLITE_FILES)
 
 $(ADDIN_BUILD)/$(ADDIN): $(srcdir)/$(ADDIN)
 	mkdir -p $(ADDIN_BUILD)
@@ -42,16 +49,19 @@ $(ADDIN_BUILD)/%: $(srcdir)/lib/%
 	mkdir -p $(ADDIN_BUILD)
 	cp $< $@
 
+$(BUILD_SQLITE_FILES): $(SRC_SQLITE_FILES)
+	mkdir -p $(ADDIN_BUILD)
+	cp $(SRC_SQLITE_FILES) $(ADDIN_BUILD)/.
+
 $(ASSEMBLY): $(FILES) $(build_resources)
 	mkdir -p $(ADDIN_BUILD)
 	$(CSC) $(CSC_FLAGS) $(REFS) $(build_resources:%=/resource:%) $(build_sources) -out:$@ -target:library
 
-if ENABLE_SQLITE
+
 assemblydir = $(MD_ADDIN_DIR)/MonoDevelop.Database
-assembly_DATA = $(ASSEMBLY) $(ADDIN)
-endif
+assembly_DATA = $(ASSEMBLY) $(ADDIN) $(SRC_SQLITE_FILES)
 
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
-EXTRA_DIST = 
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(BUILD_SQLITE_FILES)
+EXTRA_DIST = $(SRC_SQLITE_FILES)
 
 include $(top_srcdir)/Makefile.include