[GRASS-SVN] r33419 - in grass/branches/develbranch_6: general/manage/lib lib/gis

[svn_grass at osgeo.org]

Author: neteler
Date: 2008-09-13 02:01:12 -0400 (Sat, 13 Sep 2008)
New Revision: 33419

Added:
   grass/branches/develbranch_6/lib/gis/element_list
Removed:
   grass/branches/develbranch_6/general/manage/lib/Element_List
Modified:
   grass/branches/develbranch_6/general/manage/lib/Makefile
   grass/branches/develbranch_6/lib/gis/Makefile
Log:
glynn: Move element_list to lib/gis, for earlier availability (merge from trunk, r33269)

Deleted: grass/branches/develbranch_6/general/manage/lib/Element_List
===================================================================
--- grass/branches/develbranch_6/general/manage/lib/Element_List	2008-09-13 05:59:50 UTC (rev 33418)
+++ grass/branches/develbranch_6/general/manage/lib/Element_List	2008-09-13 06:01:12 UTC (rev 33419)
@@ -1,32 +0,0 @@
-# @(#)Element_List
-# this file specifies the database elements that 
-# are processed by RENAME, REMOVE, COPY, and LIST
-#
-# format:
-# main_element:alias:description:menu text
-#    support_element:description
-#
-cell:rast:raster:raster files
-  cellhd:header
-  cats:category
-  colr:color
-  hist:history
-  cell_misc:misc
-  fcell:fcell
-  g3dcell:g3dcell
-grid3:rast3d:raster3D:raster3D files
-vector:vect:vector:binary vector files
-dig:oldvect:old vector:old (GRASS 5.0) binary vector files
-  dig_att:attributes
-  dig_plus:topology
-  dig_cats:category
-  dig_misc:misc
-  reg:point registration
-dig_ascii:asciivect:asciivector:ascii vector files
-icons:icon:icon:paint icon files
-paint/labels:labels:label:paint label files
-site_lists:sites:site list:site list files
-windows:region:region definition:region definition files
-windows3d:region3d:region3D definition:region3D definition files
-group:group:imagery group:imagery group files
-3d.view:3dview:3D viewing parameters:3D view parameters

Modified: grass/branches/develbranch_6/general/manage/lib/Makefile
===================================================================
--- grass/branches/develbranch_6/general/manage/lib/Makefile	2008-09-13 05:59:50 UTC (rev 33418)
+++ grass/branches/develbranch_6/general/manage/lib/Makefile	2008-09-13 06:01:12 UTC (rev 33419)
@@ -12,8 +12,4 @@
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 
-default: stlib $(ETC)/element_list
-
-$(ETC)/element_list: Element_List
-	if [ ! -d $(ETC) ]; then $(MKDIR) $(ETC); fi
-	$(INSTALL_DATA) $? $@
+default: stlib

Modified: grass/branches/develbranch_6/lib/gis/Makefile
===================================================================
--- grass/branches/develbranch_6/lib/gis/Makefile	2008-09-13 05:59:50 UTC (rev 33418)
+++ grass/branches/develbranch_6/lib/gis/Makefile	2008-09-13 06:01:12 UTC (rev 33419)
@@ -21,7 +21,7 @@
 EXTRA_LIBS += $(GDALLIBS)
 endif
 
-default: lib $(FMODE_OBJ) $(DATAFILES) $(COLORFILES) $(ETC)/colors.desc
+default: lib $(FMODE_OBJ) $(DATAFILES) $(COLORFILES) $(ETC)/colors.desc $(ETC)/element_list
 
 $(FMODE_OBJ): fmode.dat
 	@test -d $(OBJDIR) || mkdir $(OBJDIR)

Copied: grass/branches/develbranch_6/lib/gis/element_list (from rev 33269, grass/trunk/lib/gis/element_list)
===================================================================
--- grass/branches/develbranch_6/lib/gis/element_list	                        (rev 0)
+++ grass/branches/develbranch_6/lib/gis/element_list	2008-09-13 06:01:12 UTC (rev 33419)
@@ -0,0 +1,32 @@
+# @(#)Element_List
+# this file specifies the database elements that 
+# are processed by RENAME, REMOVE, COPY, and LIST
+#
+# format:
+# main_element:alias:description:menu text
+#    support_element:description
+#
+cell:rast:raster:raster files
+  cellhd:header
+  cats:category
+  colr:color
+  hist:history
+  cell_misc:misc
+  fcell:fcell
+  g3dcell:g3dcell
+grid3:rast3d:raster3D:raster3D files
+vector:vect:vector:binary vector files
+dig:oldvect:old vector:old (GRASS 5.0) binary vector files
+  dig_att:attributes
+  dig_plus:topology
+  dig_cats:category
+  dig_misc:misc
+  reg:point registration
+dig_ascii:asciivect:asciivector:ascii vector files
+icons:icon:icon:paint icon files
+paint/labels:labels:label:paint label files
+site_lists:sites:site list:site list files
+windows:region:region definition:region definition files
+windows3d:region3d:region3D definition:region3D definition files
+group:group:imagery group:imagery group files
+3d.view:3dview:3D viewing parameters:3D view parameters