[GRASS-SVN] r42565 - in grass/trunk: gui/wxpython/vdigit include/Make

[svn_grass at osgeo.org]

Author: glynn
Date: 2010-06-14 17:07:51 +0000 (Mon, 14 Jun 2010)
New Revision: 42565

Modified:
   grass/trunk/gui/wxpython/vdigit/Makefile
   grass/trunk/gui/wxpython/vdigit/setup.py
   grass/trunk/include/Make/Grass.make
   grass/trunk/include/Make/Shlib.make
Log:
Use only versioned library names


Modified: grass/trunk/gui/wxpython/vdigit/Makefile
===================================================================
--- grass/trunk/gui/wxpython/vdigit/Makefile	2010-06-14 13:57:44 UTC (rev 42564)
+++ grass/trunk/gui/wxpython/vdigit/Makefile	2010-06-14 17:07:51 UTC (rev 42565)
@@ -42,6 +42,7 @@
 	WXWIDGETSCXXFLAGS="$(WXWIDGETSCXXFLAGS)" \
 	WXWIDGETSLIB="$(WXWIDGETSLIB)" \
 	CXXFLAGS="$(COMPILE_FLAGS_CXX)" \
+	GRASS_VERSION_NUMBER="$(GRASS_VERSION_NUMBER)" \
 	$(PYTHON) setup.py build_ext --swig=$(SWIG) --swig-opts=-c++ --build-lib=$(OBJDIR) --build-temp=$(OBJDIR)
 
 .NOTPARALLEL: $(LIB_NAME).py $(LIB_NAME)_wrap.cpp

Modified: grass/trunk/gui/wxpython/vdigit/setup.py
===================================================================
--- grass/trunk/gui/wxpython/vdigit/setup.py	2010-06-14 13:57:44 UTC (rev 42564)
+++ grass/trunk/gui/wxpython/vdigit/setup.py	2010-06-14 17:07:51 UTC (rev 42565)
@@ -20,11 +20,15 @@
 	    os.path.join(os.path.normpath(os.getenv('GISBASE')), 'include')]
 lib_dirs = [os.path.join(os.path.normpath(os.getenv('ARCH_DISTDIR')), 'lib'),
 	    os.path.join(os.path.normpath(os.getenv('GISBASE')), 'lib')]
-libs = ['grass_dbmibase',
-        'grass_dbmiclient',
-        'grass_vector',
-        'grass_gis',
-        'grass_vedit']
+
+gversion = os.getenv('GRASS_VERSION_NUMBER')
+libs = ['grass_%s.%s' % (name, gversion)
+        for name in ['dbmibase',
+                     'dbmiclient',
+                     'vector',
+                     'gis',
+                     'vedit']]
+
 extras = []
 
 for flag in ['CXXFLAGS',

Modified: grass/trunk/include/Make/Grass.make
===================================================================
--- grass/trunk/include/Make/Grass.make	2010-06-14 13:57:44 UTC (rev 42564)
+++ grass/trunk/include/Make/Grass.make	2010-06-14 17:07:51 UTC (rev 42565)
@@ -257,7 +257,7 @@
 endif
 
 define lib_rules
-$(1)_LIBNAME = grass_$(2)
+$(1)_LIBNAME = grass_$(2).$(GRASS_VERSION_NUMBER)
 ifneq ($(NEED_DEPS),)
 $(1)LIB = -l$$($(1)_LIBNAME) $$($(1)DEPS)
 else

Modified: grass/trunk/include/Make/Shlib.make
===================================================================
--- grass/trunk/include/Make/Shlib.make	2010-06-14 13:57:44 UTC (rev 42564)
+++ grass/trunk/include/Make/Shlib.make	2010-06-14 17:07:51 UTC (rev 42565)
@@ -1,6 +1,6 @@
 # common dependencies and rules for building shared libraries
 
-SHLIB = $(ARCH_LIBDIR)/$(SHLIB_PREFIX)$(SHLIB_NAME).$(GRASS_VERSION_NUMBER)$(SHLIB_SUFFIX)
+SHLIB = $(ARCH_LIBDIR)/$(SHLIB_PREFIX)$(SHLIB_NAME)$(SHLIB_SUFFIX)
 
 CFLAGS += $(SHLIB_CFLAGS)
 CXXFLAGS += $(SHLIB_CFLAGS)
@@ -8,7 +8,6 @@
 
 $(SHLIB): $(SHLIB_OBJS)
 	$(SHLIB_LD) -o $@ $(LDFLAGS) $^ $(LIBES) $(EXTRA_LIBS) $(MATHLIB)
-	cd $(ARCH_LIBDIR) && ln -f -s $(notdir $@) $(patsubst %.$(GRASS_VERSION_NUMBER)$(SHLIB_SUFFIX),%$(SHLIB_SUFFIX),$@)
 
 shlib: $(SHLIB)