diff options
| author | Wade Berrier <wade@mono-cvs.ximian.com> | 2007-08-17 05:59:47 +0400 |
|---|---|---|
| committer | Wade Berrier <wade@mono-cvs.ximian.com> | 2007-08-17 05:59:47 +0400 |
| commit | 1154e674d18d66d503531238f1c476a343681e77 (patch) | |
| tree | 4f2158246c3b5bf00fc7684cca0ac725f33d52e4 | |
| parent | 13919656431b8b7981f959e0d8fc930503d6765a (diff) | |
2007-08-16 Wade Berrier <wberrier@novell.com>
* Makefile.am:
Removed MonoDevelop.SourceEditor.dll.config.in. AFAICT MD runs
without it.
This will enable mono-find-requires script to not generate deps
on
gtksourceview so that the md rpm can be used on all distros.
(Otherwise
we would need to build MD for all distros, since 10.3 has
gtksourceview18)
svn path=/trunk/monodevelop/; revision=84253
| -rw-r--r-- | Extras/MonoDevelop.SourceEditor/ChangeLog | 8 | ||||
| -rw-r--r-- | Extras/MonoDevelop.SourceEditor/Makefile.am | 9 | ||||
| -rw-r--r-- | Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.dll.config.in | 5 | ||||
| -rw-r--r-- | configure.in | 1 |
4 files changed, 11 insertions, 12 deletions
diff --git a/Extras/MonoDevelop.SourceEditor/ChangeLog b/Extras/MonoDevelop.SourceEditor/ChangeLog index 480a1754b4..804792a79c 100644 --- a/Extras/MonoDevelop.SourceEditor/ChangeLog +++ b/Extras/MonoDevelop.SourceEditor/ChangeLog @@ -1,3 +1,11 @@ +2007-08-16 Wade Berrier <wberrier@novell.com> + + * Makefile.am: + Removed MonoDevelop.SourceEditor.dll.config.in. AFAICT MD runs without it. + This will enable mono-find-requires script to not generate deps on + gtksourceview so that the md rpm can be used on all distros. (Otherwise + we would need to build MD for all distros, since 10.3 has gtksourceview18) + 2007-08-14 Lluis Sanchez Gual <lluis@novell.com> * MonoDevelop.SourceEditor.Gui/SourceEditorDisplayBinding.cs: Make sure the diff --git a/Extras/MonoDevelop.SourceEditor/Makefile.am b/Extras/MonoDevelop.SourceEditor/Makefile.am index dea966c4fa..fb470faac2 100644 --- a/Extras/MonoDevelop.SourceEditor/Makefile.am +++ b/Extras/MonoDevelop.SourceEditor/Makefile.am @@ -1,5 +1,4 @@ DLLNAME = MonoDevelop.SourceEditor.dll -CONFIG = $(DLLNAME).config ASSEMBLY = $(top_builddir)/build/AddIns/$(DLLNAME) FILES = \ @@ -59,16 +58,14 @@ all : $(ASSEMBLY) $(ASSEMBLY) : $(build_sources) $(build_resources) mkdir -p $(top_builddir)/build/bin - $(CSC) $(CSC_FLAGS) $(build_resources:%=/resource:%) $(build_sources) -out:$@ -t:library $(REFS) \ - && cp $(CONFIG) $(top_builddir)/build/AddIns/. + $(CSC) $(CSC_FLAGS) $(build_resources:%=/resource:%) $(build_sources) -out:$@ -t:library $(REFS) assemblydir = $(MD_ADDIN_DIR) -assembly_DATA = $(ASSEMBLY) $(CONFIG) +assembly_DATA = $(ASSEMBLY) CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb -DISTCLEANFILES = $(CONFIG) -EXTRA_DIST = $(FILES) $(CONFIG).in $(RES) +EXTRA_DIST = $(FILES) $(RES) include $(top_srcdir)/Makefile.include diff --git a/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.dll.config.in b/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.dll.config.in deleted file mode 100644 index b92ce1bc69..0000000000 --- a/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.dll.config.in +++ /dev/null @@ -1,5 +0,0 @@ -<configuration> - <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@" /> - <dllmap dll="gtksourceview-1.0" target="libgtksourceview-1.0@LIB_PREFIX@.0@LIB_SUFFIX@" /> - <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@" /> -</configuration> diff --git a/configure.in b/configure.in index 63037ba759..caa9c4c646 100644 --- a/configure.in +++ b/configure.in @@ -474,7 +474,6 @@ Extras/DebuggerAddIn/Makefile Extras/DebuggerAddIn/DebuggerPaths.cs Extras/MonoDevelop.SourceEditor/AssemblyInfo.cs Extras/MonoDevelop.SourceEditor/Makefile -Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.dll.config Extras/prj2make-sharp-lib/AssemblyInfo.cs Extras/prj2make-sharp-lib/Makefile Extras/WelcomePage/Makefile |