Commit 92ba8315 authored by Lynn Garren's avatar Lynn Garren

merging changes from 1.9

parent ccb22a31
......@@ -39,6 +39,14 @@ AC_ARG_ENABLE(static,
*) build_static="yes";;
esac],
[build_static="yes"])
AC_ARG_ENABLE(visual,
AC_HELP_STRING([--enable-visual],[on by default when using Visual C++]),
[case "${enableval}" in
yes) build_visual="yes";;
no) build_visual="no";;
*) build_visual="no";;
esac],
[build_visual="no"])
AC_ARG_ENABLE(gmake,
AC_HELP_STRING([--enable-gmake],[use gmake (default is make)]),
......@@ -175,7 +183,7 @@ g++)
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-dynamiclib -single_module"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
MY_SHNAME="-Wl,-install_name,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
build_shared="no"
;;
......@@ -196,7 +204,7 @@ c++)
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-dynamiclib -single_module"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
MY_SHNAME="-Wl,-install_name,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
build_shared="no"
;;
......@@ -209,7 +217,11 @@ c++)
cl)
AM_CXXFLAGS="-EHsc -nologo -GR -GX -MD"
AR="ar"; ARFLAGS="cru"
build_shared="no"
MY_SHFLAGS=" "; MY_SHLINK="lib /NOLOGO"; SHEXT=lib
MY_SHNAME="/OUT:"; MY_LD=" "
build_static="no"
build_shared="yes"
build_visual="yes"
;;
CC)
case "$target" in
......@@ -219,6 +231,7 @@ CC)
MY_SHNAME="-h"; MY_LD="-R"
AM_LDFLAGS="-lsunmath"
AR="CC"; ARFLAGS="-xar -o"
build_shared="no"
;;
*-*-hpux*) AM_CXXFLAGS="+O3 +DAportable +a1 -z -pta +Onolimit"
AR="ar"; ARFLAGS="cru"
......@@ -250,6 +263,7 @@ esac
AM_CONDITIONAL(BUILD_SHARED, test x$build_shared = xyes)
AM_CONDITIONAL(BUILD_STATIC, test x$build_static = xyes)
AM_CONDITIONAL(BUILD_VISUAL, test x$build_visual = xyes)
AC_SUBST(AM_CXXFLAGS)
AC_SUBST(AM_LDFLAGS)
......
......@@ -30,11 +30,19 @@ all-local: $(shareddir) $(lib_shared)
$(shareddir):
test -d $(shareddir) || mkdir $(shareddir)
if BUILD_VISUAL
$(lib_shared): $(libCLHEP_Cast_@VERSION@_so_OBJECTS)
$(SHLINK) $(SHNAME)$@ $(libCLHEP_Cast_@VERSION@_so_OBJECTS)
$(shareddir)/%.$(OBJEXT): %.cc
$(CXXCOMPILE) $(SHFLAGS) /c /Fo$@ $<
else
$(lib_shared): $(libCLHEP_Cast_@VERSION@_so_OBJECTS)
$(CXXLINK) $(SHLINK) $(SHNAME)$@ $(libCLHEP_Cast_@VERSION@_so_OBJECTS) -o $@
$(shareddir)/%.$(OBJEXT): %.cc
$(CXXCOMPILE) $(SHFLAGS) -c -o $@ $<
endif
install-exec-local: $(lib_shared)
@$(NORMAL_INSTALL)
......
Wed Jun 22 2005 Andreas Pfeiffer <andreas.pfeiffer@cern.ch>
* configure.in: changed soname to install_name for darwin targets,
dylibs still don't build properly on 10.3/10.4, static libs ok.
2005-06-19 Lynn Garren <garren@fnal.gov>
* configure.in, Makefile.am:
Use lib when building Visual C++ libraries.
Disable shared library build for Solaris CC.
==============================
22.04.05 Release CLHEP-2.0.2.0
==============================
......
Wed Jun 22 2005 Andreas Pfeiffer <andreas.pfeiffer@cern.ch>
* configure.in: changed soname to install_name for darwin targets,
dylibs still don't build properly on 10.3/10.4, static libs ok.
2005-06-19 Lynn Garren <garren@fnal.gov>
* configure.in, Makefile.am:
Use lib when building Visual C++ libraries.
Disable shared library build for Solaris CC.
==============================
22.04.05 Release CLHEP-2.0.2.0
==============================
......
......@@ -39,6 +39,14 @@ AC_ARG_ENABLE(static,
*) build_static="yes";;
esac],
[build_static="yes"])
AC_ARG_ENABLE(visual,
AC_HELP_STRING([--enable-visual],[on by default when using Visual C++]),
[case "${enableval}" in
yes) build_visual="yes";;
no) build_visual="no";;
*) build_visual="no";;
esac],
[build_visual="no"])
AC_ARG_ENABLE(gmake,
AC_HELP_STRING([--enable-gmake],[use gmake (default is make)]),
......@@ -177,7 +185,7 @@ g++)
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-dynamiclib -single_module"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
MY_SHNAME="-Wl,-install_name,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
build_shared="no"
;;
......@@ -198,7 +206,7 @@ c++)
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-dynamiclib -single_module"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
MY_SHNAME="-Wl,-install_name,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
build_shared="no"
;;
......@@ -211,7 +219,11 @@ c++)
cl)
AM_CXXFLAGS="-EHsc -nologo -GR -GX -MD"
AR="ar"; ARFLAGS="cru"
build_shared="no"
MY_SHFLAGS=" "; MY_SHLINK="lib /NOLOGO"; SHEXT=lib
MY_SHNAME="/OUT:"; MY_LD=" "
build_static="no"
build_shared="yes"
build_visual="yes"
;;
CC)
case "$target" in
......@@ -221,6 +233,7 @@ CC)
MY_SHNAME="-h"; MY_LD="-R"
AM_LDFLAGS="-lsunmath"
AR="CC"; ARFLAGS="-xar -o"
build_shared="no"
;;
*-*-hpux*) AM_CXXFLAGS="+O3 +DAportable +a1 -z -pta +Onolimit"
AR="ar"; ARFLAGS="cru"
......@@ -252,6 +265,7 @@ esac
AM_CONDITIONAL(BUILD_SHARED, test x$build_shared = xyes)
AM_CONDITIONAL(BUILD_STATIC, test x$build_static = xyes)
AM_CONDITIONAL(BUILD_VISUAL, test x$build_visual = xyes)
AC_SUBST(AM_CXXFLAGS)
AC_SUBST(AM_LDFLAGS)
......
......@@ -32,11 +32,19 @@ all-local: $(shareddir) $(lib_shared)
$(shareddir):
test -d $(shareddir) || mkdir $(shareddir)
if BUILD_VISUAL
$(lib_shared): $(libCLHEP_Evaluator_@VERSION@_so_OBJECTS)
$(SHLINK) $(SHNAME)$@ $(libCLHEP_Evaluator_@VERSION@_so_OBJECTS)
$(shareddir)/%.$(OBJEXT): %.cc
$(CXXCOMPILE) $(SHFLAGS) /c /Fo$@ $<
else
$(lib_shared): $(libCLHEP_Evaluator_@VERSION@_so_OBJECTS)
$(CXXLINK) $(SHLINK) $(SHNAME)$@ $(libCLHEP_Evaluator_@VERSION@_so_OBJECTS) -o $@
$(shareddir)/%.$(OBJEXT): %.cc
$(CXXCOMPILE) $(SHFLAGS) -c -o $@ $<
endif
install-exec-local: $(lib_shared)
@$(NORMAL_INSTALL)
......
......@@ -8,8 +8,11 @@ INCLUDES = -I$(top_builddir)/
# libraries to link, and whence
if BUILD_STATIC
LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.a
else
if BUILD_VISUAL
else
LIBS += $(MY_LD)$(top_builddir)/src
endif
LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.$(SHEXT)
endif
......
Wed Jun 22 2005 Andreas Pfeiffer <andreas.pfeiffer@cern.ch>
* configure.in: changed soname to install_name for darwin targets,
dylibs still don't build properly on 10.3/10.4, static libs ok.
2005-06-19 Lynn Garren <garren@fnal.gov>
* configure.in, Makefile.am:
Use lib when building Visual C++ libraries.
Disable shared library build for Solaris CC.
==============================
22.04.05 Release CLHEP-2.0.2.0
==============================
......
......@@ -39,6 +39,14 @@ AC_ARG_ENABLE(static,
*) build_static="yes";;
esac],
[build_static="yes"])
AC_ARG_ENABLE(visual,
AC_HELP_STRING([--enable-visual],[on by default when using Visual C++]),
[case "${enableval}" in
yes) build_visual="yes";;
no) build_visual="no";;
*) build_visual="no";;
esac],
[build_visual="no"])
AC_ARG_ENABLE(gmake,
AC_HELP_STRING([--enable-gmake],[use gmake (default is make)]),
......@@ -185,7 +193,7 @@ g++)
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-dynamiclib -single_module"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
MY_SHNAME="-Wl,-install_name,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
build_shared="no"
;;
......@@ -206,7 +214,7 @@ c++)
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-dynamiclib -single_module"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
MY_SHNAME="-Wl,-install_name,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
build_shared="no"
;;
......@@ -219,7 +227,11 @@ c++)
cl)
AM_CXXFLAGS="-EHsc -nologo -GR -GX -MD"
AR="ar"; ARFLAGS="cru"
build_shared="no"
MY_SHFLAGS=" "; MY_SHLINK="lib /NOLOGO"; SHEXT=lib
MY_SHNAME="/OUT:"; MY_LD=" "
build_static="no"
build_shared="yes"
build_visual="yes"
;;
CC)
case "$target" in
......@@ -229,6 +241,7 @@ CC)
MY_SHNAME="-h"; MY_LD="-R"
AM_LDFLAGS="-lsunmath"
AR="CC"; ARFLAGS="-xar -o"
build_shared="no"
;;
*-*-hpux*) AM_CXXFLAGS="+O3 +DAportable +a1 -z -pta +Onolimit"
AR="ar"; ARFLAGS="cru"
......@@ -260,6 +273,7 @@ esac
AM_CONDITIONAL(BUILD_SHARED, test x$build_shared = xyes)
AM_CONDITIONAL(BUILD_STATIC, test x$build_static = xyes)
AM_CONDITIONAL(BUILD_VISUAL, test x$build_visual = xyes)
AC_SUBST(AM_CXXFLAGS)
AC_SUBST(AM_LDFLAGS)
......
......@@ -36,11 +36,19 @@ all-local: $(shareddir) $(lib_shared)
$(shareddir):
test -d $(shareddir) || mkdir $(shareddir)
if BUILD_VISUAL
$(lib_shared): $(libCLHEP_Exceptions_@VERSION@_so_OBJECTS)
$(SHLINK) $(SHNAME)$@ $(libCLHEP_Exceptions_@VERSION@_so_OBJECTS)
$(shareddir)/%.$(OBJEXT): %.cc
$(CXXCOMPILE) $(SHFLAGS) /c /Fo$@ $<
else
$(lib_shared): $(libCLHEP_Exceptions_@VERSION@_so_OBJECTS)
$(CXXLINK) $(SHLINK) $(SHNAME)$@ $(libCLHEP_Exceptions_@VERSION@_so_OBJECTS) -o $@
$(shareddir)/%.$(OBJEXT): %.cc
$(CXXCOMPILE) $(SHFLAGS) -c -o $@ $<
endif
install-exec-local: $(lib_shared)
@$(NORMAL_INSTALL)
......
......@@ -11,10 +11,13 @@ if BUILD_STATIC
LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.a \
${top_builddir}/../Cast/src/libCLHEP-Cast-@VERSION@.a \
${top_builddir}/../RefCount/src/libCLHEP-RefCount-@VERSION@.a
else
if BUILD_VISUAL
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)
......@@ -29,8 +32,9 @@ check_PROGRAMS = \
exctest2 \
exctest3 \
exctest4 \
exctestNothrow \
excDblThrow
exctestNothrow
# excDblThrow
check_SCRIPTS = \
testExceptions.sh \
......
Wed Jun 22 2005 Andreas Pfeiffer <andreas.pfeiffer@cern.ch>
* configure.in: changed soname to install_name for darwin targets,
dylibs still don't build properly on 10.3/10.4, static libs ok.
2005-06-19 Lynn Garren <garren@fnal.gov>
* configure.in, Makefile.am:
Use lib when building Visual C++ libraries.
Disable shared library build for Solaris CC.
==============================
22.04.05 Release CLHEP-2.0.2.0
==============================
......
......@@ -39,6 +39,14 @@ AC_ARG_ENABLE(static,
*) build_static="yes";;
esac],
[build_static="yes"])
AC_ARG_ENABLE(visual,
AC_HELP_STRING([--enable-visual],[on by default when using Visual C++]),
[case "${enableval}" in
yes) build_visual="yes";;
no) build_visual="no";;
*) build_visual="no";;
esac],
[build_visual="no"])
AC_ARG_ENABLE(gmake,
AC_HELP_STRING([--enable-gmake],[use gmake (default is make)]),
......@@ -177,7 +185,7 @@ g++)
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-dynamiclib -single_module"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
MY_SHNAME="-Wl,-install_name,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
build_shared="no"
;;
......@@ -198,7 +206,7 @@ c++)
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-dynamiclib -single_module"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
MY_SHNAME="-Wl,-install_name,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
build_shared="no"
;;
......@@ -211,7 +219,11 @@ c++)
cl)
AM_CXXFLAGS="-EHsc -nologo -GR -GX -MD"
AR="ar"; ARFLAGS="cru"
build_shared="no"
MY_SHFLAGS=" "; MY_SHLINK="lib /NOLOGO"; SHEXT=lib
MY_SHNAME="/OUT:"; MY_LD=" "
build_static="no"
build_shared="yes"
build_visual="yes"
;;
CC)
case "$target" in
......@@ -221,6 +233,7 @@ CC)
MY_SHNAME="-h"; MY_LD="-R"
AM_LDFLAGS="-lsunmath"
AR="CC"; ARFLAGS="-xar -o"
build_shared="no"
;;
*-*-hpux*) AM_CXXFLAGS="+O3 +DAportable +a1 -z -pta +Onolimit"
AR="ar"; ARFLAGS="cru"
......@@ -252,6 +265,7 @@ esac
AM_CONDITIONAL(BUILD_SHARED, test x$build_shared = xyes)
AM_CONDITIONAL(BUILD_STATIC, test x$build_static = xyes)
AM_CONDITIONAL(BUILD_VISUAL, test x$build_visual = xyes)
AC_SUBST(AM_CXXFLAGS)
AC_SUBST(AM_LDFLAGS)
......
......@@ -100,11 +100,19 @@ all-local: $(shareddir) $(lib_shared)
$(shareddir):
test -d $(shareddir) || mkdir $(shareddir)
if BUILD_VISUAL
$(lib_shared): $(libCLHEP_GenericFunctions_@VERSION@_so_OBJECTS)
$(SHLINK) $(SHNAME)$@ $(libCLHEP_GenericFunctions_@VERSION@_so_OBJECTS)
$(shareddir)/%.$(OBJEXT): %.cc
$(CXXCOMPILE) $(SHFLAGS) /c /Fo$@ $<
else
$(lib_shared): $(libCLHEP_GenericFunctions_@VERSION@_so_OBJECTS)
$(CXXLINK) $(SHLINK) $(SHNAME)$@ $(libCLHEP_GenericFunctions_@VERSION@_so_OBJECTS) -o $@
$(shareddir)/%.$(OBJEXT): %.cc
$(CXXCOMPILE) $(SHFLAGS) -c -o $@ $<
endif
install-exec-local: $(lib_shared)
@$(NORMAL_INSTALL)
......
......@@ -8,8 +8,11 @@ INCLUDES = -I$(top_builddir)/
# libraries to link, and whence
if BUILD_STATIC
LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.a
else
if BUILD_VISUAL
else
LIBS += $(MY_LD)$(top_builddir)/src
endif
LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.$(SHEXT)
endif
......
Wed Jun 22 2005 Andreas Pfeiffer <andreas.pfeiffer@cern.ch>
* configure.in: changed soname to install_name for darwin targets,
dylibs still don't build properly on 10.3/10.4, static libs ok.
2005-06-19 Lynn Garren <garren@fnal.gov>
* configure.in, Makefile.am:
Use lib when building Visual C++ libraries.
Disable shared library build for Solaris CC.
==============================
22.04.05 Release CLHEP-2.0.2.0
==============================
......
......@@ -39,6 +39,14 @@ AC_ARG_ENABLE(static,
*) build_static="yes";;
esac],
[build_static="yes"])
AC_ARG_ENABLE(visual,
AC_HELP_STRING([--enable-visual],[on by default when using Visual C++]),
[case "${enableval}" in
yes) build_visual="yes";;
no) build_visual="no";;
*) build_visual="no";;
esac],
[build_visual="no"])
AC_ARG_ENABLE(gmake,
AC_HELP_STRING([--enable-gmake],[use gmake (default is make)]),
......@@ -178,7 +186,7 @@ g++)
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-dynamiclib -single_module"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
MY_SHNAME="-Wl,-install_name,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
build_shared="no"
;;
......@@ -199,7 +207,7 @@ c++)
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-dynamiclib -single_module"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
MY_SHNAME="-Wl,-install_name,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
build_shared="no"
;;
......@@ -212,7 +220,11 @@ c++)
cl)
AM_CXXFLAGS="-EHsc -nologo -GR -GX -MD"
AR="ar"; ARFLAGS="cru"
build_shared="no"
MY_SHFLAGS=" "; MY_SHLINK="lib /NOLOGO"; SHEXT=lib
MY_SHNAME="/OUT:"; MY_LD=" "
build_static="no"
build_shared="yes"
build_visual="yes"
;;
CC)
case "$target" in
......@@ -222,6 +234,7 @@ CC)
MY_SHNAME="-h"; MY_LD="-R"
AM_LDFLAGS="-lsunmath"
AR="CC"; ARFLAGS="-xar -o"
build_shared="no"
;;
*-*-hpux*) AM_CXXFLAGS="+O3 +DAportable +a1 -z -pta +Onolimit"
AR="ar"; ARFLAGS="cru"
......@@ -253,6 +266,7 @@ esac
AM_CONDITIONAL(BUILD_SHARED, test x$build_shared = xyes)
AM_CONDITIONAL(BUILD_STATIC, test x$build_static = xyes)
AM_CONDITIONAL(BUILD_VISUAL, test x$build_visual = xyes)
AC_SUBST(AM_CXXFLAGS)
AC_SUBST(AM_LDFLAGS)
......
......@@ -35,11 +35,19 @@ all-local: $(shareddir) $(lib_shared)
$(shareddir):
test -d $(shareddir) || mkdir $(shareddir)
if BUILD_VISUAL
$(lib_shared): $(libCLHEP_Geometry_@VERSION@_so_OBJECTS)
$(SHLINK) $(SHNAME)$@ $(libCLHEP_Geometry_@VERSION@_so_OBJECTS)
$(shareddir)/%.$(OBJEXT): %.cc
$(CXXCOMPILE) $(SHFLAGS) /c /Fo$@ $<
else
$(lib_shared): $(libCLHEP_Geometry_@VERSION@_so_OBJECTS)
$(CXXLINK) $(SHLINK) $(SHNAME)$@ $(libCLHEP_Geometry_@VERSION@_so_OBJECTS) -o $@
$(shareddir)/%.$(OBJEXT): %.cc
$(CXXCOMPILE) $(SHFLAGS) -c -o $@ $<
endif
install-exec-local: $(lib_shared)
@$(NORMAL_INSTALL)
......
......@@ -8,9 +8,12 @@ INCLUDES = -I$(top_builddir)/
if BUILD_STATIC
LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.a \
${top_builddir}/../Vector/src/libCLHEP-Vector-@VERSION@.a
else
if BUILD_VISUAL
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
......
Wed Jun 22 2005 Andreas Pfeiffer <andreas.pfeiffer@cern.ch>
* configure.in: changed soname to install_name for darwin targets,
dylibs still don't build properly on 10.3/10.4, static libs ok.
2005-06-19 Lynn Garren <garren@fnal.gov>
* configure.in, Makefile.am:
Use lib when building Visual C++ libraries.
Disable shared library build for Solaris CC.
2005-04-28 Lynn Garren <garren@fnal.gov>
* HepMC/CBherwig.icc: Bug fix from Matt Dobbs.
......
......@@ -39,6 +39,14 @@ AC_ARG_ENABLE(static,
*) build_static="yes";;
esac],
[build_static="yes"])
AC_ARG_ENABLE(visual,
AC_HELP_STRING([--enable-visual],[on by default when using Visual C++]),
[case "${enableval}" in
yes) build_visual="yes";;
no) build_visual="no";;
*) build_visual="no";;
esac],
[build_visual="no"])
AC_ARG_ENABLE(gmake,
AC_HELP_STRING([--enable-gmake],[use gmake (default is make)]),
......@@ -191,7 +199,7 @@ g++)
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-dynamiclib -single_module"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
MY_SHNAME="-Wl,-install_name,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
build_shared="no"
;;
......@@ -212,7 +220,7 @@ c++)
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-dynamiclib -single_module"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
MY_SHNAME="-Wl,-install_name,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
build_shared="no"
;;
......@@ -225,7 +233,11 @@ c++)
cl)
AM_CXXFLAGS="-EHsc -nologo -GR -GX -MD"
AR="ar"; ARFLAGS="cru"
build_shared="no"
MY_SHFLAGS=" "; MY_SHLINK="lib /NOLOGO"; SHEXT=lib
MY_SHNAME="/OUT:"; MY_LD=" "
build_static="no"
build_shared="yes"
build_visual="yes"
;;
CC)
case "$target" in
......@@ -235,6 +247,7 @@ CC)
MY_SHNAME="-h"; MY_LD="-R"
AM_LDFLAGS="-lsunmath"
AR="CC"; ARFLAGS="-xar -o"
build_shared="no"
;;
*-*-hpux*) AM_CXXFLAGS="+O3 +DAportable +a1 -z -pta +Onolimit"
AR="ar"; ARFLAGS="cru"
......@@ -266,6 +279,7 @@ esac
AM_CONDITIONAL(BUILD_SHARED, test x$build_shared = xyes)
AM_CONDITIONAL(BUILD_STATIC, test x$build_static = xyes)
AM_CONDITIONAL(BUILD_VISUAL, test x$build_visual = xyes)
AC_SUBST(AM_CXXFLAGS)
AC_SUBST(AM_LDFLAGS)
......
......@@ -66,11 +66,19 @@ all-local: $(shareddir) $(lib_shared)
$(shareddir):
test -d $(shareddir) || mkdir $(shareddir)
if BUILD_VISUAL
$(lib_shared): $(libCLHEP_HepMC_@VERSION@_so_OBJECTS)
$(SHLINK) $(SHNAME)$@ $(libCLHEP_HepMC_@VERSION@_so_OBJECTS)
$(shareddir)/%.$(OBJEXT): %.cc
$(CXXCOMPILE) $(SHFLAGS) /c /Fo$@ $<
else
$(lib_shared): $(libCLHEP_HepMC_@VERSION@_so_OBJECTS)
$(CXXLINK) $(SHLINK) $(SHNAME)$@ $(libCLHEP_HepMC_@VERSION@_so_OBJECTS) -o $@
$(shareddir)/%.$(OBJEXT): %.cc
$(CXXCOMPILE) $(SHFLAGS) -c -o $@ $<