[GRASS-SVN] r45522 - grass/branches/develbranch_6/include/Make

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-03-02 08:34:18 -0800 (Wed, 02 Mar 2011)
New Revision: 45522

Modified:
   grass/branches/develbranch_6/include/Make/Shlib.make
Log:
use only fully qualified names for GRASS libs


Modified: grass/branches/develbranch_6/include/Make/Shlib.make
===================================================================
--- grass/branches/develbranch_6/include/Make/Shlib.make	2011-03-02 16:26:41 UTC (rev 45521)
+++ grass/branches/develbranch_6/include/Make/Shlib.make	2011-03-02 16:34:18 UTC (rev 45522)
@@ -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)
 
 # Object that calls _setfmode(_O_BINARY) which must be linked to each DLL on Windows
 ifdef MINGW
@@ -15,8 +15,8 @@
 LDFLAGS += $(SHLIB_LDFLAGS)
 
 $(SHLIB): $(SHLIB_OBJS)
-	$(SHLIB_LD) -o $@ $(LDFLAGS) $^ $(EXTRA_LIBS) $(DLLMAIN_OBJ) && \
-	(cd $(ARCH_LIBDIR); ln -f -s $(notdir $@) $(patsubst %.$(GRASS_VERSION_NUMBER)$(SHLIB_SUFFIX),%$(SHLIB_SUFFIX),$@))
+	$(SHLIB_LD) -o $@ $(LDFLAGS) $^ $(EXTRA_LIBS) $(DLLMAIN_OBJ)
+	# && \(cd $(ARCH_LIBDIR); ln -f -s $(notdir $@) $(patsubst %.$(GRASS_VERSION_NUMBER)$(SHLIB_SUFFIX),%$(SHLIB_SUFFIX),$@))
 
 shlib: $(SHLIB)