[GRASS-SVN] r32570 - grass/branches/develbranch_6/lib/init

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-08-06 07:00:10 -0400 (Wed, 06 Aug 2008)
New Revision: 32570

Added:
   grass/branches/develbranch_6/lib/init/grass_error.ico
Modified:
   grass/branches/develbranch_6/lib/init/Makefile
Log:
icons: Makefile cleaned (based on trunk)
error icon added


Modified: grass/branches/develbranch_6/lib/init/Makefile
===================================================================
--- grass/branches/develbranch_6/lib/init/Makefile	2008-08-06 10:56:19 UTC (rev 32569)
+++ grass/branches/develbranch_6/lib/init/Makefile	2008-08-06 11:00:10 UTC (rev 32570)
@@ -6,7 +6,7 @@
 #               Markus Neteler, Andrea Antonello
 # PURPOSE:  	To create the various scripts and programs which are required
 #   	    	to start GRASS.
-# COPYRIGHT:    (C) 2000 by the GRASS Development Team
+# COPYRIGHT:    (C) 2000-2008 by the GRASS Development Team
 #
 #               This program is free software under the GNU General Public
 #   	    	License (>=v2). Read the file COPYING that comes with GRASS
@@ -49,12 +49,15 @@
 	$(ETC)/epsg_option.tcl \
 	$(ETC)/file_option.tcl \
 	$(ETC)/gintro.gif \
-	$(ETC)/grass.ico \
+	$(ETC)/grass-run.sh \
+	$(ETC)/grass-xterm-wrapper
+
+ICONS = $(ETC)/grass.ico \
 	$(ETC)/grass_map.ico \
 	$(ETC)/grass_dialog.ico \
 	$(ETC)/grass_sql.ico \
-	$(ETC)/grass-run.sh \
-	$(ETC)/grass-xterm-wrapper
+	$(ETC)/grass_nviz.ico \
+	$(ETC)/grass_error.ico
 
 ifeq ($(findstring darwin,$(ARCH)),darwin)
 	FILES += \
@@ -69,7 +72,7 @@
 		$(ETC)/grass-run.bat
 endif
 
-default: $(FILES)
+default: $(FILES) $(ICONS)
 	$(MKDIR) $(GISBASE)/docs/html
 	$(INSTALL_DATA) variables.html $(GISBASE)/docs/html/variables.html
 	$(INSTALL_DATA) grass6.html $(GISBASE)/docs/html/grass6.html
@@ -164,22 +167,10 @@
 	rm -f $@
 	$(INSTALL_DATA) gintro.gif $@
 
-$(ETC)/grass.ico: grass.ico
+$(ICONS): grass.ico grass_map.ico grass_sql.ico grass_dialog.ico grass_nviz.ico grass_error.ico
 	rm -f $@
 	$(INSTALL_DATA) $< $@
 
-$(ETC)/grass_map.ico: grass_map.ico
-	rm -f $@
-	$(INSTALL_DATA) $< $@
-
-$(ETC)/grass_sql.ico: grass_sql.ico
-	rm -f $@
-	$(INSTALL_DATA) $< $@
-
-$(ETC)/grass_dialog.ico: grass_dialog.ico
-	rm -f $@
-	$(INSTALL_DATA) $< $@
-
 $(ETC)/gis_set.tcl: gis_set.tcl
 	rm -f $@
 	$(INSTALL) gis_set.tcl $(ETC)

Added: grass/branches/develbranch_6/lib/init/grass_error.ico
===================================================================
(Binary files differ)


Property changes on: grass/branches/develbranch_6/lib/init/grass_error.ico
___________________________________________________________________
Name: svn:mime-type
   + image/x-icon