[Monodevelop-patches-list] r981 - in trunk/MonoDevelop: build/AddIns/AddIns/Misc/StartPage gdldock/gdl gdldock/sources/gdl gtkmozembed-sharp src/AddIns/BackendBindings/CSharpBinding src/AddIns/DisplayBindings/SourceEditor src/AddIns/DisplayBindings/TextEditor src/AddIns/Misc/StartPage src/Libraries/MonoDevelop.Core src/Libraries/MonoDevelop.Gui.Utils src/Libraries/MonoDevelop.Gui.Widgets src/Libraries/SharpAssembly src/Libraries/SharpRefactory src/Main/Base src/Main/StartUp

commit-watcher at mono-cvs.ximian.com commit-watcher at mono-cvs.ximian.com
Sun Feb 22 00:16:51 EST 2004


Author: jluke
Date: 2004-02-22 00:16:51 -0500 (Sun, 22 Feb 2004)
New Revision: 981

Modified:
   trunk/MonoDevelop/build/AddIns/AddIns/Misc/StartPage/StartPage.addin
   trunk/MonoDevelop/gdldock/gdl/Makefile.am
   trunk/MonoDevelop/gdldock/sources/gdl/Makefile.am
   trunk/MonoDevelop/gtkmozembed-sharp/Makefile.am
   trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Makefile.am
   trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Makefile.am
   trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Makefile.am
   trunk/MonoDevelop/src/AddIns/Misc/StartPage/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/Libraries/SharpAssembly/Makefile.am
   trunk/MonoDevelop/src/Libraries/SharpRefactory/Makefile.am
   trunk/MonoDevelop/src/Main/Base/Makefile.am
   trunk/MonoDevelop/src/Main/StartUp/Makefile.am
Log:
use simpler method


Modified: trunk/MonoDevelop/build/AddIns/AddIns/Misc/StartPage/StartPage.addin
===================================================================
--- trunk/MonoDevelop/build/AddIns/AddIns/Misc/StartPage/StartPage.addin	2004-02-22 02:53:18 UTC (rev 980)
+++ trunk/MonoDevelop/build/AddIns/AddIns/Misc/StartPage/StartPage.addin	2004-02-22 05:16:51 UTC (rev 981)
@@ -9,7 +9,7 @@
 		<Import assembly="MonoDevelop.StartPage.dll"/>
 	</Runtime>
 
-	<!-- <Extension path = "/SharpDevelop/Workbench/MainMenu/View">
+	 <!--<Extension path = "/SharpDevelop/Workbench/MainMenu/View">
 		<MenuItem id = "ShowStartPage"
 		          insertafter  = "ViewItemsSeparator"
 			  insertbefore = "StartPageSeparator"

Modified: trunk/MonoDevelop/gdldock/gdl/Makefile.am
===================================================================
--- trunk/MonoDevelop/gdldock/gdl/Makefile.am	2004-02-22 02:53:18 UTC (rev 980)
+++ trunk/MonoDevelop/gdldock/gdl/Makefile.am	2004-02-22 05:16:51 UTC (rev 981)
@@ -21,11 +21,8 @@
 ../../build/bin:
 	mkdir ../../build/bin
 
-gdldocklibdir = $(prefix)/lib/monodevelop
-
-install-data-local: $(ASSEMBLY)
-	$(mkinstalldirs) $(DESTDIR)$(gdldocklibdir)/bin
-	$(INSTALL_DATA) $(ASSEMBLY) $(DESTDIR)$(gdldocklibdir)/bin/gdl-sharp.dll
+gdldocklibdir = $(prefix)/lib/monodevelop/bin
+gdldocklib_DATA = $(ASSEMBLY)
  
 clean:
 	rm -f $(ASSEMBLY)
@@ -35,3 +32,4 @@
 CLEANFILES=$(ASSEMBLY) generated-stamp generated
 
 EXTRA_DIST = gdl-api.xml Gdl.metadata DockItemFlags.cs DockParamFlags.cs
+

Modified: trunk/MonoDevelop/gdldock/sources/gdl/Makefile.am
===================================================================
--- trunk/MonoDevelop/gdldock/sources/gdl/Makefile.am	2004-02-22 02:53:18 UTC (rev 980)
+++ trunk/MonoDevelop/gdldock/sources/gdl/Makefile.am	2004-02-22 05:16:51 UTC (rev 981)
@@ -113,15 +113,10 @@
 	&& cp xgen-gmc $(@F) \
 	&& rm -f xgen-gmc
 
-gdldocklibdir = $(prefix)/lib/monodevelop
+gdldocklibdir = $(prefix)/lib/monodevelop/bin
+gdldocklib_DATA = libgdldock.so stock-close-12.png \
+	stock-menu-left-12.png stock-menu-right-12.png
 
-install-data-local: libgdldock.so
-	$(mkinstalldirs) $(DESTDIR)$(gdldocklibdir)/bin
-	$(INSTALL_DATA) libgdldock.so $(DESTDIR)$(gdldocklibdir)/bin/libgdldock.so
-	$(INSTALL_DATA) stock-close-12.png $(DESTDIR)$(gdldocklibdir)/bin/stock-close-12.png
-	$(INSTALL_DATA) stock-menu-left-12.png $(DESTDIR)$(gdldocklibdir)/bin/stock-menu-left-12.png
-	$(INSTALL_DATA) stock-menu-right-12.png $(DESTDIR)$(gdldocklibdir)/bin/stock-menu-right-12.png
-
 clean:
 	rm -f libgdldock.so $(libgdldock_OBJECTS) $(GENERATED_SOURCE)
 

Modified: trunk/MonoDevelop/gtkmozembed-sharp/Makefile.am
===================================================================
--- trunk/MonoDevelop/gtkmozembed-sharp/Makefile.am	2004-02-22 02:53:18 UTC (rev 980)
+++ trunk/MonoDevelop/gtkmozembed-sharp/Makefile.am	2004-02-22 05:16:51 UTC (rev 981)
@@ -17,12 +17,10 @@
 	-r glib-sharp.dll -r gtk-sharp.dll -r gdk-sharp.dll \
 	--recurse '*.cs' -o $(ASSEMBLY)
 
-monodeveloplibdir = $(prefix)/lib/monodevelop
-
-install-data-local: $(ASSEMBLY)
-	$(mkinstalldirs) $(DESTDIR)$(monodeveloplibdir)/bin
-	$(INSTALL_DATA) $(ASSEMBLY) $(DESTDIR)$(monodeveloplibdir)/bin/gtkmozembed-sharp.dll
+assemblydir = $(prefix)/lib/monodevelop/bin
+assembly_DATA = $(ASSEMBLY)
  
 CLEANFILES=$(ASSEMBLY) generated-stamp generated
 
 EXTRA_DIST = GtkMozEmbed.metadata gtkmozembed-api.xml EmbedWidget.custom Single.custom NewWindow_delegate.cs NewWindow_handler.cs NewWindowOrphan_handler.cs
+

Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Makefile.am	2004-02-22 02:53:18 UTC (rev 980)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Makefile.am	2004-02-22 05:16:51 UTC (rev 981)
@@ -38,13 +38,10 @@
 		/r:gtk-sharp.dll \
 		$(SOURCES)
 
-monodeveloplibdir = $(prefix)/lib/monodevelop
-csharpbindinglibdir = $(monodeveloplibdir)/AddIns/AddIns/BackendBindings
+csharpbindinglibdir = $(libdir)/monodevelop/AddIns/AddIns/BackendBindings
+csharpbindinglib_DATA = $(DLL)
 
-install-data-local: $(DLL)
-	$(mkinstalldirs) $(DESTDIR)$(csharpbindinglibdir)
-	$(INSTALL_DATA) $(DLL) $(DESTDIR)$(csharpbindinglibdir)/CSharpBinding.dll
-
 CLEANFILES=$(DLL)
 
 EXTRA_DIST = $(SOURCES)
+

Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Makefile.am	2004-02-22 02:53:18 UTC (rev 980)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Makefile.am	2004-02-22 05:16:51 UTC (rev 981)
@@ -83,12 +83,9 @@
 		/r:gconf-sharp.dll \
 		/r:System.Drawing.dll
 
-monodeveloplibdir = $(prefix)/lib/monodevelop
+assemblydir = $(libdir)/monodevelop/bin
+assembly_DATA = $(DLL)
 
-install-data-local: $(DLL)
-	$(mkinstalldirs) $(DESTDIR)$(monodeveloplibdir)/bin
-	$(INSTALL_DATA) $(DLL) $(DESTDIR)$(monodeveloplibdir)/bin/MonoDevelop.SourceEditor.dll
-
 CLEANFILES=$(DLL)
 
 EXTRA_DIST = $(SOURCES)

Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Makefile.am	2004-02-22 02:53:18 UTC (rev 980)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Makefile.am	2004-02-22 05:16:51 UTC (rev 981)
@@ -57,3 +57,4 @@
 CLEANFILES=$(DLL)
 
 EXTRA_DIST = $(SOURCES)
+

Modified: trunk/MonoDevelop/src/AddIns/Misc/StartPage/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/AddIns/Misc/StartPage/Makefile.am	2004-02-22 02:53:18 UTC (rev 980)
+++ trunk/MonoDevelop/src/AddIns/Misc/StartPage/Makefile.am	2004-02-22 05:16:51 UTC (rev 981)
@@ -16,13 +16,10 @@
 		/r:gtk-sharp.dll \
 		$(SOURCES)
 
-monodeveloplibdir = $(prefix)/lib/monodevelop
-startpagelibdir = $(monodeveloplibdir)/AddIns/AddIns/Misc/StartPage
+startpagelibdir = $(libdir)/monodevelop/AddIns/AddIns/Misc/StartPage
+startpagelib_DATA = $(DLL)
 
-install-data-local: $(DLL)
-	$(mkinstalldirs) $(DESTDIR)$(startpagelibdir)
-	$(INSTALL_DATA) $(DLL) $(DESTDIR)$(startpagelibdir)/MonoDevelop.StartPage.dll
-
 CLEANFILES=$(DLL)
 
 EXTRA_DIST = $(SOURCES)
+

Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Makefile.am	2004-02-22 02:53:18 UTC (rev 980)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Makefile.am	2004-02-22 05:16:51 UTC (rev 981)
@@ -66,12 +66,10 @@
 	@ mcs /debug /out:$(DLL) /target:library /r:System.Drawing.dll /define:LINUX /resource:../../../data/resources/AddIn.xsd,AddIn.xsd \
 	$(SOURCES)
 
-monodeveloplibdir = $(prefix)/lib/monodevelop
+assemblydir = $(libdir)/monodevelop/bin
+assembly_DATA = $(DLL)
 
-install-data-local: $(DLL)
-	$(mkinstalldirs) $(DESTDIR)$(monodeveloplibdir)/bin
-	$(INSTALL_DATA) $(DLL) $(DESTDIR)$(monodeveloplibdir)/bin/MonoDevelop.Core.dll
-
 CLEANFILES=$(DLL)
 
 EXTRA_DIST = $(SOURCES)
+

Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Utils/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Utils/Makefile.am	2004-02-22 02:53:18 UTC (rev 980)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Utils/Makefile.am	2004-02-22 05:16:51 UTC (rev 981)
@@ -11,12 +11,10 @@
 $(DLL): $(SOURCES)
 	@ mcs /debug /out:$(DLL) /target:library $(REFERENCES) $(SOURCES)
 
-monodeveloplibdir = $(prefix)/lib/monodevelop
+assemblydir = $(libdir)/monodevelop/bin
+assembly_DATA = $(DLL)
   
-install-data-local: $(DLL)
-	$(mkinstalldirs) $(DESTDIR)$(monodeveloplibdir)/bin
-	$(INSTALL_DATA) $(DLL) $(DESTDIR)$(monodeveloplibdir)/bin/MonoDevelop.Gui.Utils.dll
-
 CLEANFILES=$(DLL)
 
 EXTRA_DIST = $(SOURCES)
+

Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Makefile.am	2004-02-22 02:53:18 UTC (rev 980)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Makefile.am	2004-02-22 05:16:51 UTC (rev 981)
@@ -30,12 +30,9 @@
 $(DLL): $(SOURCES)
 	@ $(MCS) /debug /out:$(DLL) /target:library $(REFERENCES) $(SOURCES)
 
-monodeveloplibdir = $(prefix)/lib/monodevelop
+assemblydir = $(libdir)/monodevelop/bin
+assembly_DATA = $(DLL)
   
-install-data-local: $(DLL)
-	$(mkinstalldirs) $(DESTDIR)$(monodeveloplibdir)/bin
-	$(INSTALL_DATA) $(DLL) $(DESTDIR)$(monodeveloplibdir)/bin/MonoDevelop.Gui.Widgets.dll
-
 CLEANFILES = $(DLL)
 
 EXTRA_DIST = $(SOURCES)

Modified: trunk/MonoDevelop/src/Libraries/SharpAssembly/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/Libraries/SharpAssembly/Makefile.am	2004-02-22 02:53:18 UTC (rev 980)
+++ trunk/MonoDevelop/src/Libraries/SharpAssembly/Makefile.am	2004-02-22 05:16:51 UTC (rev 981)
@@ -74,12 +74,10 @@
 $(DLL): $(SOURCES)
 	@ mcs /debug /out:$(DLL) /target:library $(SOURCES)
 
-monodeveloplibdir = $(prefix)/lib/monodevelop
+assemblydir = $(libdir)/monodevelop/bin
+assembly_DATA = $(DLL)
   
-install-data-local: $(DLL)
-	$(mkinstalldirs) $(DESTDIR)$(monodeveloplibdir)/bin
-	$(INSTALL_DATA) $(DLL) $(DESTDIR)$(monodeveloplibdir)/bin/ICSharpCode.SharpAssembly.dll
-
 CLEANFILES=$(DLL)
 
 EXTRA_DIST = $(SOURCES)
+

Modified: trunk/MonoDevelop/src/Libraries/SharpRefactory/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/Libraries/SharpRefactory/Makefile.am	2004-02-22 02:53:18 UTC (rev 980)
+++ trunk/MonoDevelop/src/Libraries/SharpRefactory/Makefile.am	2004-02-22 05:16:51 UTC (rev 981)
@@ -119,12 +119,10 @@
 run : test-parser.exe
 	@ MONO_PATH=`dirname $(DLL)` mono --debug test-parser.exe $(TEST_SOURCE)
 
-monodeveloplibdir = $(prefix)/lib/monodevelop
-                                                             
-install-data-local: $(DLL)
-	$(mkinstalldirs) $(DESTDIR)$(monodeveloplibdir)/bin
-	$(INSTALL_DATA) $(DLL) $(DESTDIR)$(monodeveloplibdir)/bin/ICSharpCode.SharpRefactory.dll
+assemblydir = $(libdir)/monodevelop/bin
+assembly_DATA = $(DLL)
 
 CLEANFILES=$(DLL)
 
 EXTRA_DIST = $(SOURCES)
+

Modified: trunk/MonoDevelop/src/Main/Base/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Makefile.am	2004-02-22 02:53:18 UTC (rev 980)
+++ trunk/MonoDevelop/src/Main/Base/Makefile.am	2004-02-22 05:16:51 UTC (rev 981)
@@ -374,12 +374,10 @@
 Services/StockIcons.cs : ./Services/process-icons.pl
 	perl  -x../../../build/data/resources/icons -w ./Services/process-icons.pl > $@
 
-monodeveloplibdir = $(prefix)/lib/monodevelop
-  
-install-data-local: $(DLL)
-	$(mkinstalldirs) $(DESTDIR)$(monodeveloplibdir)/bin
-	$(INSTALL_DATA) $(DLL) $(DESTDIR)$(monodeveloplibdir)/bin/MonoDevelop.Base.dll
+assemblydir = $(libdir)/monodevelop/bin
+assembly_DATA = $(DLL)
 
 CLEANFILES=$(DLL)
 
 EXTRA_DIST = $(SOURCES) ./Services/process-icons.pl
+

Modified: trunk/MonoDevelop/src/Main/StartUp/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/Main/StartUp/Makefile.am	2004-02-22 02:53:18 UTC (rev 980)
+++ trunk/MonoDevelop/src/Main/StartUp/Makefile.am	2004-02-22 05:16:51 UTC (rev 981)
@@ -43,12 +43,10 @@
 		/r:gnome-sharp.dll \
 		$(RESOURCES) $(SOURCES)
 
-monodeveloplibdir = $(prefix)/lib/monodevelop
-           
-install-data-local: $(DLL)
-	$(mkinstalldirs) $(DESTDIR)$(monodeveloplibdir)/bin
-	$(INSTALL_DATA) $(DLL) $(DESTDIR)$(monodeveloplibdir)/bin/MonoDevelop.exe
+assemblydir = $(libdir)/monodevelop/bin
+assembly_DATA = $(DLL)           
 
 CLEANFILES=$(DLL)
 
 EXTRA_DIST = $(SOURCES)
+




More information about the Monodevelop-patches-list mailing list