[Monodevelop-patches-list] r1585 - in trunk/MonoDevelop: . src/AddIns/BackendBindings/CSharpBinding src/AddIns/BackendBindings/ILAsmBinding src/AddIns/BackendBindings/JavaBinding src/AddIns/BackendBindings/NemerleBinding src/AddIns/DebuggerAddIn src/AddIns/DisplayBindings/SourceEditor src/AddIns/Misc/StartPage src/AddIns/Nunit src/AddIns/prj2make-sharp-lib src/Libraries/MonoDevelop.Core src/Libraries/MonoDevelop.Gui.Utils src/Libraries/MonoDevelop.Gui.Widgets src/Main/Base src/Main/StartUp

commit-watcher at mono-cvs.ximian.com commit-watcher at mono-cvs.ximian.com
Thu May 6 00:11:52 EDT 2004


Author: jluke
Date: 2004-05-06 00:11:52 -0400 (Thu, 06 May 2004)
New Revision: 1585

Modified:
   trunk/MonoDevelop/ChangeLog
   trunk/MonoDevelop/configure.in
   trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Makefile.am
   trunk/MonoDevelop/src/AddIns/BackendBindings/ILAsmBinding/Makefile.am
   trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/Makefile.am
   trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Makefile.am
   trunk/MonoDevelop/src/AddIns/DebuggerAddIn/Makefile.am
   trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Makefile.am
   trunk/MonoDevelop/src/AddIns/Misc/StartPage/Makefile.am
   trunk/MonoDevelop/src/AddIns/Nunit/Makefile.am
   trunk/MonoDevelop/src/AddIns/prj2make-sharp-lib/Makefile.am
   trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Makefile.am
   trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Utils/Makefile.am
   trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Makefile.am
   trunk/MonoDevelop/src/Main/Base/Makefile.am
   trunk/MonoDevelop/src/Main/StartUp/Makefile.am
Log:
makefile crap never ends


Modified: trunk/MonoDevelop/ChangeLog
===================================================================
--- trunk/MonoDevelop/ChangeLog	2004-05-06 03:28:58 UTC (rev 1584)
+++ trunk/MonoDevelop/ChangeLog	2004-05-06 04:11:52 UTC (rev 1585)
@@ -1,3 +1,12 @@
+2004-05-06  John Luke  <jluke at cfl.rr.com>
+
+	* configure.in: split unmanaged stuff into there own check
+	so $(BASE_DEPENDENCIES_LIBS) is useful for us, remove the 
+	individual AC_SUBST's
+	* *Makefile.am: use BASE_DEPENDENCIES_LIBS instead of specifying
+	all the refs individually and split the references into a seperate
+	variable in those that weren't already
+
 2004-05-04  Pawel Rozanski  <tokugawa at afn.no-ip.org>
 
 	* build/AddIns/AddIns/BackendBindings/BackendBindings.addin.xml:

Modified: trunk/MonoDevelop/configure.in
===================================================================
--- trunk/MonoDevelop/configure.in	2004-05-06 03:28:58 UTC (rev 1584)
+++ trunk/MonoDevelop/configure.in	2004-05-06 04:11:52 UTC (rev 1585)
@@ -27,46 +27,34 @@
         AC_MSG_ERROR([You need to install pkg-config])
 fi
 
-dnl hard dependencies
-MONO_REQUIRED_VERSION=0.90
-GTKSHARP_REQUIRED_VERSION=0.91
+dnl unmanaged hard dependencies
+MONO_REQUIRED_VERSION=0.91
 GTKSOURCEVIEW_REQUIRED_VERSION=0.7
+GNOMEVFS_REQUIRED_VERSION=2.0
+PKG_CHECK_MODULES(UNMANAGED_DEPENDENCIES,
+mono >= $MONO_REQUIRED_VERSION
+gtksourceview-1.0 >= $GTKSOURCEVIEW_REQUIRED_VERSION
+gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED_VERSION
+)
+
+dnl hard dependencies
+GTKSHARP_REQUIRED_VERSION=0.91.1
 GTKSOURCEVIEWSHARP_REQUIRED_VERSION=0.2
 GECKOSHARP_REQUIRED_VERSION=0.2
-GNOMEVFS_REQUIRED_VERSION=2.0
 MONODOC_REQUIRED_VERSION=0.14
 
 PKG_CHECK_MODULES(BASE_DEPENDENCIES,
-mono >= $MONO_REQUIRED_VERSION
 gtk-sharp >= $GTKSHARP_REQUIRED_VERSION
 glade-sharp >= $GTKSHARP_REQUIRED_VERSION
 gconf-sharp >= $GTKSHARP_REQUIRED_VERSION
 gnome-sharp >= $GTKSHARP_REQUIRED_VERSION
 gtkhtml-sharp >= $GTKSHARP_REQUIRED_VERSION
-gtksourceview-1.0 >= $GTKSOURCEVIEW_REQUIRED_VERSION
 gtksourceview-sharp >= $GTKSOURCEVIEWSHARP_REQUIRED_VERSION
 gecko-sharp >= $GECKOSHARP_REQUIRED_VERSION
-gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED_VERSION
 monodoc >= $MONODOC_REQUIRED_VERSION)
 
 gtksharp_prefix=`pkg-config --variable=prefix gtk-sharp`
 AC_SUBST(gtksharp_prefix)
-GTKSOURCEVIEW_SHARP="`pkg-config --libs gtksourceview-sharp`"
-AC_SUBST(GTKSOURCEVIEW_SHARP)
-GECKO_SHARP="`pkg-config --libs gecko-sharp`"
-AC_SUBST(GECKO_SHARP)
-MONODOC="`pkg-config --libs monodoc`"
-AC_SUBST(MONODOC)
-GTKSHARP="`pkg-config --libs gtk-sharp`"
-AC_SUBST(GTKSHARP)
-GLADESHARP="`pkg-config --libs glade-sharp`"
-AC_SUBST(GLADESHARP)
-GNOMESHARP="`pkg-config --libs gnome-sharp`"
-AC_SUBST(GNOMESHARP)
-GCONFSHARP="`pkg-config --libs gconf-sharp`"
-AC_SUBST(GCONFSHARP)
-GTKHTMLSHARP="`pkg-config --libs gtkhtml-sharp`"
-AC_SUBST(GTKHTMLSHARP)
 
 dnl GdlDock requirements and configuration
 GTK_REQUIRED=2.2.0

Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Makefile.am	2004-05-06 03:28:58 UTC (rev 1584)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Makefile.am	2004-05-06 04:11:52 UTC (rev 1585)
@@ -7,9 +7,7 @@
 	/r:../../../../build/bin/MonoDevelop.Base.dll \
 	/r:../../../../build/bin/ICSharpCode.SharpRefactory.dll \
 	/r:../../../../build/bin/MonoDevelop.Gui.Widgets.dll  \
-	@GTKSHARP@ \
-	@GLADESHARP@ \
-	$(GTKSOURCEVIEW_SHARP) 
+	$(BASE_DEPENDENCIES_LIBS)
 
 FILES = \
 ./Gui/ChooseRuntimePanel.cs \

Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/ILAsmBinding/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/ILAsmBinding/Makefile.am	2004-05-06 03:28:58 UTC (rev 1584)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/ILAsmBinding/Makefile.am	2004-05-06 04:11:52 UTC (rev 1585)
@@ -6,7 +6,7 @@
 	/r:../../../../build/bin/MonoDevelop.Base.dll \
 	/r:../../../../build/bin/MonoDevelop.SourceEditor.dll \
 	/r:../../../../build/bin/MonoDevelop.Gui.Widgets.dll \
-	@GTKSHARP@
+	$(BASE_DEPENDENCIES_LIBS)
 
 FILES = \
 ./Gui/CompilerParametersPanel.cs \

Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/Makefile.am	2004-05-06 03:28:58 UTC (rev 1584)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/Makefile.am	2004-05-06 04:11:52 UTC (rev 1585)
@@ -7,7 +7,7 @@
 	/r:../../../../build/bin/MonoDevelop.SourceEditor.dll \
 	/r:../../../../build/bin/MonoDevelop.Base.dll \
 	/r:../../../../build/bin/MonoDevelop.Gui.Widgets.dll \
-	@GTKSHARP@
+	$(BASE_DEPENDENCIES_LIBS)
 
 FILES = ./Gui/ProjectConfigurationPropertyPanel.cs \
 ./Project/JavaCompilerParameters.cs \

Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Makefile.am	2004-05-06 03:28:58 UTC (rev 1584)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Makefile.am	2004-05-06 04:11:52 UTC (rev 1585)
@@ -8,8 +8,7 @@
 	/r:../../../../build/bin/MonoDevelop.Base.dll \
 	/r:../../../../build/bin/ICSharpCode.SharpRefactory.dll \
 	/r:../../../../build/bin/MonoDevelop.Gui.Widgets.dll \
-	@GTKSHARP@ \
-	@GLADESHARP@
+	$(BASE_DEPENDENCIES_LIBS)
 
 FILES = \
 ./Gui/CodeGenerationPanel.cs \

Modified: trunk/MonoDevelop/src/AddIns/DebuggerAddIn/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/AddIns/DebuggerAddIn/Makefile.am	2004-05-06 03:28:58 UTC (rev 1584)
+++ trunk/MonoDevelop/src/AddIns/DebuggerAddIn/Makefile.am	2004-05-06 04:11:52 UTC (rev 1585)
@@ -3,7 +3,7 @@
 ASSEMBLY = MonoDevelop.Debugger.dll
 ADDIN = $(srcdir)/MonoDevelopDebugger.addin.xml
 
-DLLS = @GTKSHARP@ \
+DLLS = $(BASE_DEPENDENCIES_LIBS) \
 	/r:$(debugger_prefix)/lib/Mono.Debugger.dll \
 	/r:../../../build/bin/MonoDevelop.Base.dll \
 	/r:../../../build/bin/MonoDevelop.Core.dll

Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Makefile.am	2004-05-06 03:28:58 UTC (rev 1584)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Makefile.am	2004-05-06 04:11:52 UTC (rev 1585)
@@ -72,22 +72,19 @@
 
 build_sources = $(addprefix $(srcdir)/, $(FILES))
 
+REFS = /r:System.Drawing.dll \
+	/r:../../../../build/bin/MonoDevelop.Core.dll \
+	/r:../../../../build/bin/MonoDevelop.Base.dll \
+	/r:../../../../build/bin/MonoDevelop.Gui.Utils.dll \
+	/r:../../../../build/bin/MonoDevelop.Gui.Widgets.dll \
+	$(BASE_DEPENDENCIES_LIBS)
+
 all : $(DLL)
 
 $(DLL) : $(build_sources)
-	mcs $(build_sources) /debug /out:$(DLL) /t:library \
+	mcs $(build_sources) /debug /out:$(DLL) /t:library $(REFS) \
 	/resource:$(srcdir)/../../../../data/resources/glade/EditorBindings.glade,EditorBindings.glade \
 	/resource:$(srcdir)/../../../../data/resources/glade/texteditoraddin.glade,texteditoraddin.glade \
-		/r:../../../../build/bin/MonoDevelop.Core.dll \
-		/r:../../../../build/bin/MonoDevelop.Base.dll \
-		/r:../../../../build/bin/MonoDevelop.Gui.Utils.dll \
-		/r:../../../../build/bin/MonoDevelop.Gui.Widgets.dll \
-		@GTKSHARP@ \
-		@GLADESHARP@ \
-		@GNOMESHARP@ \
-		@GCONFSHARP@ \
-		$(GTKSOURCEVIEW_SHARP) \
-		/r:System.Drawing \
 	&& cp $(DLL) ../../../../build/bin/.
 
 assemblydir = $(libdir)/monodevelop/bin

Modified: trunk/MonoDevelop/src/AddIns/Misc/StartPage/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/AddIns/Misc/StartPage/Makefile.am	2004-05-06 03:28:58 UTC (rev 1584)
+++ trunk/MonoDevelop/src/AddIns/Misc/StartPage/Makefile.am	2004-05-06 04:11:52 UTC (rev 1585)
@@ -8,14 +8,15 @@
 
 DLL = MonoDevelop.StartPage.dll
 
+REFS = /r:System.Drawing \
+	/r:../../../../build/bin/MonoDevelop.Core.dll \
+	/r:../../../../build/bin/MonoDevelop.Base.dll \
+	$(BASE_DEPENDENCIES_LIBS)
+
 all: $(DLL)
 
 $(DLL): $(build_sources)
-	mcs /debug /out:$(DLL) /target:library /r:System.Drawing \
-		/r:../../../../build/bin/MonoDevelop.Core.dll \
-		/r:../../../../build/bin/MonoDevelop.Base.dll \
-		@GECKO_SHARP@ \
-		@GTKSHARP@ \
+	mcs /debug /out:$(DLL) /target:library $(REFS) \
 		$(build_sources) \
 	&& cp $(DLL) ../../../../build/AddIns/AddIns/Misc/StartPage/.
 

Modified: trunk/MonoDevelop/src/AddIns/Nunit/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/AddIns/Nunit/Makefile.am	2004-05-06 03:28:58 UTC (rev 1584)
+++ trunk/MonoDevelop/src/AddIns/Nunit/Makefile.am	2004-05-06 04:11:52 UTC (rev 1585)
@@ -4,9 +4,9 @@
 ADDIN = $(srcdir)/MonoDevelopNunit.addin.xml
 
 DLLS = /r:NUnit.Framework.dll \
-	@GTKSHARP@ \
 	/r:../../../build/bin/MonoDevelop.Core.dll \
-	/r:../../../build/bin/MonoDevelop.Base.dll
+	/r:../../../build/bin/MonoDevelop.Base.dll \
+	$(BASE_DEPENDENCIES_LIBS)
 
 FILES = AssemblyInfo.cs \
 ./Commands/NunitCommands.cs \

Modified: trunk/MonoDevelop/src/AddIns/prj2make-sharp-lib/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/AddIns/prj2make-sharp-lib/Makefile.am	2004-05-06 03:28:58 UTC (rev 1584)
+++ trunk/MonoDevelop/src/AddIns/prj2make-sharp-lib/Makefile.am	2004-05-06 04:11:52 UTC (rev 1585)
@@ -4,9 +4,7 @@
 ADDIN = $(srcdir)/prj2make-sharp-lib.addin.xml
 
 
-DLLS = /r:gdk-sharp.dll \
-	/r:glib-sharp.dll \
-	/r:gtk-sharp.dll /r:pango-sharp.dll \
+DLLS = $(BASE_DEPENDENCIES_LIBS) \
 	/r:../../../build/bin/MonoDevelop.Base.dll \
 	/r:../../../build/bin/MonoDevelop.Core.dll
 

Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Makefile.am	2004-05-06 03:28:58 UTC (rev 1584)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Makefile.am	2004-05-06 04:11:52 UTC (rev 1585)
@@ -63,10 +63,12 @@
 
 DLL = MonoDevelop.Core.dll
 
+REFS = /r:System.Drawing.dll
+
 all: $(DLL)
 
 $(DLL): $(build_sources)
-	mcs /debug /out:$(DLL) /target:library /r:System.Drawing.dll /define:LINUX /resource:$(srcdir)/../../../data/resources/AddIn.xsd,AddIn.xsd \
+	mcs /debug /out:$(DLL) /target:library $(REFS) /define:LINUX /resource:$(srcdir)/../../../data/resources/AddIn.xsd,AddIn.xsd \
 	$(build_sources) && cp $(DLL) ../../../build/bin/.
 
 assemblydir = $(libdir)/monodevelop/bin

Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Utils/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Utils/Makefile.am	2004-05-06 03:28:58 UTC (rev 1584)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Utils/Makefile.am	2004-05-06 04:11:52 UTC (rev 1585)
@@ -1,6 +1,9 @@
 DLL = MonoDevelop.Gui.Utils.dll
-REFERENCES=/r:System.Drawing /r:gtk-sharp /r:gdk-sharp /r:pango-sharp /r:gnome-sharp /r:glib-sharp /r:glade-sharp /r:ICSharpCode.SharpZipLib
 
+REFERENCES = /r:System.Drawing \
+	/r:ICSharpCode.SharpZipLib \
+	$(BASE_DEPENDENCIES_LIBS)
+
 FILES = ./FileIcons/FileIconLoader.cs \
 ./AssemblyInfo.cs \
 ./VFS/Vfs.cs \

Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Makefile.am	2004-05-06 03:28:58 UTC (rev 1584)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Makefile.am	2004-05-06 04:11:52 UTC (rev 1585)
@@ -3,7 +3,10 @@
 
 DLL = MonoDevelop.Gui.Widgets.dll
 
-REFERENCES = /r:System.Drawing @GTKSHARP@ @GNOMESHARP@ @GLADESHARP@ /r:../../../build/bin/MonoDevelop.Core.dll /r:../../../build/bin/MonoDevelop.Gui.Utils.dll
+REFERENCES = /r:System.Drawing \
+	/r:../../../build/bin/MonoDevelop.Core.dll \
+	/r:../../../build/bin/MonoDevelop.Gui.Utils.dll \
+	$(BASE_DEPENDENCIES_LIBS)
 
 FILES = ./Tree/TreeView.cs \
 ./Tree/TreeNodeCollection.cs \

Modified: trunk/MonoDevelop/src/Main/Base/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Makefile.am	2004-05-06 03:28:58 UTC (rev 1584)
+++ trunk/MonoDevelop/src/Main/Base/Makefile.am	2004-05-06 04:11:52 UTC (rev 1585)
@@ -8,12 +8,8 @@
 	/r:../../../build/bin/MonoDevelop.Gui.Utils.dll \
 	/r:../../../build/bin/MonoDevelop.Gui.Widgets.dll \
 	/r:System.Data /r:System.Web.Services \
-	@GTKSHARP@ \
 	/r:../../../build/bin/gdl-sharp.dll \
-	@GLADESHARP@ \
-	@GNOMESHARP@ \
-	@GTKHTMLSHARP@ \
-	$(GECKO_SHARP) $(MONODOC)
+	$(BASE_DEPENDENCIES_LIBS)
 
 FILES= \
 ./Gui/Pads/ProjectBrowser/ProjectBrowserView.cs \

Modified: trunk/MonoDevelop/src/Main/StartUp/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/Main/StartUp/Makefile.am	2004-05-06 03:28:58 UTC (rev 1584)
+++ trunk/MonoDevelop/src/Main/StartUp/Makefile.am	2004-05-06 04:11:52 UTC (rev 1585)
@@ -12,13 +12,14 @@
 
 all: $(DLL)
 
+REFS = /r:System.Drawing \
+	/r:../../../build/bin/MonoDevelop.Core.dll \
+	/r:../../../build/bin/MonoDevelop.Base.dll \
+	$(BASE_DEPENDENCIES_LIBS)
+
 $(DLL): $(build_sources)
-	mcs /debug /out:$(DLL) /r:System.Drawing \
-		/r:../../../build/bin/MonoDevelop.Core.dll \
-		/r:../../../build/bin/MonoDevelop.Base.dll \
-		/define:GTK \
-		@GTKSHARP@ \
-		@GNOMESHARP@ \
+	mcs /debug /out:$(DLL) \
+		/define:GTK $(REFS) \
 		$(build_sources) \
 		/resource:$(BASEDIR)/data/resources/StringResources.resources,StringResources.resources \
 		/resource:$(BASEDIR)/data/resources/SplashScreen.png,SplashScreen.png \




More information about the Monodevelop-patches-list mailing list