From a158155808d5dd2eb1a902496728dfd2dc2456aa Mon Sep 17 00:00:00 2001 From: Wade Berrier Date: Wed, 7 Mar 2007 22:14:19 +0000 Subject: Merged the following revisions from trunk: asp.net editor fixes: 73390 73398 73403 73405 Other fixes: 73393 73394 73395 svn path=/branches/monodevelop/0.13/; revision=73916 --- Extras/AspNetEdit/Makefile.am | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'Extras/AspNetEdit/Makefile.am') diff --git a/Extras/AspNetEdit/Makefile.am b/Extras/AspNetEdit/Makefile.am index e6a77595f0..b53d3666b4 100644 --- a/Extras/AspNetEdit/Makefile.am +++ b/Extras/AspNetEdit/Makefile.am @@ -5,25 +5,26 @@ endif ADDIN_BUILD = $(top_builddir)/build/AddIns/AspNetEdit ASSEMBLY = $(ADDIN_BUILD)/AspNetEdit.dll -REFS = -r:System \ - -r:System.Xml \ - -r:System.Web \ - -r:System.Design \ - -r:System.Drawing \ - -r:System.Drawing.Design \ - -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \ +REFS = \ + $(GECKO_SHARP_LIBS) \ + $(GLADE_SHARP_LIBS) \ + $(GNOME_SHARP_LIBS) \ + $(GTK_SHARP_LIBS) \ + -pkg:jscall-sharp \ + -r:$(top_builddir)/build/AddIns/AspNetAddIn/AspNetAddIn.dll \ + -r:$(top_builddir)/build/AddIns/MonoDevelop.Components.dll \ -r:$(top_builddir)/build/AddIns/MonoDevelop.Core.Gui.dll \ - -r:$(top_builddir)/build/AddIns/MonoDevelop.SourceEditor.dll \ - -r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.dll \ - -r:$(top_builddir)/build/AddIns/MonoDevelop.Ide.dll \ - -r:$(top_builddir)/build/AddIns/MonoDevelop.Components.dll \ -r:$(top_builddir)/build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll \ - -r:$(top_builddir)/build/AddIns/AspNetAddIn/AspNetAddIn.dll \ - $(GTK_SHARP_LIBS) \ - $(GNOME_SHARP_LIBS) \ - $(GLADE_SHARP_LIBS) \ - $(GECKO_SHARP_LIBS) \ - $(JSCALL_LIBS) + -r:$(top_builddir)/build/AddIns/MonoDevelop.Ide.dll \ + -r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.dll \ + -r:$(top_builddir)/build/AddIns/MonoDevelop.SourceEditor.dll \ + -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \ + -r:System \ + -r:System.Design \ + -r:System.Drawing \ + -r:System.Drawing.Design \ + -r:System.Web \ + -r:System.Xml FILES = \ AssemblyInfo.cs \ @@ -64,13 +65,12 @@ FILES = \ AspNetEdit.Integration/EditorProcess.cs -RES = \ - # +RES = # DATA_FILES = \ data/WebControlsToolbox.xml -DATA_FILE_BUILD = $(addprefix $(ADDIN_BUILD), $(DATA_FILES)) +DATA_FILE_BUILD = $(addprefix $(ADDIN_BUILD)/, $(notdir $(DATA_FILES))) ADDIN = AspNetEdit.addin.xml -- cgit v1.2.3