Sun Jan 2 18:23:54 EST 2005

Author: tberman
Date: 2005-01-02 18:23:53 -0500 (Sun, 02 Jan 2005)
New Revision: 2106

Modified:
   trunk/MonoDevelop/Core/gdldock/gdl/Makefile.am
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Makefile.am
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/Makefile.am
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/Makefile.am
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Makefile.am
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Makefile.am
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am
   trunk/MonoDevelop/Core/src/AddIns/Misc/StartPage/Makefile.am
   trunk/MonoDevelop/Core/src/AddIns/prj2make-sharp-lib/Makefile.am
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am
   trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/Makefile.am
   trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Makefile.am
   trunk/MonoDevelop/Core/src/MonoDevelop.Startup/Makefile.am
   trunk/MonoDevelop/configure.in
Log:
change the way deps are referenced, to eventually allow more flexibility.


Modified: trunk/MonoDevelop/Core/gdldock/gdl/Makefile.am
===================================================================

--- trunk/MonoDevelop/Core/gdldock/gdl/Makefile.am	2005-01-02 22:55:39 UTC (rev 2105)
+++ trunk/MonoDevelop/Core/gdldock/gdl/Makefile.am	2005-01-02 23:23:53 UTC (rev 2106)
@@ -32,7 +32,7 @@
 $(ASSEMBLY): $(build_sources) generated-stamp
 	mkdir -p ../../../build/bin
 	$(CSC) --unsafe -target:library \
-	@BASE_DEPENDENCIES_LIBS@ \
+	$(GTK_SHARP_LIBS) \
 	$(build_sources) generated/*.cs /out:$(ASSEMBLY) \
 	&& cp -p $(ASSEMBLY) ../../../build/bin/. \
 	&& cp -p $(ASSEMBLY).config ../../../build/bin/.

Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Makefile.am	2005-01-02 22:55:39 UTC (rev 2105)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Makefile.am	2005-01-02 23:23:53 UTC (rev 2106)
@@ -6,7 +6,8 @@
 	/r:../../../../../build/bin/MonoDevelop.Base.dll \
 	/r:../../../../../build/bin/ICSharpCode.SharpRefactory.dll \
 	/r:../../../../../build/bin/MonoDevelop.Gui.Widgets.dll  \
-	$(BASE_DEPENDENCIES_LIBS)
+	$(GTK_SHARP_LIBS) \
+	$(GLADE_SHARP_LIBS)
 
 FILES = \
 Gui/ChooseRuntimePanel.cs \

Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/Makefile.am	2005-01-02 22:55:39 UTC (rev 2105)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/Makefile.am	2005-01-02 23:23:53 UTC (rev 2106)
@@ -5,7 +5,7 @@
 	/r:../../../../../build/bin/MonoDevelop.Base.dll \
 	/r:../../../../../build/bin/MonoDevelop.SourceEditor.dll \
 	/r:../../../../../build/bin/MonoDevelop.Gui.Widgets.dll \
-	$(BASE_DEPENDENCIES_LIBS)
+	$(GTK_SHARP_LIBS)
 
 FILES = \
 Gui/CompilerParametersPanel.cs \

Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/Makefile.am	2005-01-02 22:55:39 UTC (rev 2105)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/Makefile.am	2005-01-02 23:23:53 UTC (rev 2106)
@@ -6,7 +6,7 @@
 	/r:../../../../../build/bin/MonoDevelop.SourceEditor.dll \
 	/r:../../../../../build/bin/MonoDevelop.Base.dll \
 	/r:../../../../../build/bin/MonoDevelop.Gui.Widgets.dll \
-	$(BASE_DEPENDENCIES_LIBS)
+	$(GTK_SHARP_LIBS)
 
 FILES = \
 Gui/ProjectConfigurationPropertyPanel.cs \

Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Makefile.am	2005-01-02 22:55:39 UTC (rev 2105)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Makefile.am	2005-01-02 23:23:53 UTC (rev 2106)
@@ -7,7 +7,8 @@
 	/r:../../../../../build/bin/MonoDevelop.Base.dll \
 	/r:../../../../../build/bin/ICSharpCode.SharpRefactory.dll \
 	/r:../../../../../build/bin/MonoDevelop.Gui.Widgets.dll \
-	$(BASE_DEPENDENCIES_LIBS)
+	$(GTK_SHARP_LIBS) \
+	$(GLADE_SHARP_LIBS)
 
 FILES = \
 Gui/CodeGenerationPanel.cs \

Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Makefile.am	2005-01-02 22:55:39 UTC (rev 2105)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Makefile.am	2005-01-02 23:23:53 UTC (rev 2106)
@@ -9,8 +9,9 @@
 	/r:../../../../../build/bin/ICSharpCode.SharpRefactory.dll \
 	/r:../../../../../build/bin/ICSharpCode.SharpRefactory.VB.dll \
 	/r:../../../../../build/bin/ICSharpCode.SharpAssembly.dll \
-	/r:../../../../../build/bin/MonoDevelop.Gui.Widgets.dll  \
-	$(BASE_DEPENDENCIES_LIBS)
+	/r:../../../../../build/bin/MonoDevelop.Gui.Widgets.dll \
+	$(GTK_SHARP_LIBS) \
+	$(GLADE_SHARP_LIBS)
 
 FILES = \
 AssemblyInfo.cs \

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am	2005-01-02 22:55:39 UTC (rev 2105)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am	2005-01-02 23:23:53 UTC (rev 2106)
@@ -82,7 +82,10 @@
 	/r:../../../../../build/bin/MonoDevelop.Base.dll \
 	/r:../../../../../build/bin/MonoDevelop.Gui.Utils.dll \
 	/r:../../../../../build/bin/MonoDevelop.Gui.Widgets.dll \
-	$(BASE_DEPENDENCIES_LIBS)
+	$(GTK_SHARP_LIBS) \
+	$(GLADE_SHARP_LIBS) \
+	$(GCONF_SHARP_LIBS) \
+	$(GTKSOURCEVIEW_SHARP_LIBS)
 
 all : $(DLL)
 

Modified: trunk/MonoDevelop/Core/src/AddIns/Misc/StartPage/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/Misc/StartPage/Makefile.am	2005-01-02 22:55:39 UTC (rev 2105)
+++ trunk/MonoDevelop/Core/src/AddIns/Misc/StartPage/Makefile.am	2005-01-02 23:23:53 UTC (rev 2106)
@@ -11,7 +11,8 @@
 REFS = /r:System.Drawing \
 	/r:../../../../../build/bin/MonoDevelop.Core.dll \
 	/r:../../../../../build/bin/MonoDevelop.Base.dll \
-	$(BASE_DEPENDENCIES_LIBS)
+	$(GTK_SHARP_LIBS) \
+	$(GECKO_SHARP_LIBS)
 
 all: $(DLL)
 

Modified: trunk/MonoDevelop/Core/src/AddIns/prj2make-sharp-lib/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/prj2make-sharp-lib/Makefile.am	2005-01-02 22:55:39 UTC (rev 2105)
+++ trunk/MonoDevelop/Core/src/AddIns/prj2make-sharp-lib/Makefile.am	2005-01-02 23:23:53 UTC (rev 2106)
@@ -3,7 +3,7 @@
 ADDIN = $(srcdir)/prj2make-sharp-lib.addin.xml
 
 
-DLLS = $(BASE_DEPENDENCIES_LIBS) \
+DLLS = $(GTK_SHARP_LIBS) \
 	/r:../../../../build/bin/MonoDevelop.Base.dll \
 	/r:../../../../build/bin/MonoDevelop.Core.dll \
 	/r:../../../../build/bin/MonoDevelop.Gui.Widgets.dll

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am	2005-01-02 22:55:39 UTC (rev 2105)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am	2005-01-02 23:23:53 UTC (rev 2106)
@@ -8,7 +8,12 @@
 	/r:System.Data.dll /r:System.Web.Services.dll \
 	/r:../../../build/bin/gdl-sharp.dll \
 	/r:Mono.Posix.dll \
-	$(BASE_DEPENDENCIES_LIBS)
+	$(GTK_SHARP_LIBS) \
+	$(GNOME_SHARP_LIBS) \
+	$(GECKO_SHARP_LIBS) \
+	$(GLADE_SHARP_LIBS) \
+	$(GTKHTML_SHARP_LIBS) \
+	$(MONODOC_LIBS)
 
 FILES= \
 Gui/Pads/ProjectBrowser/ProjectBrowserView.cs \

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/Makefile.am	2005-01-02 22:55:39 UTC (rev 2105)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/Makefile.am	2005-01-02 23:23:53 UTC (rev 2106)
@@ -2,7 +2,8 @@
 
 REFERENCES = /r:System.Drawing \
 	/r:ICSharpCode.SharpZipLib \
-	$(BASE_DEPENDENCIES_LIBS)
+	$(GTK_SHARP_LIBS) \
+	$(GNOME_SHARP_LIBS)
 
 FILES = \
 FileIcons/FileIconLoader.cs \

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Makefile.am	2005-01-02 22:55:39 UTC (rev 2105)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Makefile.am	2005-01-02 23:23:53 UTC (rev 2106)
@@ -4,7 +4,9 @@
 REFERENCES = /r:System.Drawing \
 	/r:../../../build/bin/MonoDevelop.Core.dll \
 	/r:../../../build/bin/MonoDevelop.Gui.Utils.dll \
-	$(BASE_DEPENDENCIES_LIBS)
+	$(GTK_SHARP_LIBS) \
+	$(GLADE_SHARP_LIBS) \
+	$(GNOME_SHARP_LIBS)
 
 FILES = \
 Tree/TreeView.cs \

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Startup/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Startup/Makefile.am	2005-01-02 22:55:39 UTC (rev 2105)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Startup/Makefile.am	2005-01-02 23:23:53 UTC (rev 2106)
@@ -15,7 +15,8 @@
 	/r:../../../build/bin/MonoDevelop.Base.dll \
 	/r:Mono.Posix.dll \
 	/r:Mono.GetOptions.dll \
-	$(BASE_DEPENDENCIES_LIBS)
+	$(GTK_SHARP_LIBS) \
+	$(GNOME_SHARP_LIBS)
 
 $(DLL): $(build_sources)
 	$(CSC) /out:$(DLL) \

Modified: trunk/MonoDevelop/configure.in
===================================================================
--- trunk/MonoDevelop/configure.in	2005-01-02 22:55:39 UTC (rev 2105)
+++ trunk/MonoDevelop/configure.in	2005-01-02 23:23:53 UTC (rev 2106)
@@ -74,10 +74,22 @@
 GECKOSHARP_REQUIRED_VERSION=0.5
 MONODOC_REQUIRED_VERSION=1.0
 
-PKG_CHECK_MODULES(BASE_DEPENDENCIES, gnome-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION glade-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION gtkhtml-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION)
-PKG_CHECK_MODULES(EXTRA_CRAP, gtksourceview-sharp >= $GTKSOURCEVIEWSHARP_REQUIRED_VERSION gecko-sharp >= $GECKOSHARP_REQUIRED_VERSION monodoc >= $MONODOC_REQUIRED_VERSION)
-BASE_DEPENDENCIES_LIBS=${BASE_DEPENDENCIES_LIBS}${EXTRA_CRAP_LIBS}	
-AC_SUBST(BASE_DEPENDENCIES_LIBS)
+PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION)
+AC_SUBST(GTK_SHARP_LIBS)
+PKG_CHECK_MODULES(GNOME_SHARP, gnome-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION)
+AC_SUBST(GNOME_SHARP_LIBS)
+PKG_CHECK_MODULES(GLADE_SHARP, glade-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION)
+AC_SUBST(GLADE_SHARP_LIBS)
+PKG_CHECK_MODULES(GCONF_SHARP, gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION)
+AC_SUBST(GCONF_SHARP_LIBS)
+PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION)
+AC_SUBST(GTKHTML_SHARP_LIBS)
+PKG_CHECK_MODULES(GTKSOURCEVIEW_SHARP, gtksourceview-sharp >= $GTKSOURCEVIEWSHARP_REQUIRED_VERSION)
+AC_SUBST(GTKSOURCEVIEW_SHARP_LIBS)
+PKG_CHECK_MODULES(GECKO_SHARP, gecko-sharp >= $GECKOSHARP_REQUIRED_VERSION)
+AC_SUBST(GECKO_SHARP_LIBS)
+PKG_CHECK_MODULES(MONODOC, monodoc >= $MONODOC_REQUIRED_VERSION)
+AC_SUBST(MONODOC_LIBS)
 
 gtksharp_prefix="`$PKG_CONFIG --variable=prefix gtk-sharp-2.0`"
 AC_SUBST(gtksharp_prefix)


