|
 |
7a8232a |
diff -up grass-6.4.2/include/Make/Grass.make.in.shlibver grass-6.4.2/include/Make/Grass.make.in
|
|
|
7a8232a |
--- grass-6.4.2/include/Make/Grass.make.in.shlibver 2012-03-02 14:56:53.788021081 -0500
|
|
|
7a8232a |
+++ grass-6.4.2/include/Make/Grass.make.in 2012-03-02 15:05:23.355430132 -0500
|
|
|
7a8232a |
@@ -92,102 +92,102 @@ endif
|
|
|
7a8232a |
|
|
|
7a8232a |
##################### library names #####################################
|
|
|
7a8232a |
|
|
|
7a8232a |
-ARRAYSTATS_LIBNAME = grass_arraystats.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-BITMAP_LIBNAME = grass_bitmap.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-BTREE_LIBNAME = grass_btree.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-CLUSTER_LIBNAME = grass_cluster.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-COORCNV_LIBNAME = grass_coorcnv.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-DATETIME_LIBNAME = grass_datetime.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-DBDIALOG_LIBNAME = grass_dbdialog.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-DISPLAY_LIBNAME = grass_display.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-DLG_LIBNAME = grass_dlg.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-DSPF_LIBNAME = grass_dspf.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-DRIVER_LIBNAME = grass_driver.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-PNGDRIVER_LIBNAME = grass_pngdriver.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-PSDRIVER_LIBNAME = grass_psdriver.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-CAIRODRIVER_LIBNAME = grass_cairodriver.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-EDIT_LIBNAME = grass_edit.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-G3D_LIBNAME = grass_g3d.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-GIS_LIBNAME = grass_gis.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-GMATH_LIBNAME = grass_gmath.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-GPDE_LIBNAME = grass_gpde.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-GPROJ_LIBNAME = grass_gproj.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-IBTREE_LIBNAME = grass_ibtree.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-ICON_LIBNAME = grass_icon.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-IMAGERY_LIBNAME = grass_I.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-IORTHO_LIBNAME = grass_Iortho.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-IOSTREAM_LIBNAME = grass_iostream.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-ISMAP_LIBNAME = grass_ismap.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-LINKM_LIBNAME = grass_linkm.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-LOCK_LIBNAME = grass_locky.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-MANAGE_LIBNAME = grass_manage.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-RASTER_LIBNAME = grass_raster.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-ROWIO_LIBNAME = grass_rowio.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-SEGMENT_LIBNAME = grass_segment.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-STATS_LIBNAME = grass_stats.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-VASK_LIBNAME = grass_vask.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-XGD_LIBNAME = grass_Xgd.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-XGI_LIBNAME = grass_Xgi.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-XPM_LIBNAME = grass_Xpm.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
+ARRAYSTATS_LIBNAME = grass_arraystats
|
|
|
7a8232a |
+BITMAP_LIBNAME = grass_bitmap
|
|
|
7a8232a |
+BTREE_LIBNAME = grass_btree
|
|
|
7a8232a |
+CLUSTER_LIBNAME = grass_cluster
|
|
|
7a8232a |
+COORCNV_LIBNAME = grass_coorcnv
|
|
|
7a8232a |
+DATETIME_LIBNAME = grass_datetime
|
|
|
7a8232a |
+DBDIALOG_LIBNAME = grass_dbdialog
|
|
|
7a8232a |
+DISPLAY_LIBNAME = grass_display
|
|
|
7a8232a |
+DLG_LIBNAME = grass_dlg
|
|
|
7a8232a |
+DSPF_LIBNAME = grass_dspf
|
|
|
7a8232a |
+DRIVER_LIBNAME = grass_driver
|
|
|
7a8232a |
+PNGDRIVER_LIBNAME = grass_pngdriver
|
|
|
7a8232a |
+PSDRIVER_LIBNAME = grass_psdriver
|
|
|
7a8232a |
+CAIRODRIVER_LIBNAME = grass_cairodriver
|
|
|
7a8232a |
+EDIT_LIBNAME = grass_edit
|
|
|
7a8232a |
+G3D_LIBNAME = grass_g3d
|
|
|
7a8232a |
+GIS_LIBNAME = grass_gis
|
|
|
7a8232a |
+GMATH_LIBNAME = grass_gmath
|
|
|
7a8232a |
+GPDE_LIBNAME = grass_gpde
|
|
|
7a8232a |
+GPROJ_LIBNAME = grass_gproj
|
|
|
7a8232a |
+IBTREE_LIBNAME = grass_ibtree
|
|
|
7a8232a |
+ICON_LIBNAME = grass_icon
|
|
|
7a8232a |
+IMAGERY_LIBNAME = grass_I
|
|
|
7a8232a |
+IORTHO_LIBNAME = grass_Iortho
|
|
|
7a8232a |
+IOSTREAM_LIBNAME = grass_iostream
|
|
|
7a8232a |
+ISMAP_LIBNAME = grass_ismap
|
|
|
7a8232a |
+LINKM_LIBNAME = grass_linkm
|
|
|
7a8232a |
+LOCK_LIBNAME = grass_locky
|
|
|
7a8232a |
+MANAGE_LIBNAME = grass_manage
|
|
|
7a8232a |
+RASTER_LIBNAME = grass_raster
|
|
|
7a8232a |
+ROWIO_LIBNAME = grass_rowio
|
|
|
7a8232a |
+SEGMENT_LIBNAME = grass_segment
|
|
|
7a8232a |
+STATS_LIBNAME = grass_stats
|
|
|
7a8232a |
+VASK_LIBNAME = grass_vask
|
|
|
7a8232a |
+XGD_LIBNAME = grass_Xgd
|
|
|
7a8232a |
+XGI_LIBNAME = grass_Xgi
|
|
|
7a8232a |
+XPM_LIBNAME = grass_Xpm
|
|
|
7a8232a |
|
|
|
7a8232a |
# Vector
|
|
|
7a8232a |
-DIG_LIBNAME = grass_dig.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-DIG2_LIBNAME = grass_dig2.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-VECTR_LIBNAME = grass_vect.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-TRANS_LIBNAME = grass_trans.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-
|
|
|
7a8232a |
-SHAPE_LIBNAME = grass_shape.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-GRAPH_LIBNAME = grass_dgl.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-RTREE_LIBNAME = grass_rtree.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
+DIG_LIBNAME = grass_dig
|
|
|
7a8232a |
+DIG2_LIBNAME = grass_dig2
|
|
|
7a8232a |
+VECTR_LIBNAME = grass_vect
|
|
|
7a8232a |
+TRANS_LIBNAME = grass_trans
|
|
|
7a8232a |
+
|
|
|
7a8232a |
+SHAPE_LIBNAME = grass_shape
|
|
|
7a8232a |
+GRAPH_LIBNAME = grass_dgl
|
|
|
7a8232a |
+RTREE_LIBNAME = grass_rtree
|
|
|
7a8232a |
|
|
|
7a8232a |
-VEDIT_LIBNAME = grass_vedit.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-NETA_LIBNAME = grass_neta.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
+VEDIT_LIBNAME = grass_vedit
|
|
|
7a8232a |
+NETA_LIBNAME = grass_neta
|
|
|
7a8232a |
|
|
|
7a8232a |
# Interpolation
|
|
|
7a8232a |
-INTERPDATA_LIBNAME = grass_interpdata.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-INTERPFL_LIBNAME = grass_interpfl.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-QTREE_LIBNAME = grass_qtree.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
+INTERPDATA_LIBNAME = grass_interpdata
|
|
|
7a8232a |
+INTERPFL_LIBNAME = grass_interpfl
|
|
|
7a8232a |
+QTREE_LIBNAME = grass_qtree
|
|
|
7a8232a |
|
|
|
7a8232a |
# NVIZ related
|
|
|
7a8232a |
-OGSF_LIBNAME = grass_ogsf.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-NVIZ_LIBNAME = grass_nviz.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
+OGSF_LIBNAME = grass_ogsf
|
|
|
7a8232a |
+NVIZ_LIBNAME = grass_nviz
|
|
|
7a8232a |
|
|
|
7a8232a |
# triangulation libraries
|
|
|
7a8232a |
-SOS_LIBNAME = grass_sos.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-LIA_LIBNAME = grass_lia.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-OPTRI_LIBNAME = grass_optri.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-BASIC_LIBNAME = grass_basic.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
+SOS_LIBNAME = grass_sos
|
|
|
7a8232a |
+LIA_LIBNAME = grass_lia
|
|
|
7a8232a |
+OPTRI_LIBNAME = grass_optri
|
|
|
7a8232a |
+BASIC_LIBNAME = grass_basic
|
|
|
7a8232a |
|
|
|
7a8232a |
-XDISPLAY_LIBNAME = grass_Xdisplay.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
+XDISPLAY_LIBNAME = grass_Xdisplay
|
|
|
7a8232a |
|
|
|
7a8232a |
# DBMI
|
|
|
7a8232a |
-DBMI_LIBNAME = grass_dbmi.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-DBMIBASE_LIBNAME = grass_dbmibase.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-DBMICLIENT_LIBNAME = grass_dbmiclient.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-DBMIDRIVER_LIBNAME = grass_dbmidriver.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-SQLP_LIBNAME = grass_sqlp.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
-DBSTUBS_LIBNAME = grass_dbstubs.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
+DBMI_LIBNAME = grass_dbmi
|
|
|
7a8232a |
+DBMIBASE_LIBNAME = grass_dbmibase
|
|
|
7a8232a |
+DBMICLIENT_LIBNAME = grass_dbmiclient
|
|
|
7a8232a |
+DBMIDRIVER_LIBNAME = grass_dbmidriver
|
|
|
7a8232a |
+SQLP_LIBNAME = grass_sqlp
|
|
|
7a8232a |
+DBSTUBS_LIBNAME = grass_dbstubs
|
|
|
7a8232a |
|
|
|
7a8232a |
# database forms
|
|
|
7a8232a |
-FORM_LIBNAME = grass_form.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
+FORM_LIBNAME = grass_form
|
|
|
7a8232a |
|
|
|
7a8232a |
# Symbols (icons, patterns)
|
|
|
7a8232a |
-SYMB_LIBNAME = grass_symb.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
+SYMB_LIBNAME = grass_symb
|
|
|
7a8232a |
|
|
|
7a8232a |
# Normality
|
|
|
7a8232a |
-CDHC_LIBNAME = grass_cdhc.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
+CDHC_LIBNAME = grass_cdhc
|
|
|
7a8232a |
|
|
|
7a8232a |
# Lidar
|
|
|
7a8232a |
-LIDAR_LIBNAME = grass_lidar.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
+LIDAR_LIBNAME = grass_lidar
|
|
|
7a8232a |
|
|
|
7a8232a |
# Raster/SIMWE
|
|
|
7a8232a |
-SIM_LIBNAME = grass_sim.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
+SIM_LIBNAME = grass_sim
|
|
|
7a8232a |
|
|
|
7a8232a |
# Sites (legacy)
|
|
|
7a8232a |
-SITES_LIBNAME = grass_sites.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
+SITES_LIBNAME = grass_sites
|
|
|
7a8232a |
|
|
|
7a8232a |
# LRS
|
|
|
7a8232a |
-LRS_LIBNAME = grass_lrs.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
+LRS_LIBNAME = grass_lrs
|
|
|
7a8232a |
|
|
|
7a8232a |
##################### library switches ##################################
|
|
|
7a8232a |
|
|
|
7a8232a |
diff -up grass-6.4.2/include/Make/Shlib.make.shlibver grass-6.4.2/include/Make/Shlib.make
|
|
|
7a8232a |
--- grass-6.4.2/include/Make/Shlib.make.shlibver 2011-05-03 15:27:17.000000000 -0400
|
|
|
7a8232a |
+++ grass-6.4.2/include/Make/Shlib.make 2012-03-02 14:54:18.852551365 -0500
|
|
|
7a8232a |
@@ -1,6 +1,8 @@
|
|
Balint Cristian |
3f92e14 |
# common dependencies and rules for building shared libraries
|
|
Balint Cristian |
3f92e14 |
|
|
|
7a8232a |
-SHLIB = $(ARCH_LIBDIR)/$(SHLIB_PREFIX)$(SHLIB_NAME)$(SHLIB_SUFFIX)
|
|
|
7a8232a |
+SHLIB = $(ARCH_LIBDIR)/$(SHLIB_PREFIX)$(SHLIB_NAME)$(SHLIB_SUFFIX).$(GRASS_VERSION_NUMBER)
|
|
Balint Cristian |
3f92e14 |
+GRASS_MAJOR=6
|
|
Viji V Nair |
97bd88c |
+GRASS_MINOR=4
|
|
Balint Cristian |
3f92e14 |
|
|
Viji V Nair |
97bd88c |
# Object that calls _setfmode(_O_BINARY) which must be linked to each DLL on Windows
|
|
Viji V Nair |
97bd88c |
ifdef MINGW
|
|
|
7a8232a |
@@ -15,9 +17,12 @@ CFLAGS += $(SHLIB_CFLAGS) $(NLS_CFLAGS)
|
|
Balint Cristian |
3f92e14 |
LDFLAGS += $(SHLIB_LDFLAGS)
|
|
Balint Cristian |
3f92e14 |
|
|
Balint Cristian |
3f92e14 |
$(SHLIB): $(SHLIB_OBJS)
|
|
|
7a8232a |
- $(SHLIB_LD) -o $@ $(LDFLAGS) $^ $(EXTRA_LIBS) $(DLLMAIN_OBJ)
|
|
|
7a8232a |
ifndef MINGW
|
|
Balint Cristian |
8c45547 |
- (cd $(ARCH_LIBDIR); ln -f -s $(notdir $@) $(patsubst %.$(GRASS_VERSION_NUMBER)$(SHLIB_SUFFIX),%$(SHLIB_SUFFIX),$@))
|
|
|
7a8232a |
+ $(SHLIB_LD) -o $@ -Wl,-soname,lib$(SHLIB_NAME)$(SHLIB_SUFFIX).$(GRASS_MAJOR).$(GRASS_MINOR) $(LDFLAGS) $^ $(EXTRA_LIBS) $(DLLMAIN_OBJ) && \
|
|
Balint Cristian |
3f92e14 |
+ ln -f -s $(notdir $@) $(patsubst %$(SHLIB_SUFFIX).$(GRASS_VERSION_NUMBER),%$(SHLIB_SUFFIX),$@); \
|
|
Balint Cristian |
8c45547 |
+ ln -f -s $(notdir $@) $(patsubst %$(SHLIB_SUFFIX).$(GRASS_VERSION_NUMBER),%$(SHLIB_SUFFIX).$(GRASS_MAJOR).$(GRASS_MINOR),$@);
|
|
|
7a8232a |
+else
|
|
|
7a8232a |
+ $(SHLIB_LD) -o $@ -Wl,-soname,lib$(SHLIB_NAME)$(SHLIB_SUFFIX).$(GRASS_MAJOR).$(GRASS_MINOR) $(LDFLAGS) $^ $(EXTRA_LIBS) $(DLLMAIN_OBJ)
|
|
|
7a8232a |
endif
|
|
Balint Cristian |
3f92e14 |
|
|
Balint Cristian |
3f92e14 |
shlib: $(SHLIB)
|
|
|
7a8232a |
diff -up grass-6.4.2/raster/r.li/r.li.daemon/Makefile.shlibver grass-6.4.2/raster/r.li/r.li.daemon/Makefile
|
|
|
7a8232a |
--- grass-6.4.2/raster/r.li/r.li.daemon/Makefile.shlibver 2012-03-02 15:02:38.009056327 -0500
|
|
|
7a8232a |
+++ grass-6.4.2/raster/r.li/r.li.daemon/Makefile 2012-03-02 15:02:50.572932790 -0500
|
|
|
7a8232a |
@@ -2,7 +2,7 @@ MODULE_TOPDIR = ../../..
|
|
|
7a8232a |
|
|
|
7a8232a |
EXTRA_LIBS=$(GISLIB) $(MATHLIB)
|
|
|
7a8232a |
|
|
|
7a8232a |
-LIB_NAME = grass_rli.$(GRASS_VERSION_NUMBER)
|
|
|
7a8232a |
+LIB_NAME = grass_rli
|
|
|
7a8232a |
|
|
|
7a8232a |
LIB_OBJS = daemon.o list.o ipc.o worker.o GenericCell.o avl.o avlID.o
|
|
Balint Cristian |
3f92e14 |
|