[GRASS-SVN] r45291 - in grass/branches/develbranch_6: include/Make
lib/python/ctypes
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Feb 3 09:50:46 EST 2011
Author: martinl
Date: 2011-02-03 06:50:46 -0800 (Thu, 03 Feb 2011)
New Revision: 45291
Modified:
grass/branches/develbranch_6/include/Make/Grass.make.in
grass/branches/develbranch_6/lib/python/ctypes/Makefile
Log:
fix ctypes - use fully qualified lib names, remove proj/gdal dep
@TOD0: backport building system from GRASS 7...
Modified: grass/branches/develbranch_6/include/Make/Grass.make.in
===================================================================
--- grass/branches/develbranch_6/include/Make/Grass.make.in 2011-02-02 14:59:42 UTC (rev 45290)
+++ grass/branches/develbranch_6/include/Make/Grass.make.in 2011-02-03 14:50:46 UTC (rev 45291)
@@ -91,103 +91,103 @@
##################### library names #####################################
-ARRAYSTATS_LIBNAME = grass_arraystats
-BITMAP_LIBNAME = grass_bitmap
-BTREE_LIBNAME = grass_btree
-CCMATH_LIBNAME = grass_ccmath
-CLUSTER_LIBNAME = grass_cluster
-COORCNV_LIBNAME = grass_coorcnv
-DATETIME_LIBNAME = grass_datetime
-DBDIALOG_LIBNAME = grass_dbdialog
-DISPLAY_LIBNAME = grass_display
-DLG_LIBNAME = grass_dlg
-DSPF_LIBNAME = grass_dspf
-DRIVER_LIBNAME = grass_driver
-PNGDRIVER_LIBNAME = grass_pngdriver
-PSDRIVER_LIBNAME = grass_psdriver
-CAIRODRIVER_LIBNAME = grass_cairodriver
-EDIT_LIBNAME = grass_edit
-G3D_LIBNAME = grass_g3d
-GIS_LIBNAME = grass_gis
-GMATH_LIBNAME = grass_gmath
-GPDE_LIBNAME = grass_gpde
-GPROJ_LIBNAME = grass_gproj
-IBTREE_LIBNAME = grass_ibtree
-ICON_LIBNAME = grass_icon
-IMAGERY_LIBNAME = grass_I
-IORTHO_LIBNAME = grass_Iortho
-IOSTREAM_LIBNAME = grass_iostream
-ISMAP_LIBNAME = grass_ismap
-LINKM_LIBNAME = grass_linkm
-LOCK_LIBNAME = grass_lock
-MANAGE_LIBNAME = grass_manage
-RASTER_LIBNAME = grass_raster
-ROWIO_LIBNAME = grass_rowio
-SEGMENT_LIBNAME = grass_segment
-STATS_LIBNAME = grass_stats
-VASK_LIBNAME = grass_vask
-XGD_LIBNAME = grass_Xgd
-XGI_LIBNAME = grass_Xgi
-XPM_LIBNAME = grass_Xpm
+ARRAYSTATS_LIBNAME = grass_arraystats.$(GRASS_VERSION_NUMBER)
+BITMAP_LIBNAME = grass_bitmap.$(GRASS_VERSION_NUMBER)
+BTREE_LIBNAME = grass_btree.$(GRASS_VERSION_NUMBER)
+CCMATH_LIBNAME = grass_ccmath.$(GRASS_VERSION_NUMBER)
+CLUSTER_LIBNAME = grass_cluster.$(GRASS_VERSION_NUMBER)
+COORCNV_LIBNAME = grass_coorcnv.$(GRASS_VERSION_NUMBER)
+DATETIME_LIBNAME = grass_datetime.$(GRASS_VERSION_NUMBER)
+DBDIALOG_LIBNAME = grass_dbdialog.$(GRASS_VERSION_NUMBER)
+DISPLAY_LIBNAME = grass_display.$(GRASS_VERSION_NUMBER)
+DLG_LIBNAME = grass_dlg.$(GRASS_VERSION_NUMBER)
+DSPF_LIBNAME = grass_dspf.$(GRASS_VERSION_NUMBER)
+DRIVER_LIBNAME = grass_driver.$(GRASS_VERSION_NUMBER)
+PNGDRIVER_LIBNAME = grass_pngdriver.$(GRASS_VERSION_NUMBER)
+PSDRIVER_LIBNAME = grass_psdriver.$(GRASS_VERSION_NUMBER)
+CAIRODRIVER_LIBNAME = grass_cairodriver.$(GRASS_VERSION_NUMBER)
+EDIT_LIBNAME = grass_edit.$(GRASS_VERSION_NUMBER)
+G3D_LIBNAME = grass_g3d.$(GRASS_VERSION_NUMBER)
+GIS_LIBNAME = grass_gis.$(GRASS_VERSION_NUMBER)
+GMATH_LIBNAME = grass_gmath.$(GRASS_VERSION_NUMBER)
+GPDE_LIBNAME = grass_gpde.$(GRASS_VERSION_NUMBER)
+GPROJ_LIBNAME = grass_gproj.$(GRASS_VERSION_NUMBER)
+IBTREE_LIBNAME = grass_ibtree.$(GRASS_VERSION_NUMBER)
+ICON_LIBNAME = grass_icon.$(GRASS_VERSION_NUMBER)
+IMAGERY_LIBNAME = grass_I.$(GRASS_VERSION_NUMBER)
+IORTHO_LIBNAME = grass_Iortho.$(GRASS_VERSION_NUMBER)
+IOSTREAM_LIBNAME = grass_iostream.$(GRASS_VERSION_NUMBER)
+ISMAP_LIBNAME = grass_ismap.$(GRASS_VERSION_NUMBER)
+LINKM_LIBNAME = grass_linkm.$(GRASS_VERSION_NUMBER)
+LOCK_LIBNAME = grass_locky.$(GRASS_VERSION_NUMBER)
+MANAGE_LIBNAME = grass_manage.$(GRASS_VERSION_NUMBER)
+RASTER_LIBNAME = grass_raster.$(GRASS_VERSION_NUMBER)
+ROWIO_LIBNAME = grass_rowio.$(GRASS_VERSION_NUMBER)
+SEGMENT_LIBNAME = grass_segment.$(GRASS_VERSION_NUMBER)
+STATS_LIBNAME = grass_stats.$(GRASS_VERSION_NUMBER)
+VASK_LIBNAME = grass_vask.$(GRASS_VERSION_NUMBER)
+XGD_LIBNAME = grass_Xgd.$(GRASS_VERSION_NUMBER)
+XGI_LIBNAME = grass_Xgi.$(GRASS_VERSION_NUMBER)
+XPM_LIBNAME = grass_Xpm.$(GRASS_VERSION_NUMBER)
# Vector
-DIG_LIBNAME = grass_dig
-DIG2_LIBNAME = grass_dig2
-VECTR_LIBNAME = grass_vect
-TRANS_LIBNAME = grass_trans
+DIG_LIBNAME = grass_dig.$(GRASS_VERSION_NUMBER)
+DIG2_LIBNAME = grass_dig2.$(GRASS_VERSION_NUMBER)
+VECTR_LIBNAME = grass_vect.$(GRASS_VERSION_NUMBER)
+TRANS_LIBNAME = grass_trans.$(GRASS_VERSION_NUMBER)
-SHAPE_LIBNAME = grass_shape
-GRAPH_LIBNAME = grass_dgl
-RTREE_LIBNAME = grass_rtree
+SHAPE_LIBNAME = grass_shape.$(GRASS_VERSION_NUMBER)
+GRAPH_LIBNAME = grass_dgl.$(GRASS_VERSION_NUMBER)
+RTREE_LIBNAME = grass_rtree.$(GRASS_VERSION_NUMBER)
-VEDIT_LIBNAME = grass_vedit
-NETA_LIBNAME = grass_neta
+VEDIT_LIBNAME = grass_vedit.$(GRASS_VERSION_NUMBER)
+NETA_LIBNAME = grass_neta.$(GRASS_VERSION_NUMBER)
# Interpolation
-INTERPDATA_LIBNAME = grass_interpdata
-INTERPFL_LIBNAME = grass_interpfl
-QTREE_LIBNAME = grass_qtree
+INTERPDATA_LIBNAME = grass_interpdata.$(GRASS_VERSION_NUMBER)
+INTERPFL_LIBNAME = grass_interpfl.$(GRASS_VERSION_NUMBER)
+QTREE_LIBNAME = grass_qtree.$(GRASS_VERSION_NUMBER)
# NVIZ related
-OGSF_LIBNAME = grass_ogsf
-NVIZ_LIBNAME = grass_nviz
+OGSF_LIBNAME = grass_ogsf.$(GRASS_VERSION_NUMBER)
+NVIZ_LIBNAME = grass_nviz.$(GRASS_VERSION_NUMBER)
# triangulation libraries
-SOS_LIBNAME = grass_sos
-LIA_LIBNAME = grass_lia
-OPTRI_LIBNAME = grass_optri
-BASIC_LIBNAME = grass_basic
+SOS_LIBNAME = grass_sos.$(GRASS_VERSION_NUMBER)
+LIA_LIBNAME = grass_lia.$(GRASS_VERSION_NUMBER)
+OPTRI_LIBNAME = grass_optri.$(GRASS_VERSION_NUMBER)
+BASIC_LIBNAME = grass_basic.$(GRASS_VERSION_NUMBER)
-XDISPLAY_LIBNAME = grass_Xdisplay
+XDISPLAY_LIBNAME = grass_Xdisplay.$(GRASS_VERSION_NUMBER)
# DBMI
-DBMI_LIBNAME = grass_dbmi
-DBMIBASE_LIBNAME = grass_dbmibase
-DBMICLIENT_LIBNAME = grass_dbmiclient
-DBMIDRIVER_LIBNAME = grass_dbmidriver
-SQLP_LIBNAME = grass_sqlp
-DBSTUBS_LIBNAME = grass_dbstubs
+DBMI_LIBNAME = grass_dbmi.$(GRASS_VERSION_NUMBER)
+DBMIBASE_LIBNAME = grass_dbmibase.$(GRASS_VERSION_NUMBER)
+DBMICLIENT_LIBNAME = grass_dbmiclient.$(GRASS_VERSION_NUMBER)
+DBMIDRIVER_LIBNAME = grass_dbmidriver.$(GRASS_VERSION_NUMBER)
+SQLP_LIBNAME = grass_sqlp.$(GRASS_VERSION_NUMBER)
+DBSTUBS_LIBNAME = grass_dbstubs.$(GRASS_VERSION_NUMBER)
# database forms
-FORM_LIBNAME = grass_form
+FORM_LIBNAME = grass_form.$(GRASS_VERSION_NUMBER)
# Symbols (icons, patterns)
-SYMB_LIBNAME = grass_symb
+SYMB_LIBNAME = grass_symb.$(GRASS_VERSION_NUMBER)
# Normality
-CDHC_LIBNAME = grass_cdhc
+CDHC_LIBNAME = grass_cdhc.$(GRASS_VERSION_NUMBER)
# Lidar
-LIDAR_LIBNAME = grass_lidar
+LIDAR_LIBNAME = grass_lidar.$(GRASS_VERSION_NUMBER)
# Raster/SIMWE
-SIM_LIBNAME = grass_sim
+SIM_LIBNAME = grass_sim.$(GRASS_VERSION_NUMBER)
# Sites (legacy)
-SITES_LIBNAME = grass_sites
+SITES_LIBNAME = grass_sites.$(GRASS_VERSION_NUMBER)
# LRS
-LRS_LIBNAME = grass_lrs
+LRS_LIBNAME = grass_lrs.$(GRASS_VERSION_NUMBER)
##################### library switches ##################################
Modified: grass/branches/develbranch_6/lib/python/ctypes/Makefile
===================================================================
--- grass/branches/develbranch_6/lib/python/ctypes/Makefile 2011-02-02 14:59:42 UTC (rev 45290)
+++ grass/branches/develbranch_6/lib/python/ctypes/Makefile 2011-02-03 14:50:46 UTC (rev 45291)
@@ -16,9 +16,9 @@
date_LIBS = $(DATETIMELIB)
grass_LIBS = $(GISLIB)
gmath_LIBS = $(GMATHLIB)
-proj_LIBS = $(GPROJLIB)
+proj_LIBS = -l$(GPROJ_LIBNAME) $(GISLIB)
imagery_LIBS = $(IMAGERYLIB)
-vector_LIBS = $(VECTLIB)
+vector_LIBS = $(VECTRLIB) $(DIG2LIB) $(GRAPHLIB) $(RTREELIB) $(LINKMLIB) $(DBMILIB)
display_LIBS = $(DISPLAYLIB)
stats_LIBS = $(STATSLIB)
dbmi_LIBS = $(DBMILIB)
More information about the grass-commit
mailing list