merging changes from 1.9

official release of 2.0.2.2

Cast/src/Makefile.am

@@ -14,7 +14,11 @@ libCLHEP_Cast_@VERSION@_so_OBJECTS = $(patsubst %.cc,$(shareddir)/%.$(OBJEXT),$(
 # these if/else blocks will be parsed by automake and translated
 if BUILD_SHARED
   shareddir = shared
+if BUILD_VISUAL
+  lib_shared = CLHEP-Cast-@VERSION@.$(SHEXT)
+else
   lib_shared = libCLHEP-Cast-@VERSION@.$(SHEXT)
+endif
   SHFLAGS = @MY_SHFLAGS@
   SHLINK = @MY_SHLINK@
   SHNAME = @MY_SHNAME@

ChangeLog

+==============================
+21.11.05 Release CLHEP-2.0.2.2
+==============================
+2005-11-21  Lynn Garren <garren@fnal.gov>
+
+	* Makefile.am: Library for Windows Visual C++ is named CLHEP.lib.
+
 2005-11-17  Lynn Garren <garren@fnal.gov>
 
 	* configure.in: Remove check for sstream so Windows will not generate

Evaluator/ChangeLog

+==============================
+21.11.05 Release CLHEP-2.0.2.2
+==============================
+2005-11-21  Lynn Garren <garren@fnal.gov>
+
+	* src/Makefile.am, test/Makefile.am: Build libraries for 
+	Windows Visual C++ without lib prefix.
+
 ==============================
 22.06.05 Release CLHEP-2.0.2.1
 ==============================

Evaluator/src/Makefile.am

@@ -16,7 +16,11 @@ libCLHEP_Evaluator_@VERSION@_so_OBJECTS = $(patsubst %.cc,$(shareddir)/%.$(OBJEX
 # these if/else blocks will be parsed by automake and translated
 if BUILD_SHARED
   shareddir = shared
+if BUILD_VISUAL
+  lib_shared = CLHEP-Evaluator-@VERSION@.$(SHEXT)
+else
   lib_shared = libCLHEP-Evaluator-@VERSION@.$(SHEXT)
+endif
   SHFLAGS = @MY_SHFLAGS@
   SHLINK = @MY_SHLINK@
   SHNAME = @MY_SHNAME@

Evaluator/test/Makefile.am

@@ -10,11 +10,12 @@ if BUILD_STATIC
   LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.a
 else
 if BUILD_VISUAL
+  LDADD = $(top_builddir)/src/CLHEP-@PACKAGE@-@VERSION@.$(SHEXT)
 else
   LIBS += $(MY_LD)$(top_builddir)/src
-endif
   LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.$(SHEXT)
 endif
+endif
 
 # Identify executables needed during testing:
 check_PROGRAMS = \

Exceptions/ChangeLog

+==============================
+21.11.05 Release CLHEP-2.0.2.2
+==============================
+2005-11-21  Lynn Garren <garren@fnal.gov>
+
+	* src/Makefile.am, test/Makefile.am: Build libraries for 
+	Windows Visual C++ without lib prefix.
+
 ==============================
 22.06.05 Release CLHEP-2.0.2.1
 ==============================

Exceptions/src/Makefile.am

@@ -20,7 +20,11 @@ libCLHEP_Exceptions_@VERSION@_so_OBJECTS = $(patsubst %.cc,$(shareddir)/%.$(OBJE
 # these if/else blocks will be parsed by automake and translated
 if BUILD_SHARED
   shareddir = shared
+if BUILD_VISUAL
+  lib_shared = CLHEP-Exceptions-@VERSION@.$(SHEXT)
+else
   lib_shared = libCLHEP-Exceptions-@VERSION@.$(SHEXT)
+endif
   SHFLAGS = @MY_SHFLAGS@
   SHLINK = @MY_SHLINK@
   SHNAME = @MY_SHNAME@

Exceptions/test/Makefile.am

@@ -13,15 +13,18 @@ if BUILD_STATIC
 	  ${top_builddir}/../RefCount/src/libCLHEP-RefCount-@VERSION@.a
 else
 if BUILD_VISUAL
+  LDADD = $(top_builddir)/src/CLHEP-@PACKAGE@-@VERSION@.$(SHEXT)    \
+	  ${top_builddir}/../Cast/src/CLHEP-Cast-@VERSION@.$(SHEXT) \
+	  ${top_builddir}/../RefCount/src/CLHEP-RefCount-@VERSION@.$(SHEXT)
 else
   LIBS += $(MY_LD)$(top_builddir)/src \
           $(MY_LD)${top_builddir}/../Cast/src \
           $(MY_LD)${top_builddir}/../RefCount/src
-endif
   LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.$(SHEXT)    \
 	  ${top_builddir}/../Cast/src/libCLHEP-Cast-@VERSION@.$(SHEXT) \
 	  ${top_builddir}/../RefCount/src/libCLHEP-RefCount-@VERSION@.$(SHEXT)
 endif
+endif
 
 # Identify executables needed during testing:
 check_PROGRAMS = \

GenericFunctions/ChangeLog

+==============================
+21.11.05 Release CLHEP-2.0.2.2
+==============================
+2005-11-21  Lynn Garren <garren@fnal.gov>
+
+	* src/Makefile.am, test/Makefile.am: Build libraries for 
+	Windows Visual C++ without lib prefix.
+
 ==============================
 22.06.05 Release CLHEP-2.0.2.1
 ==============================

GenericFunctions/src/Makefile.am

@@ -84,7 +84,11 @@ libCLHEP_GenericFunctions_@VERSION@_so_OBJECTS = $(patsubst %.cc,$(shareddir)/%.
 # these if/else blocks will be parsed by automake and translated
 if BUILD_SHARED
   shareddir = shared
+if BUILD_VISUAL
+  lib_shared = CLHEP-GenericFunctions-@VERSION@.$(SHEXT)
+else
   lib_shared = libCLHEP-GenericFunctions-@VERSION@.$(SHEXT)
+endif
   SHFLAGS = @MY_SHFLAGS@
   SHLINK = @MY_SHLINK@
   SHNAME = @MY_SHNAME@

GenericFunctions/test/Makefile.am

@@ -10,11 +10,12 @@ if BUILD_STATIC
   LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.a
 else
 if BUILD_VISUAL
+  LDADD = $(top_builddir)/src/CLHEP-@PACKAGE@-@VERSION@.$(SHEXT)
 else
   LIBS += $(MY_LD)$(top_builddir)/src
-endif
   LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.$(SHEXT)
 endif
+endif
 
 # Identify executables needed during testing:
 check_PROGRAMS = \

Geometry/ChangeLog

+==============================
+21.11.05 Release CLHEP-2.0.2.2
+==============================
+2005-11-21  Lynn Garren <garren@fnal.gov>
+
+	* src/Makefile.am, test/Makefile.am: Build libraries for 
+	Windows Visual C++ without lib prefix.
+
 ==============================
 22.06.05 Release CLHEP-2.0.2.1
 ==============================

Geometry/src/Makefile.am

@@ -19,7 +19,11 @@ libCLHEP_Geometry_@VERSION@_so_OBJECTS = $(patsubst %.cc,$(shareddir)/%.$(OBJEXT
 # these if/else blocks will be parsed by automake and translated
 if BUILD_SHARED
   shareddir = shared
+if BUILD_VISUAL
+  lib_shared = CLHEP-Geometry-@VERSION@.$(SHEXT)
+else
   lib_shared = libCLHEP-Geometry-@VERSION@.$(SHEXT)
+endif
   SHFLAGS = @MY_SHFLAGS@
   SHLINK = @MY_SHLINK@
   SHNAME = @MY_SHNAME@

Geometry/test/Makefile.am

@@ -10,13 +10,15 @@ if BUILD_STATIC
           ${top_builddir}/../Vector/src/libCLHEP-Vector-@VERSION@.a
 else
 if BUILD_VISUAL
+  LDADD = $(top_builddir)/src/CLHEP-@PACKAGE@-@VERSION@.$(SHEXT) \
+          ${top_builddir}/../Vector/src/CLHEP-Vector-@VERSION@.$(SHEXT)
 else
   LIBS += $(MY_LD)$(top_builddir)/src \
           $(MY_LD)${top_builddir}/../Vector/src
-endif
   LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.$(SHEXT) \
           ${top_builddir}/../Vector/src/libCLHEP-Vector-@VERSION@.$(SHEXT)
 endif
+endif
 
 # Identify executables needed during testing:
 check_PROGRAMS = \

HepMC/ChangeLog

+==============================
+21.11.05 Release CLHEP-2.0.2.2
+==============================
+2005-11-21  Lynn Garren <garren@fnal.gov>
+
+	* src/Makefile.am, test/Makefile.am: Build libraries for 
+	Windows Visual C++ without lib prefix.
+
 ==============================
 22.06.05 Release CLHEP-2.0.2.1
 ==============================

HepMC/doc/ChangeLog

 ==============================
+21.11.05 Release CLHEP-2.0.2.2
+==============================
+==============================
 14.11.05 Release CLHEP-2.0.2.2
 ==============================
 ==============================

HepMC/src/Makefile.am

@@ -50,7 +50,11 @@ libCLHEP_HepMC_@VERSION@_so_OBJECTS = $(patsubst %.cc,$(shareddir)/%.$(OBJEXT),$
 # these if/else blocks will be parsed by automake and translated
 if BUILD_SHARED
   shareddir = shared
+if BUILD_VISUAL
+  lib_shared = CLHEP-HepMC-@VERSION@.$(SHEXT)
+else
   lib_shared = libCLHEP-HepMC-@VERSION@.$(SHEXT)
+endif
   SHFLAGS = @MY_SHFLAGS@
   SHLINK = @MY_SHLINK@
   SHNAME = @MY_SHNAME@

HepMC/test/Makefile.am

@@ -11,13 +11,15 @@ if BUILD_STATIC
           $(top_builddir)/../Vector/src/libCLHEP-Vector-@VERSION@.a
 else
 if BUILD_VISUAL
+  LDADD = $(top_builddir)/src/CLHEP-@PACKAGE@-@VERSION@.$(SHEXT) \
+          $(top_builddir)/../Vector/src/CLHEP-Vector-@VERSION@.$(SHEXT)
 else
   LIBS += $(MY_LD)$(top_builddir)/src \
 	  $(MY_LD)$(top_builddir)/../Vector/src
-endif
   LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.$(SHEXT) \
           $(top_builddir)/../Vector/src/libCLHEP-Vector-@VERSION@.$(SHEXT)
 endif
+endif
 
 # Identify executables needed during testing:
 check_PROGRAMS = \

HepPDT/ChangeLog

+==============================
+21.11.05 Release CLHEP-2.0.2.2
+==============================
+2005-11-21  Lynn Garren <garren@fnal.gov>
+
+	* src/Makefile.am, test/Makefile.am: Build libraries for 
+	Windows Visual C++ without lib prefix.
+
 2005-11-17  Lynn Garren <garren@fnal.gov>
 
 	* configure.in: Remove check for sstream so Windows will not generate

HepPDT/src/Makefile.am

@@ -71,7 +71,11 @@ libCLHEP_HepPDT_@VERSION@_so_OBJECTS = $(patsubst %.cc,$(shareddir)/%.$(OBJEXT),
 # these if/else blocks will be parsed by automake and translated
 if BUILD_SHARED
   shareddir = shared
+if BUILD_VISUAL
+  lib_shared = CLHEP-HepPDT-@VERSION@.$(SHEXT)
+else
   lib_shared = libCLHEP-HepPDT-@VERSION@.$(SHEXT)
+endif
   SHFLAGS = @MY_SHFLAGS@
   SHLINK = @MY_SHLINK@
   SHNAME = @MY_SHNAME@

HepPDT/test/Makefile.am

@@ -10,11 +10,12 @@ if BUILD_STATIC
   LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.a
 else
 if BUILD_VISUAL
+  LDADD = $(top_builddir)/src/CLHEP-@PACKAGE@-@VERSION@.$(SHEXT)
 else
   LIBS += $(MY_LD)$(top_builddir)/src
-endif
   LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.$(SHEXT)
 endif
+endif
 
 # Identify executables needed during testing:
 check_PROGRAMS = \

Makefile.am

@@ -21,7 +21,11 @@ CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 # these if/else blocks will be parsed by automake and translated
 if BUILD_SHARED
   shareddir = shared
+if BUILD_VISUAL
+  lib_shared = CLHEP-@VERSION@.$(SHEXT)
+else
   lib_shared = libCLHEP-@VERSION@.$(SHEXT)
+endif
   SHFLAGS = @MY_SHFLAGS@
   SHLINK = @MY_SHLINK@
   SHNAME = @MY_SHNAME@
@@ -31,8 +35,7 @@ if BUILD_STATIC
 endif
 if BUILD_VISUAL
   MAKE_STATIC_CLHEP = $(COPY_P) libCLHEP-@VERSION@.a libCLHEP.a
-  MAKE_SHARED_CLHEP = $(COPY_P) libCLHEP-@VERSION@.$(SHEXT) libCLHEP.$(SHEXT); \
-                      $(COPY_P) libCLHEP-@VERSION@.$(SHEXT) CLHEP.$(SHEXT)
+  MAKE_SHARED_CLHEP = $(COPY_P) CLHEP-@VERSION@.$(SHEXT) CLHEP.$(SHEXT)
 else
   MAKE_STATIC_CLHEP = $(LN_S) libCLHEP-@VERSION@.a libCLHEP.a
   MAKE_SHARED_CLHEP = $(LN_S) libCLHEP-@VERSION@.$(SHEXT) libCLHEP.$(SHEXT)

Matrix/ChangeLog

+==============================
+21.11.05 Release CLHEP-2.0.2.2
+==============================
+2005-11-21  Lynn Garren <garren@fnal.gov>
+
+	* src/Makefile.am, test/Makefile.am: Build libraries for 
+	Windows Visual C++ without lib prefix.
+
 ==============================
 22.06.05 Release CLHEP-2.0.2.1
 ==============================

Matrix/src/Makefile.am

@@ -22,7 +22,11 @@ libCLHEP_Matrix_@VERSION@_so_OBJECTS = $(patsubst %.cc,$(shareddir)/%.$(OBJEXT),
 # these if/else blocks will be parsed by automake and translated
 if BUILD_SHARED
   shareddir = shared
+if BUILD_VISUAL
+  lib_shared = CLHEP-Matrix-@VERSION@.$(SHEXT)
+else
   lib_shared = libCLHEP-Matrix-@VERSION@.$(SHEXT)
+endif
   SHFLAGS = @MY_SHFLAGS@
   SHLINK = @MY_SHLINK@
   SHNAME = @MY_SHNAME@

Matrix/test/Makefile.am

@@ -12,15 +12,18 @@ if BUILD_STATIC
 	  ${top_builddir}/../Vector/src/libCLHEP-Vector-@VERSION@.a
 else
 if BUILD_VISUAL
+  LDADD = $(top_builddir)/src/CLHEP-@PACKAGE@-@VERSION@.$(SHEXT) \
+          ${top_builddir}/../Random/src/CLHEP-Random-@VERSION@.$(SHEXT) \
+	  ${top_builddir}/../Vector/src/CLHEP-Vector-@VERSION@.$(SHEXT)
 else
   LIBS += $(MY_LD)$(top_builddir)/src \
           $(MY_LD)${top_builddir}/../Random/src \
           $(MY_LD)${top_builddir}/../Vector/src
-endif
   LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.$(SHEXT) \
           ${top_builddir}/../Random/src/libCLHEP-Random-@VERSION@.$(SHEXT) \
 	  ${top_builddir}/../Vector/src/libCLHEP-Vector-@VERSION@.$(SHEXT)
 endif
+endif
 
 # add -D needed by testInversion
 CXXFLAGS = @CXXFLAGS@ -DINSTALLATION_CHECK

Random/ChangeLog

+==============================
+21.11.05 Release CLHEP-2.0.2.2
+==============================
+2005-11-21  Lynn Garren <garren@fnal.gov>
+
+	* src/Makefile.am, test/Makefile.am: Build libraries for 
+	Windows Visual C++ without lib prefix.
+
 ==============================
 22.06.05 Release CLHEP-2.0.2.1
 ==============================

Random/src/Makefile.am

@@ -51,7 +51,11 @@ libCLHEP_Random_@VERSION@_so_OBJECTS = $(patsubst %.cc,$(shareddir)/%.$(OBJEXT),
 # these if/else blocks will be parsed by automake and translated
 if BUILD_SHARED
   shareddir = shared
+if BUILD_VISUAL
+  lib_shared = CLHEP-Random-@VERSION@.$(SHEXT)
+else
   lib_shared = libCLHEP-Random-@VERSION@.$(SHEXT)
+endif
   SHFLAGS = @MY_SHFLAGS@
   SHLINK = @MY_SHLINK@
   SHNAME = @MY_SHNAME@

Random/test/Makefile.am

@@ -11,11 +11,12 @@ if BUILD_STATIC
   LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.a
 else
 if BUILD_VISUAL
+  LDADD = $(top_builddir)/src/CLHEP-@PACKAGE@-@VERSION@.$(SHEXT)
 else
   LIBS += $(MY_LD)$(top_builddir)/src
-endif
   LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.$(SHEXT)
 endif
+endif
 
 # Identify executables needed during testing:
 check_PROGRAMS = \

RandomObjects/ChangeLog

+==============================
+21.11.05 Release CLHEP-2.0.2.2
+==============================
+2005-11-21  Lynn Garren <garren@fnal.gov>
+
+	* src/Makefile.am, test/Makefile.am: Build libraries for 
+	Windows Visual C++ without lib prefix.
+
 ==============================
 22.06.05 Release CLHEP-2.0.2.1
 ==============================

RandomObjects/src/Makefile.am

@@ -15,7 +15,11 @@ libCLHEP_RandomObjects_@VERSION@_so_OBJECTS = $(patsubst %.cc,$(shareddir)/%.$(O
 # these if/else blocks will be parsed by automake and translated
 if BUILD_SHARED
   shareddir = shared
+if BUILD_VISUAL
+  lib_shared = CLHEP-RandomObjects-@VERSION@.$(SHEXT)
+else
   lib_shared = libCLHEP-RandomObjects-@VERSION@.$(SHEXT)
+endif
   SHFLAGS = @MY_SHFLAGS@
   SHLINK = @MY_SHLINK@
   SHNAME = @MY_SHNAME@

RandomObjects/test/Makefile.am

@@ -13,17 +13,21 @@ if BUILD_STATIC
 	  ${top_builddir}/../Vector/src/libCLHEP-Vector-@VERSION@.a
 else
 if BUILD_VISUAL
+  LDADD = $(top_builddir)/src/CLHEP-@PACKAGE@-@VERSION@.$(SHEXT) \
+          ${top_builddir}/../Random/src/CLHEP-Random-@VERSION@.$(SHEXT) \
+	  ${top_builddir}/../Matrix/src/CLHEP-Matrix-@VERSION@.$(SHEXT) \
+	  ${top_builddir}/../Vector/src/CLHEP-Vector-@VERSION@.$(SHEXT)
 else
   LIBS += $(MY_LD)$(top_builddir)/src \
           $(MY_LD)${top_builddir}/../Random/src \
           $(MY_LD)${top_builddir}/../Matrix/src \
           $(MY_LD)${top_builddir}/../Vector/src
-endif
   LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.$(SHEXT) \
           ${top_builddir}/../Random/src/libCLHEP-Random-@VERSION@.$(SHEXT) \
 	  ${top_builddir}/../Matrix/src/libCLHEP-Matrix-@VERSION@.$(SHEXT) \
 	  ${top_builddir}/../Vector/src/libCLHEP-Vector-@VERSION@.$(SHEXT)
 endif
+endif
 
 # Identify executables needed during testing:
 check_PROGRAMS = \

RefCount/src/Makefile.am

@@ -14,7 +14,11 @@ libCLHEP_RefCount_@VERSION@_so_OBJECTS = $(patsubst %.cc,$(shareddir)/%.$(OBJEXT
 # these if/else blocks will be parsed by automake and translated
 if BUILD_SHARED
   shareddir = shared
+if BUILD_VISUAL
+  lib_shared = CLHEP-RefCount-@VERSION@.$(SHEXT)
+else
   lib_shared = libCLHEP-RefCount-@VERSION@.$(SHEXT)
+endif
   SHFLAGS = @MY_SHFLAGS@
   SHLINK = @MY_SHLINK@
   SHNAME = @MY_SHNAME@

StdHep/ChangeLog

+==============================
+21.11.05 Release CLHEP-2.0.2.2
+==============================
+2005-11-21  Lynn Garren <garren@fnal.gov>
+
+	* src/Makefile.am, test/Makefile.am: Build libraries for 
+	Windows Visual C++ without lib prefix.
+
 ==============================
 22.06.05 Release CLHEP-2.0.2.1
 ==============================

StdHep/src/Makefile.am

@@ -47,7 +47,11 @@ libCLHEP_StdHep_@VERSION@_so_OBJECTS = $(patsubst %.cc,$(shareddir)/%.$(OBJEXT),
 # these if/else blocks will be parsed by automake and translated
 if BUILD_SHARED
   shareddir = shared
+if BUILD_VISUAL
+  lib_shared = CLHEP-StdHep-@VERSION@.$(SHEXT)
+else
   lib_shared = libCLHEP-StdHep-@VERSION@.$(SHEXT)
+endif
   SHFLAGS = @MY_SHFLAGS@
   SHLINK = @MY_SHLINK@
   SHNAME = @MY_SHNAME@

StdHep/test/Makefile.am

@@ -12,15 +12,18 @@ if BUILD_STATIC
           $(top_builddir)/../Vector/src/libCLHEP-Vector-@VERSION@.a
 else
 if BUILD_VISUAL
+  LDADD = $(top_builddir)/src/CLHEP-@PACKAGE@-@VERSION@.$(SHEXT) \
+          $(top_builddir)/../HepMC/src/CLHEP-HepMC-@VERSION@.$(SHEXT) \
+          $(top_builddir)/../Vector/src/CLHEP-Vector-@VERSION@.$(SHEXT)
 else
   LIBS += $(MY_LD)$(top_builddir)/src \
           $(MY_LD)$(top_builddir)/../HepMC/src \
 	  $(MY_LD)$(top_builddir)/../Vector/src
-endif
   LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.$(SHEXT) \
           $(top_builddir)/../HepMC/src/libCLHEP-HepMC-@VERSION@.$(SHEXT) \
           $(top_builddir)/../Vector/src/libCLHEP-Vector-@VERSION@.$(SHEXT)
 endif
+endif
 
 # Identify executables needed during testing:
 check_PROGRAMS = \

Units/ChangeLog

 ==============================
+21.11.05 Release CLHEP-2.0.2.2
+==============================
+==============================
 22.06.05 Release CLHEP-2.0.2.1
 ==============================
 Wed Jun 22 2005  Andreas Pfeiffer  <andreas.pfeiffer@cern.ch>

Vector/ChangeLog

+==============================
+21.11.05 Release CLHEP-2.0.2.2
+==============================
+2005-11-21  Lynn Garren <garren@fnal.gov>
+
+	* src/Makefile.am, test/Makefile.am: Build libraries for 
+	Windows Visual C++ without lib prefix.
+
 2005-11-14  Lynn Garren <garren@fnal.gov>
 
 	* RotationInterfaces.h: Instantiate private destructors so that 

Vector/src/Makefile.am

@@ -49,7 +49,11 @@ libCLHEP_Vector_@VERSION@_so_OBJECTS = $(patsubst %.cc,$(shareddir)/%.$(OBJEXT),
 # these if/else blocks will be parsed by automake and translated
 if BUILD_SHARED
   shareddir = shared
+if BUILD_VISUAL
+  lib_shared = CLHEP-Vector-@VERSION@.$(SHEXT)
+else
   lib_shared = libCLHEP-Vector-@VERSION@.$(SHEXT)
+endif
   SHFLAGS = @MY_SHFLAGS@
   SHLINK = @MY_SHLINK@
   SHNAME = @MY_SHNAME@

Vector/test/Makefile.am

@@ -11,11 +11,12 @@ if BUILD_STATIC
   LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.a
 else
 if BUILD_VISUAL
+  LDADD = $(top_builddir)/src/CLHEP-@PACKAGE@-@VERSION@.$(SHEXT)
 else
   LIBS += $(MY_LD)$(top_builddir)/src
-endif
   LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.$(SHEXT)
 endif
+endif
 
 # Identify executables needed during testing:
 check_PROGRAMS = \