Commit 16c7a793 authored by Lynn Garren's avatar Lynn Garren
Browse files

merging changes from 1.9

parent 926fce6c
......@@ -222,6 +222,8 @@ cl)
build_static="no"
build_shared="yes"
build_visual="yes"
CXXFLAGS=" "
AC_SUBST(CXXFLAGS)
;;
CC)
case "$target" in
......
......@@ -224,6 +224,8 @@ cl)
build_static="no"
build_shared="yes"
build_visual="yes"
CXXFLAGS=" "
AC_SUBST(CXXFLAGS)
;;
CC)
case "$target" in
......
......@@ -232,6 +232,8 @@ cl)
build_static="no"
build_shared="yes"
build_visual="yes"
CXXFLAGS=" "
AC_SUBST(CXXFLAGS)
;;
CC)
case "$target" in
......
......@@ -224,6 +224,8 @@ cl)
build_static="no"
build_shared="yes"
build_visual="yes"
CXXFLAGS=" "
AC_SUBST(CXXFLAGS)
;;
CC)
case "$target" in
......
......@@ -225,6 +225,8 @@ cl)
build_static="no"
build_shared="yes"
build_visual="yes"
CXXFLAGS=" "
AC_SUBST(CXXFLAGS)
;;
CC)
case "$target" in
......
......@@ -238,6 +238,8 @@ cl)
build_static="no"
build_shared="yes"
build_visual="yes"
CXXFLAGS=" "
AC_SUBST(CXXFLAGS)
;;
CC)
case "$target" in
......
......@@ -250,6 +250,8 @@ cl)
build_static="no"
build_shared="yes"
build_visual="yes"
CXXFLAGS=" "
AC_SUBST(CXXFLAGS)
;;
CC)
case "$target" in
......
......@@ -29,6 +29,14 @@ endif
if BUILD_STATIC
CLHEPLIB = libCLHEP-@VERSION@.a
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)
else
MAKE_STATIC_CLHEP = $(LN_S) libCLHEP-@VERSION@.a libCLHEP.a
MAKE_SHARED_CLHEP = $(LN_S) libCLHEP-@VERSION@.$(SHEXT) libCLHEP.$(SHEXT)
endif
CLEANFILES = clheplib library-list $(CLHEPLIB) $(lib_shared)
......@@ -82,7 +90,7 @@ install-CLHEPLIB: $(CLHEPLIB) $(lib_shared)
$(RANLIB) "$(DESTDIR)$(libdir)/$$p"; \
if test -f $(DESTDIR)$(libdir)/libCLHEP.a; then \
(rm -f $(DESTDIR)$(libdir)/libCLHEP.a); fi; \
(cd $(DESTDIR)$(libdir) && $(LN_S) libCLHEP-@VERSION@.a libCLHEP.a ); \
(cd $(DESTDIR)$(libdir) && $(MAKE_STATIC_CLHEP) ); \
else :; fi; \
done
@$(NORMAL_INSTALL)
......@@ -97,7 +105,7 @@ install-CLHEPLIB: $(CLHEPLIB) $(lib_shared)
if test -f $$p; then \
if test -f $(DESTDIR)$(libdir)/libCLHEP.a; then \
(rm -f $(DESTDIR)$(libdir)/libCLHEP.$(SHEXT)); fi; \
(cd $(DESTDIR)$(libdir) && $(LN_S) libCLHEP-@VERSION@.$(SHEXT) libCLHEP.$(SHEXT) ); \
(cd $(DESTDIR)$(libdir) && $(MAKE_SHARED_CLHEP) ); \
else :; fi; \
done
......
......@@ -232,6 +232,8 @@ cl)
build_static="no"
build_shared="yes"
build_visual="yes"
CXXFLAGS=" "
AC_SUBST(CXXFLAGS)
;;
CC)
case "$target" in
......
......@@ -231,6 +231,8 @@ cl)
build_static="no"
build_shared="yes"
build_visual="yes"
CXXFLAGS=" "
AC_SUBST(CXXFLAGS)
;;
CC)
case "$target" in
......
......@@ -224,6 +224,8 @@ cl)
build_static="no"
build_shared="yes"
build_visual="yes"
CXXFLAGS=" "
AC_SUBST(CXXFLAGS)
;;
CC)
case "$target" in
......
......@@ -219,6 +219,8 @@ cl)
build_static="no"
build_shared="yes"
build_visual="yes"
CXXFLAGS=" "
AC_SUBST(CXXFLAGS)
;;
CC)
case "$target" in
......
......@@ -235,6 +235,8 @@ cl)
build_static="no"
build_shared="yes"
build_visual="yes"
CXXFLAGS=" "
AC_SUBST(CXXFLAGS)
;;
CC)
case "$target" in
......
......@@ -223,6 +223,8 @@ cl)
build_static="no"
build_shared="yes"
build_visual="yes"
CXXFLAGS=" "
AC_SUBST(CXXFLAGS)
;;
CC)
case "$target" in
......
......@@ -235,6 +235,8 @@ cl)
build_shared="yes"
build_visual="yes"
AC_DEFINE([USING_VISUAL], [TRUE], [building with Visual C++])
CXXFLAGS=" "
AC_SUBST(CXXFLAGS)
;;
CC)
case "$target" in
......
......@@ -181,6 +181,8 @@ cl)
build_static="no"
build_shared="yes"
build_visual="yes"
CXXFLAGS=" "
AC_SUBST(CXXFLAGS)
;;
CC)
case "$target" in
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment