[Monodevelop-patches-list] r2464 - in trunk/MonoDevelop: . Core/src/AddIns/BackendBindings/CSharpBinding Core/src/AddIns/BackendBindings/ILAsmBinding Core/src/AddIns/BackendBindings/NemerleBinding Core/src/AddIns/BackendBindings/VBNetBinding Core/src/AddIns/DisplayBindings/SourceEditor Core/src/AddIns/prj2make-sharp-lib Core/src/ICSharpCode.SharpAssembly Core/src/ICSharpCode.SharpRefactory Core/src/MonoDevelop.Base Core/src/MonoDevelop.Dock Core/src/MonoDevelop.Gui.Utils Core/src/MonoDevelop.Gui.Widgets Core/src/MonoDevelop.Startup Core/src/Tools/SharpCoco Core/src/Tools/dbgen Extras/JavaBinding Extras/MonoDeveloperExtensions
John Luke <jluke@cfl.rr.com>
jluke at mono-cvs.ximian.com
Sun Apr 17 15:57:59 EDT 2005
Author: jluke
Date: 2005-04-17 15:57:58 -0400 (Sun, 17 Apr 2005)
New Revision: 2464
Added:
trunk/MonoDevelop/Makefile.include
Modified:
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Makefile.am
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/ChangeLog
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/Makefile.am
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/ChangeLog
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Makefile.am
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/ChangeLog
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Makefile.am
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am
trunk/MonoDevelop/Core/src/AddIns/prj2make-sharp-lib/ChangeLog
trunk/MonoDevelop/Core/src/AddIns/prj2make-sharp-lib/Makefile.am
trunk/MonoDevelop/Core/src/ICSharpCode.SharpAssembly/Makefile.am
trunk/MonoDevelop/Core/src/ICSharpCode.SharpRefactory/ChangeLog
trunk/MonoDevelop/Core/src/ICSharpCode.SharpRefactory/Makefile.am
trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am
trunk/MonoDevelop/Core/src/MonoDevelop.Dock/ChangeLog
trunk/MonoDevelop/Core/src/MonoDevelop.Dock/Makefile.am
trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/ChangeLog
trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/Makefile.am
trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/ChangeLog
trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Makefile.am
trunk/MonoDevelop/Core/src/MonoDevelop.Startup/ChangeLog
trunk/MonoDevelop/Core/src/MonoDevelop.Startup/Makefile.am
trunk/MonoDevelop/Core/src/Tools/SharpCoco/Makefile.am
trunk/MonoDevelop/Core/src/Tools/dbgen/Makefile.am
trunk/MonoDevelop/Extras/JavaBinding/ChangeLog
trunk/MonoDevelop/Extras/JavaBinding/Makefile.am
trunk/MonoDevelop/Extras/MonoDeveloperExtensions/ChangeLog
trunk/MonoDevelop/Extras/MonoDeveloperExtensions/Makefile.am
Log:
fix some distcheck issues
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog 2005-04-17 19:02:51 UTC (rev 2463)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog 2005-04-17 19:57:58 UTC (rev 2464)
@@ -1,3 +1,7 @@
+2005-04-17 John Luke <john.luke at gmail.com>
+
+ * Makefile.am: fix distcheck
+
2005-04-09 John Luke <john.luke at gmail.com>
* PrettyPrinter: kill (it was empty)
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Makefile.am 2005-04-17 19:02:51 UTC (rev 2463)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Makefile.am 2005-04-17 19:57:58 UTC (rev 2464)
@@ -60,11 +60,8 @@
templates/GtkSharpWindow.xft.xml \
templates/Library.xpt.xml
-build_sources = $(addprefix $(srcdir)/, $(FILES))
-
ADDIN = CSharpBinding.addin.xml
-
TEMPLATES_DIR = $(ADDIN_BUILD)/templates
build_TEMPLATES = $(addprefix $(TEMPLATES_DIR)/,$(notdir $(TEMPLATES)))
@@ -107,3 +104,5 @@
EXTRA_DIST = $(FILES) CSharp.glade $(ADDIN) $(TEMPLATES)
+include $(top_srcdir)/Makefile.include
+
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/ChangeLog 2005-04-17 19:02:51 UTC (rev 2463)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/ChangeLog 2005-04-17 19:57:58 UTC (rev 2464)
@@ -1,3 +1,7 @@
+2005-04-17 John Luke <john.luke at gmail.com>
+
+ * Makefile.am: fix distcheck
+
2005-02-16 Ben Motmans <ben.motmans at gmail.com>
* ILAsmConsoleProject.xpt.xml: Consistent naming
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/Makefile.am 2005-04-17 19:02:51 UTC (rev 2463)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/Makefile.am 2005-04-17 19:57:58 UTC (rev 2464)
@@ -18,8 +18,6 @@
TEMPLATES = \
ILAsmConsoleProject.xpt.xml
-build_sources = $(addprefix $(srcdir)/, $(FILES))
-
ADDIN = ILAsmBinding.addin.xml
@@ -49,4 +47,5 @@
CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
EXTRA_DIST = $(FILES) $(ADDIN) $(TEMPLATES)
+include $(top_srcdir)/Makefile.include
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/ChangeLog 2005-04-17 19:02:51 UTC (rev 2463)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/ChangeLog 2005-04-17 19:57:58 UTC (rev 2464)
@@ -1,3 +1,7 @@
+2005-04-17 John Luke <john.luke at gmail.com>
+
+ * Makefile.am: fix distcheck
+
2005-01-27 John Luke <john.luke at gmail.com>
* Nemerle.glade:
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Makefile.am 2005-04-17 19:02:51 UTC (rev 2463)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Makefile.am 2005-04-17 19:57:58 UTC (rev 2464)
@@ -24,8 +24,6 @@
NemerleGtkSharpWindow.xft.xml \
EmptyNemerleFile.xft.xml
-build_sources = $(addprefix $(srcdir)/, $(FILES))
-
build_TEMPLATES = $(addprefix $(ADDIN_BUILD)/templates/, $(TEMPLATES))
ADDIN = NemerleBinding.addin.xml
@@ -59,3 +57,5 @@
CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
EXTRA_DIST = $(FILES) Nemerle.glade $(ADDIN) $(TEMPLATES)
+include $(top_srcdir)/Makefile.include
+
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/ChangeLog 2005-04-17 19:02:51 UTC (rev 2463)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/ChangeLog 2005-04-17 19:57:58 UTC (rev 2464)
@@ -1,3 +1,7 @@
+2005-04-17 John Luke <john.luke at gmail.com>
+
+ * Makefile.am: fix distcheck
+
2005-03-30 John Luke <john.luke at gmail.com>
* Parser/Parser.cs: stop printing 'Entering VB parser'
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Makefile.am 2005-04-17 19:02:51 UTC (rev 2463)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Makefile.am 2005-04-17 19:57:58 UTC (rev 2464)
@@ -46,8 +46,6 @@
templates/VBGtkSharpProject.xpt.xml \
templates/VBGtkSharp2Project.xpt.xml
-build_sources = $(addprefix $(srcdir)/, $(FILES))
-
ADDIN = VBNetBinding.addin.xml
TEMPLATES_DIR = $(ADDIN_BUILD)/templates
@@ -86,4 +84,5 @@
DISTCLEANFILES =
EXTRA_DIST = $(FILES) VB.glade $(ADDIN) $(TEMPLATES)
+include $(top_srcdir)/Makefile.include
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog 2005-04-17 19:02:51 UTC (rev 2463)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog 2005-04-17 19:57:58 UTC (rev 2464)
@@ -1,3 +1,7 @@
+2005-04-17 John Luke <john.luke at gmail.com>
+
+ * Makefile.am: fix distcheck
+
2005-04-09 John Luke <john.luke at gmail.com>
* CodeCompletion/ListWindow.cs: dont crash
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am 2005-04-17 19:02:51 UTC (rev 2463)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am 2005-04-17 19:57:58 UTC (rev 2464)
@@ -77,8 +77,6 @@
Search/ITextBufferStrategy.cs \
Services/SourceViewService.cs
-build_sources = $(addprefix $(srcdir)/, $(FILES))
-
REFS = /r:System.Drawing.dll \
/r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
/r:$(top_builddir)/build/bin/MonoDevelop.Base.dll \
@@ -118,3 +116,6 @@
DISTCLEANFILES = $(CONFIG)
EXTRA_DIST = $(FILES) $(CONFIG).in EditorBindings.glade texteditoraddin.glade $(ADDIN)
+
+include $(top_srcdir)/Makefile.include
+
Modified: trunk/MonoDevelop/Core/src/AddIns/prj2make-sharp-lib/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/prj2make-sharp-lib/ChangeLog 2005-04-17 19:02:51 UTC (rev 2463)
+++ trunk/MonoDevelop/Core/src/AddIns/prj2make-sharp-lib/ChangeLog 2005-04-17 19:57:58 UTC (rev 2464)
@@ -1,3 +1,7 @@
+2005-04-17 John Luke <john.luke at gmail.com>
+
+ * Makefile.am: fix distcheck
+
2005-03-18 Francisco "Paco" Martinez <paco at mfcon.com>
* MsPrjHelpe.cs:
Mono 2.0 has been commented out until further notice.
Modified: trunk/MonoDevelop/Core/src/AddIns/prj2make-sharp-lib/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/prj2make-sharp-lib/Makefile.am 2005-04-17 19:02:51 UTC (rev 2463)
+++ trunk/MonoDevelop/Core/src/AddIns/prj2make-sharp-lib/Makefile.am 2005-04-17 19:57:58 UTC (rev 2464)
@@ -26,8 +26,6 @@
all: $(ASSEMBLY) $(ADDIN_BUILD)/$(ADDIN)
-build_sources = $(addprefix $(srcdir)/, $(FILES))
-
$(ADDIN_BUILD)/$(ADDIN):
mkdir -p $(ADDIN_BUILD)
cp $(srcdir)/$(ADDIN) $(ADDIN_BUILD)/.
@@ -41,3 +39,5 @@
CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
+include $(top_srcdir)/Makefile.include
+
Modified: trunk/MonoDevelop/Core/src/ICSharpCode.SharpAssembly/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/ICSharpCode.SharpAssembly/Makefile.am 2005-04-17 19:02:51 UTC (rev 2463)
+++ trunk/MonoDevelop/Core/src/ICSharpCode.SharpAssembly/Makefile.am 2005-04-17 19:57:58 UTC (rev 2464)
@@ -66,8 +66,6 @@
src/SharpAssembly/AssemblyInfo.cs \
src/SharpAssembly/AssemblyNameNotFoundException.cs
-build_sources = $(addprefix $(srcdir)/, $(FILES))
-
DLL = $(top_builddir)/build/bin/ICSharpCode.SharpAssembly.dll
all: $(DLL)
@@ -82,3 +80,5 @@
EXTRA_DIST = $(FILES)
+include $(top_srcdir)/Makefile.include
+
Modified: trunk/MonoDevelop/Core/src/ICSharpCode.SharpRefactory/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/ICSharpCode.SharpRefactory/ChangeLog 2005-04-17 19:02:51 UTC (rev 2463)
+++ trunk/MonoDevelop/Core/src/ICSharpCode.SharpRefactory/ChangeLog 2005-04-17 19:57:58 UTC (rev 2464)
@@ -1,3 +1,7 @@
+2005-04-17 John Luke <john.luke at gmail.com>
+
+ * Makefile.am: fix distcheck
+
2005-04-15 John Luke <john.luke at gmail.com>
* src/Parser/AST/Modifier.cs: add Unsafe to PropertysEventsMethods
Modified: trunk/MonoDevelop/Core/src/ICSharpCode.SharpRefactory/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/ICSharpCode.SharpRefactory/Makefile.am 2005-04-17 19:02:51 UTC (rev 2463)
+++ trunk/MonoDevelop/Core/src/ICSharpCode.SharpRefactory/Makefile.am 2005-04-17 19:57:58 UTC (rev 2464)
@@ -116,8 +116,6 @@
src/VBConverter/VBNetVisitor.cs \
src/AssemblyInfo.cs
-build_sources = $(addprefix $(srcdir)/, $(FILES))
-
all: $(DLL) $(TEST)
$(DLL): $(FILES)
@@ -146,3 +144,5 @@
EXTRA_DIST = $(FILES) src/Main.cs
+include $(top_srcdir)/Makefile.include
+
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-04-17 19:02:51 UTC (rev 2463)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-04-17 19:57:58 UTC (rev 2464)
@@ -1,5 +1,9 @@
2005-04-17 John Luke <john.luke at gmail.com>
+ * Makefile.am: fix distcheck
+
+2005-04-17 John Luke <john.luke at gmail.com>
+
* Gui/Pads/SolutionPad/TreeViewPad.cs: use new AppendNode
and SetDefaultSortFunc API
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am 2005-04-17 19:02:51 UTC (rev 2463)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am 2005-04-17 19:57:58 UTC (rev 2464)
@@ -8,7 +8,7 @@
/r:System.Data.dll /r:System.Web.Services.dll \
/r:$(top_builddir)/build/bin/MonoDevelop.Dock.dll \
/r:Mono.Posix.dll \
- /r:$(top_builddir)/contrib/log4net.dll \
+ /r:$(top_builddir)/build/bin/log4net.dll \
$(GTK_SHARP_LIBS) \
$(GNOME_SHARP_LIBS) \
$(GNOME_VFS_SHARP_LIBS) \
@@ -462,8 +462,6 @@
build_OPTIONS = $(addprefix $(top_builddir)/build/data/options/, $(notdir $(OPTIONS)))
-build_sources = $(addprefix $(srcdir)/, $(FILES))
-
DLLNAME = MonoDevelop.Base.dll
CONFIG = $(DLLNAME).config
ASSEMBLY = $(top_builddir)/build/bin/$(DLLNAME)
@@ -505,3 +503,4 @@
EXTRA_DIST = $(FILES) ./Services/process-icons.pl $(CONFIG).in Base.glade $(ADDIN) $(OPTIONS)
+include $(top_srcdir)/Makefile.include
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Dock/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Dock/ChangeLog 2005-04-17 19:02:51 UTC (rev 2463)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Dock/ChangeLog 2005-04-17 19:57:58 UTC (rev 2464)
@@ -1,3 +1,7 @@
+2005-04-17 John Luke <john.luke at gmail.com>
+
+ * Makefile.am: fix distcheck
+
2005-04-16 John Luke <john.luke at gmail.com>
* DockItem.cs:
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Dock/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Dock/Makefile.am 2005-04-17 19:02:51 UTC (rev 2463)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Dock/Makefile.am 2005-04-17 19:57:58 UTC (rev 2464)
@@ -1,12 +1,16 @@
RUNTIME = mono
-DOCK = ../../../build/bin/MonoDevelop.Dock.dll
-TEST = dock-test.exe
+DOCK = $(top_builddir)/build/bin/MonoDevelop.Dock.dll
+TEST = $(top_builddir)/build/bin/dock-test.exe
GLADE = layout.glade
IMAGES = stock-close-12.png stock-menu-left-12.png stock-menu-right-12.png
-RESOURCES = -resource:$(GLADE) -resource:stock-close-12.png -resource:stock-menu-left-12.png -resource:stock-menu-right-12.png
+RESOURCES = \
+ -resource:$(srcdir)/$(GLADE),$(GLADE) \
+ -resource:$(srcdir)/stock-close-12.png,stock-close-12.png \
+ -resource:$(srcdir)/stock-menu-left-12.png,stock-menu-left-12.png \
+ -resource:$(srcdir)/stock-menu-right-12.png,stock-menu-right-12.png
assemblydir = $(libdir)/monodevelop/bin
assembly_DATA = $(DOCK)
@@ -35,20 +39,22 @@
ExportAttribute.cs \
AfterAttribute.cs
-TEST_FILES = GdlDockTest.cs
+TEST_FILES = $(srcdir)/GdlDockTest.cs
-all: $(DOCK) $(TEST)
+all: $(DOCK)
CLEANFILES = $(DOCK) $(DOCK).mdb $(TEST) $(TEST).mdb
EXTRA_DIST = $(FILES) $(GLADE) $(IMAGES) $(TEST_FILES)
-$(DOCK): $(FILES) $(GLADE) $(IMAGES)
- mkdir -p ../../../build/bin/
- $(CSC) -out:$@ -target:library $(FILES) $(RESOURCES) $(REFS)
+$(DOCK): $(build_sources) $(GLADE) $(IMAGES)
+ mkdir -p $(top_builddir)/build/bin/
+ $(CSC) -out:$@ -target:library $(build_sources) $(RESOURCES) $(REFS)
$(TEST) : $(TEST_FILES) $(DOCK)
$(CSC) -out:$@ -r:$(DOCK) -pkg:gtk-sharp-2.0 $(TEST_FILES) -codepage:utf8
run-test: $(TEST)
- MONO_PATH=../../../build/bin $(RUNTIME) $(TEST)
+ $(RUNTIME) $(TEST)
+include $(top_srcdir)/Makefile.include
+
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/ChangeLog 2005-04-17 19:02:51 UTC (rev 2463)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/ChangeLog 2005-04-17 19:57:58 UTC (rev 2464)
@@ -1,3 +1,7 @@
+2005-04-17 John Luke <john.luke at gmail.com>
+
+ * Makefile.am: fix distcheck
+
2005-04-16 John Luke <john.luke at gmail.com>
* README: remove
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/Makefile.am 2005-04-17 19:02:51 UTC (rev 2463)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/Makefile.am 2005-04-17 19:57:58 UTC (rev 2464)
@@ -16,8 +16,6 @@
DirectoryArchive/Bz2Support.cs \
DirectoryArchive/GzSupport.cs
-build_sources = $(addprefix $(srcdir)/, $(FILES))
-
all: $(DLL)
$(DLL): $(build_sources)
@@ -30,3 +28,5 @@
EXTRA_DIST = $(FILES)
+include $(top_srcdir)/Makefile.include
+
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/ChangeLog 2005-04-17 19:02:51 UTC (rev 2463)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/ChangeLog 2005-04-17 19:57:58 UTC (rev 2464)
@@ -1,3 +1,7 @@
+2005-04-17 John Luke <john.luke at gmail.com>
+
+ * Makefile.am: fix distcheck
+
2005-04-16 John Luke <john.luke at gmail.com>
* Tree/TreeView.cs:
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Makefile.am 2005-04-17 19:02:51 UTC (rev 2463)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Makefile.am 2005-04-17 19:57:58 UTC (rev 2464)
@@ -29,9 +29,6 @@
DragNotebook/DragNotebook.cs \
DataGrid/DataGrid.cs
-
-build_sources = $(addprefix $(srcdir)/, $(FILES))
-
all: $(DLL)
$(DLL): $(build_sources)
@@ -44,3 +41,5 @@
EXTRA_DIST = $(FILES)
+include $(top_srcdir)/Makefile.include
+
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Startup/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Startup/ChangeLog 2005-04-17 19:02:51 UTC (rev 2463)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Startup/ChangeLog 2005-04-17 19:57:58 UTC (rev 2464)
@@ -1,3 +1,7 @@
+2005-04-17 John Luke <john.luke at gmail.com>
+
+ * Makefile.am: fix distcheck
+
2005-04-01 Christian Hergert <christian.hergert at gmail.com>
* Makefile.am: fix call to app.config
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Startup/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Startup/Makefile.am 2005-04-17 19:02:51 UTC (rev 2463)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Startup/Makefile.am 2005-04-17 19:57:58 UTC (rev 2464)
@@ -1,3 +1,7 @@
+
+ASSEMBLY = $(top_builddir)/build/bin/MonoDevelop.exe
+SPLASH = -resource:$(srcdir)/SplashScreen.png,SplashScreen.png
+
FILES= \
MonoDevelopMain.cs \
MonoDevelopOptions.cs \
@@ -4,13 +8,10 @@
Dialogs/AddInTreeSettingsHandler.cs \
AssemblyInfo.cs
-build_sources = $(addprefix $(srcdir)/, $(FILES))
+all: $(ASSEMBLY $(ASSEMBLY).config
-DLL = $(top_builddir)/build/bin/MonoDevelop.exe
-
-all: $(DLL) $(DLL).config
-
-REFS = /r:System.Drawing \
+REFS = \
+ /r:System.Drawing \
/r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
/r:$(top_builddir)/build/bin/MonoDevelop.Base.dll \
/r:Mono.Posix.dll \
@@ -18,16 +19,18 @@
$(GTK_SHARP_LIBS) \
$(GNOME_SHARP_LIBS)
-$(DLL): $(build_sources)
- $(CSC) -out:$@ -define:GTK $(REFS) $(build_sources) \
- -resource:$(srcdir)/SplashScreen.png,SplashScreen.png
+$(ASSEMBLY): $(build_sources)
+ $(CSC) -out:$@ $(REFS) $(build_sources) $(SPLASH)
-$(DLL).config: $(DLL)
- cp app.config $(DLL).config
+$(ASSEMBLY).config: $(ASSEMBLY) $(srcdir)/app.config
+ cp $(srcdir)/app.config $(ASSEMBLY).config
assemblydir = $(libdir)/monodevelop/bin
-assembly_DATA = $(DLL) $(DLL).config
+assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).config
-CLEANFILES=$(DLL) $(DLL).mdb
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
-EXTRA_DIST = $(FILES) SplashScreen.png
+EXTRA_DIST = $(FILES) SplashScreen.png app.config
+
+include $(top_srcdir)/Makefile.include
+
Modified: trunk/MonoDevelop/Core/src/Tools/SharpCoco/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/Tools/SharpCoco/Makefile.am 2005-04-17 19:02:51 UTC (rev 2463)
+++ trunk/MonoDevelop/Core/src/Tools/SharpCoco/Makefile.am 2005-04-17 19:57:58 UTC (rev 2464)
@@ -11,8 +11,6 @@
src/Scanner.cs \
src/DFA.cs
-build_sources = $(addprefix $(srcdir)/, $(FILES))
-
all: $(ASSEMBLY)
$(ASSEMBLY): $(build_sources)
@@ -20,4 +18,5 @@
CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
EXTRA_DIST = $(FILES)
+include $(top_srcdir)/Makefile.include
Modified: trunk/MonoDevelop/Core/src/Tools/dbgen/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/Tools/dbgen/Makefile.am 2005-04-17 19:02:51 UTC (rev 2463)
+++ trunk/MonoDevelop/Core/src/Tools/dbgen/Makefile.am 2005-04-17 19:57:58 UTC (rev 2464)
@@ -4,8 +4,6 @@
FILES = src/AssemblyInfo.cs \
src/dbgen.cs
-build_sources = $(addprefix $(srcdir)/, $(FILES))
-
all: $(ASSEMBLY)
REFS = /r:$(top_builddir)/build/bin/MonoDevelop.Base.dll /r:$(top_builddir)/build/bin/MonoDevelop.Core.dll
@@ -18,4 +16,5 @@
CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
EXTRA_DIST = $(FILES)
+include $(top_srcdir)/Makefile.include
Modified: trunk/MonoDevelop/Extras/JavaBinding/ChangeLog
===================================================================
--- trunk/MonoDevelop/Extras/JavaBinding/ChangeLog 2005-04-17 19:02:51 UTC (rev 2463)
+++ trunk/MonoDevelop/Extras/JavaBinding/ChangeLog 2005-04-17 19:57:58 UTC (rev 2464)
@@ -1,3 +1,7 @@
+2005-04-17 John Luke <john.luke at gmail.com>
+
+ * Makefile.am: fix distcheck
+
2005-02-16 Ben Motmans <ben.motmans at gmail.com>
* EmptyJavaFile:
Modified: trunk/MonoDevelop/Extras/JavaBinding/Makefile.am
===================================================================
--- trunk/MonoDevelop/Extras/JavaBinding/Makefile.am 2005-04-17 19:02:51 UTC (rev 2463)
+++ trunk/MonoDevelop/Extras/JavaBinding/Makefile.am 2005-04-17 19:57:58 UTC (rev 2464)
@@ -32,11 +32,8 @@
templates/JavaOKDialog.xft.xml \
templates/JavaPanel.xft.xml
-build_sources = $(addprefix $(srcdir)/, $(FILES))
-
ADDIN = JavaBinding.addin.xml
-
TEMPLATES_DIR = $(ADDIN_BUILD)/templates
build_TEMPLATES = $(addprefix $(TEMPLATES_DIR)/, $(notdir $(TEMPLATES)))
@@ -84,3 +81,4 @@
CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
EXTRA_DIST = $(FILES) $(ADDIN) $(TEMPLATES)
+include $(top_srcdir)/Makefile.include
Modified: trunk/MonoDevelop/Extras/MonoDeveloperExtensions/ChangeLog
===================================================================
--- trunk/MonoDevelop/Extras/MonoDeveloperExtensions/ChangeLog 2005-04-17 19:02:51 UTC (rev 2463)
+++ trunk/MonoDevelop/Extras/MonoDeveloperExtensions/ChangeLog 2005-04-17 19:57:58 UTC (rev 2464)
@@ -1,3 +1,7 @@
+2005-04-17 John Luke <john.luke at gmail.com>
+
+ * Makefile.am: fix distcheck
+
2005-04-07 Lluis Sanchez Gual <lluis at novell.com>
* MonoProject.cs: Look for ChangeLog files in a more rational
Modified: trunk/MonoDevelop/Extras/MonoDeveloperExtensions/Makefile.am
===================================================================
--- trunk/MonoDevelop/Extras/MonoDeveloperExtensions/Makefile.am 2005-04-17 19:02:51 UTC (rev 2463)
+++ trunk/MonoDevelop/Extras/MonoDeveloperExtensions/Makefile.am 2005-04-17 19:57:58 UTC (rev 2464)
@@ -7,8 +7,6 @@
Commands.cs \
MonoProjectConfiguration.cs
-build_sources = $(addprefix $(srcdir)/, $(FILES))
-
REFS = /r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
/r:$(top_builddir)/build/bin/MonoDevelop.Base.dll \
$(GTK_SHARP_LIBS) \
@@ -36,6 +34,8 @@
EXTRA_DIST = $(FILES) $(ADDIN)
+include $(top_srcdir)/Makefile.include
+
MonoDeveloperExtensionsdir = $(libdir)/monodevelop/AddIns/MonoDeveloperExtensions
MonoDeveloperExtensions_DATA = $(DLL) $(ADDIN_BUILD)/$(ADDIN)
Added: trunk/MonoDevelop/Makefile.include
===================================================================
--- trunk/MonoDevelop/Makefile.include 2005-04-17 19:02:51 UTC (rev 2463)
+++ trunk/MonoDevelop/Makefile.include 2005-04-17 19:57:58 UTC (rev 2464)
@@ -0,0 +1,3 @@
+
+build_sources = $(addprefix $(srcdir)/, $(FILES))
+
More information about the Monodevelop-patches-list
mailing list