Commit 23480b1e authored by Lynn Garren's avatar Lynn Garren
Browse files

fix for Visual C++

parent 148cb0f2
2008-05-01 Lynn Garren <garren@fnal.gov>
* */test/Makefile.am: use "/Fo$@" instead of "-o $@" for Visual C++
2008-04-30 Lynn Garren <garren@fnal.gov>
* configure.in: VC++ compiler flag -GX is replaced by -EHsc
icc compiler flag -mp is replaced by -fp-model precise
remove KCC from list of C++ compilers
2008-04-29 Lynn Garren <garren@fnal.gov>
* Units/PhysicalConstants.h: update h_Planck, electron_mass_c2,
proton_mass_c2, neutron_mass_c2, and amu_c2 to PDG 2006 values
* Units/SystemOfUnits.h: update e_SI to PDG 2006 value
==============================
18.10.07 Release CLHEP-2.0.3.2
==============================
......
......@@ -8,15 +8,23 @@ INCLUDES = -I$(top_builddir)/
# libraries to link, and whence
if BUILD_STATIC
LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.a
OUTFLAG = -o $@
else
if BUILD_VISUAL
LDADD = $(top_builddir)/src/CLHEP-@PACKAGE@-@VERSION@.$(SHEXT)
OUTFLAG = /Fo$@
else
LIBS += $(MY_LD)$(top_builddir)/src
LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.$(SHEXT)
OUTFLAG = -o $@
endif
endif
# normally, CXXLINK is supplied by automake, but we need to use /Fo instead
# of -o when compiling with Visual C++
CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
$(OUTFLAG)
# Identify executables needed during testing:
check_PROGRAMS = \
testEvaluator
......@@ -40,3 +48,19 @@ EXTRA_DIST = \
# Identify generated file(s) to be removed when 'make clean' is requested:
CLEANFILES =
# supply our own suffix rule
.cc.obj:
if BUILD_VISUAL
# $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c $(OUTFLAG) `$(CYGPATH_W) '$<'`
# mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
source='$<' object='$@' libtool=no \
DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
$(CXXCOMPILE) -c $(OUTFLAG) `$(CYGPATH_W) '$<'`
else
if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c $(OUTFLAG) `$(CYGPATH_W) '$<'`; \
then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
# source='$<' object='$@' libtool=no \
# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
# $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
endif
......@@ -11,11 +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
OUTFLAG = -o $@
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)
OUTFLAG = /Fo$@
else
LIBS += $(MY_LD)$(top_builddir)/src \
$(MY_LD)${top_builddir}/../Cast/src \
......@@ -23,9 +25,15 @@ else
LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.$(SHEXT) \
${top_builddir}/../Cast/src/libCLHEP-Cast-@VERSION@.$(SHEXT) \
${top_builddir}/../RefCount/src/libCLHEP-RefCount-@VERSION@.$(SHEXT)
OUTFLAG = -o $@
endif
endif
# normally, CXXLINK is supplied by automake, but we need to use /Fo instead
# of -o when compiling with Visual C++
CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
$(OUTFLAG)
# Identify executables needed during testing:
check_PROGRAMS = \
testExceptions \
......@@ -97,3 +105,19 @@ CLEANFILES = \
exctestNothrow.sh \
excDblThrow.sh
# supply our own suffix rule
.cc.obj:
if BUILD_VISUAL
# $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c $(OUTFLAG) `$(CYGPATH_W) '$<'`
# mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
source='$<' object='$@' libtool=no \
DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
$(CXXCOMPILE) -c $(OUTFLAG) `$(CYGPATH_W) '$<'`
else
if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c $(OUTFLAG) `$(CYGPATH_W) '$<'`; \
then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
# source='$<' object='$@' libtool=no \
# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
# $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
endif
......@@ -8,15 +8,23 @@ INCLUDES = -I$(top_builddir)/
# libraries to link, and whence
if BUILD_STATIC
LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.a
OUTFLAG = -o $@
else
if BUILD_VISUAL
LDADD = $(top_builddir)/src/CLHEP-@PACKAGE@-@VERSION@.$(SHEXT)
OUTFLAG = /Fo$@
else
LIBS += $(MY_LD)$(top_builddir)/src
LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.$(SHEXT)
OUTFLAG = -o $@
endif
endif
# normally, CXXLINK is supplied by automake, but we need to use /Fo instead
# of -o when compiling with Visual C++
CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
$(OUTFLAG)
# Identify executables needed during testing:
check_PROGRAMS = \
testGenericFunctions
......@@ -40,3 +48,19 @@ EXTRA_DIST = \
# Identify generated file(s) to be removed when 'make clean' is requested:
CLEANFILES =
# supply our own suffix rule
.cc.obj:
if BUILD_VISUAL
# $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c $(OUTFLAG) `$(CYGPATH_W) '$<'`
# mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
source='$<' object='$@' libtool=no \
DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
$(CXXCOMPILE) -c $(OUTFLAG) `$(CYGPATH_W) '$<'`
else
if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c $(OUTFLAG) `$(CYGPATH_W) '$<'`; \
then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
# source='$<' object='$@' libtool=no \
# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
# $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
endif
......@@ -8,18 +8,26 @@ INCLUDES = -I$(top_builddir)/
if BUILD_STATIC
LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.a \
${top_builddir}/../Vector/src/libCLHEP-Vector-@VERSION@.a
OUTFLAG = -o $@
else
if BUILD_VISUAL
LDADD = $(top_builddir)/src/CLHEP-@PACKAGE@-@VERSION@.$(SHEXT) \
${top_builddir}/../Vector/src/CLHEP-Vector-@VERSION@.$(SHEXT)
OUTFLAG = /Fo$@
else
LIBS += $(MY_LD)$(top_builddir)/src \
$(MY_LD)${top_builddir}/../Vector/src
LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.$(SHEXT) \
${top_builddir}/../Vector/src/libCLHEP-Vector-@VERSION@.$(SHEXT)
OUTFLAG = -o $@
endif
endif
# normally, CXXLINK is supplied by automake, but we need to use /Fo instead
# of -o when compiling with Visual C++
CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
$(OUTFLAG)
# Identify executables needed during testing:
check_PROGRAMS = \
testBasicVector3D \
......@@ -49,3 +57,19 @@ EXTRA_DIST = \
# Identify generated file(s) to be removed when 'make clean' is requested:
CLEANFILES = \
testBug6740.sh
# supply our own suffix rule
.cc.obj:
if BUILD_VISUAL
# $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c $(OUTFLAG) `$(CYGPATH_W) '$<'`
# mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
source='$<' object='$@' libtool=no \
DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
$(CXXCOMPILE) -c $(OUTFLAG) `$(CYGPATH_W) '$<'`
else
if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c $(OUTFLAG) `$(CYGPATH_W) '$<'`; \
then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
# source='$<' object='$@' libtool=no \
# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
# $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
endif
......@@ -9,18 +9,26 @@ INCLUDES = -I$(top_builddir)/
if BUILD_STATIC
LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.a \
$(top_builddir)/../Vector/src/libCLHEP-Vector-@VERSION@.a
OUTFLAG = -o $@
else
if BUILD_VISUAL
LDADD = $(top_builddir)/src/CLHEP-@PACKAGE@-@VERSION@.$(SHEXT) \
$(top_builddir)/../Vector/src/CLHEP-Vector-@VERSION@.$(SHEXT)
OUTFLAG = /Fo$@
else
LIBS += $(MY_LD)$(top_builddir)/src \
$(MY_LD)$(top_builddir)/../Vector/src
LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.$(SHEXT) \
$(top_builddir)/../Vector/src/libCLHEP-Vector-@VERSION@.$(SHEXT)
OUTFLAG = -o $@
endif
endif
# normally, CXXLINK is supplied by automake, but we need to use /Fo instead
# of -o when compiling with Visual C++
CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
$(OUTFLAG)
# Identify executables needed during testing:
check_PROGRAMS = \
testDoubleConversion testRandomState testPrintBug
......@@ -44,3 +52,19 @@ EXTRA_DIST = testPrintBug.output
# Identify generated file(s) to be removed when 'make clean' is requested:
CLEANFILES =
# supply our own suffix rule
.cc.obj:
if BUILD_VISUAL
# $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c $(OUTFLAG) `$(CYGPATH_W) '$<'`
# mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
source='$<' object='$@' libtool=no \
DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
$(CXXCOMPILE) -c $(OUTFLAG) `$(CYGPATH_W) '$<'`
else
if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c $(OUTFLAG) `$(CYGPATH_W) '$<'`; \
then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
# source='$<' object='$@' libtool=no \
# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
# $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
endif
......@@ -8,15 +8,23 @@ INCLUDES = -I$(top_builddir)/
# libraries to link, and whence
if BUILD_STATIC
LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.a
OUTFLAG = -o $@
else
if BUILD_VISUAL
LDADD = $(top_builddir)/src/CLHEP-@PACKAGE@-@VERSION@.$(SHEXT)
OUTFLAG = /Fo$@
else
LIBS += $(MY_LD)$(top_builddir)/src
LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.$(SHEXT)
OUTFLAG = -o $@
endif
endif
# normally, CXXLINK is supplied by automake, but we need to use /Fo instead
# of -o when compiling with Visual C++
CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
$(OUTFLAG)
# Identify executables needed during testing:
check_PROGRAMS = \
testPID testHepPDT listQQTranslation listParticleNames \
......@@ -58,3 +66,19 @@ EXTRA_DIST = \
# Identify generated file(s) to be removed when 'make clean' is requested:
CLEANFILES =
# supply our own suffix rule
.cc.obj:
if BUILD_VISUAL
# $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c $(OUTFLAG) `$(CYGPATH_W) '$<'`
# mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
source='$<' object='$@' libtool=no \
DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
$(CXXCOMPILE) -c $(OUTFLAG) `$(CYGPATH_W) '$<'`
else
if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c $(OUTFLAG) `$(CYGPATH_W) '$<'`; \
then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
# source='$<' object='$@' libtool=no \
# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
# $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
endif
......@@ -10,11 +10,13 @@ if BUILD_STATIC
LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.a \
${top_builddir}/../Random/src/libCLHEP-Random-@VERSION@.a \
${top_builddir}/../Vector/src/libCLHEP-Vector-@VERSION@.a
OUTFLAG = -o $@
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)
OUTFLAG = /Fo$@
else
LIBS += $(MY_LD)$(top_builddir)/src \
$(MY_LD)${top_builddir}/../Random/src \
......@@ -22,12 +24,18 @@ else
LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.$(SHEXT) \
${top_builddir}/../Random/src/libCLHEP-Random-@VERSION@.$(SHEXT) \
${top_builddir}/../Vector/src/libCLHEP-Vector-@VERSION@.$(SHEXT)
OUTFLAG = -o $@
endif
endif
# add -D needed by testInversion
CXXFLAGS = @CXXFLAGS@ -DINSTALLATION_CHECK
# normally, CXXLINK is supplied by automake, but we need to use /Fo instead
# of -o when compiling with Visual C++
CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
$(OUTFLAG)
# Identify executables needed during testing:
check_PROGRAMS = \
testMatrix testInversion \
......@@ -67,3 +75,19 @@ EXTRA_DIST = \
CLEANFILES = testMatrix.sh testInversion.sh \
testBug6176.sh
# supply our own suffix rule
.cc.obj:
if BUILD_VISUAL
# $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c $(OUTFLAG) `$(CYGPATH_W) '$<'`
# mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
source='$<' object='$@' libtool=no \
DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
$(CXXCOMPILE) -c $(OUTFLAG) `$(CYGPATH_W) '$<'`
else
if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c $(OUTFLAG) `$(CYGPATH_W) '$<'`; \
then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
# source='$<' object='$@' libtool=no \
# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
# $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
endif
......@@ -9,15 +9,23 @@ INCLUDES = -I$(top_builddir)
# libraries to link, and whence
if BUILD_STATIC
LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.a
OUTFLAG = -o $@
else
if BUILD_VISUAL
LDADD = $(top_builddir)/src/CLHEP-@PACKAGE@-@VERSION@.$(SHEXT)
OUTFLAG = /Fo$@
else
LIBS += $(MY_LD)$(top_builddir)/src
LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.$(SHEXT)
OUTFLAG = -o $@
endif
endif
# normally, CXXLINK is supplied by automake, but we need to use /Fo instead
# of -o when compiling with Visual C++
CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
$(OUTFLAG)
# Identify executables needed during testing:
check_PROGRAMS = \
testRandom testRandDists gaussSpeed gaussSmall \
......@@ -61,3 +69,19 @@ CLEANFILES = testRandom.sh testRandDists.sh \
testSaveSharedEngines.cout testStaticStreamSave.cout \
testAnonymousEngineRestore.cout testVectorSave.cout \
anonymous.save
# supply our own suffix rule
.cc.obj:
if BUILD_VISUAL
# $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c $(OUTFLAG) `$(CYGPATH_W) '$<'`
# mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
source='$<' object='$@' libtool=no \
DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
$(CXXCOMPILE) -c $(OUTFLAG) `$(CYGPATH_W) '$<'`
else
if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c $(OUTFLAG) `$(CYGPATH_W) '$<'`; \
then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
# source='$<' object='$@' libtool=no \
# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
# $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
endif
......@@ -11,12 +11,14 @@ if BUILD_STATIC
${top_builddir}/../Random/src/libCLHEP-Random-@VERSION@.a \
${top_builddir}/../Matrix/src/libCLHEP-Matrix-@VERSION@.a \
${top_builddir}/../Vector/src/libCLHEP-Vector-@VERSION@.a
OUTFLAG = -o $@
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)
OUTFLAG = /Fo$@
else
LIBS += $(MY_LD)$(top_builddir)/src \
$(MY_LD)${top_builddir}/../Random/src \
......@@ -26,9 +28,15 @@ else
${top_builddir}/../Random/src/libCLHEP-Random-@VERSION@.$(SHEXT) \
${top_builddir}/../Matrix/src/libCLHEP-Matrix-@VERSION@.$(SHEXT) \
${top_builddir}/../Vector/src/libCLHEP-Vector-@VERSION@.$(SHEXT)
OUTFLAG = -o $@
endif
endif
# normally, CXXLINK is supplied by automake, but we need to use /Fo instead
# of -o when compiling with Visual C++
CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
$(OUTFLAG)
# Identify executables needed during testing:
check_PROGRAMS = \
testVectorDists
......@@ -52,3 +60,19 @@ EXTRA_DIST = \
# Identify generated file(s) to be removed when 'make clean' is requested:
CLEANFILES = testVectorDists.sh
# supply our own suffix rule
.cc.obj:
if BUILD_VISUAL
# $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c $(OUTFLAG) `$(CYGPATH_W) '$<'`
# mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
source='$<' object='$@' libtool=no \
DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
$(CXXCOMPILE) -c $(OUTFLAG) `$(CYGPATH_W) '$<'`
else
if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c $(OUTFLAG) `$(CYGPATH_W) '$<'`; \
then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
# source='$<' object='$@' libtool=no \
# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
# $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
endif
......@@ -10,11 +10,13 @@ if BUILD_STATIC
LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.a \
$(top_builddir)/../HepMC/src/libCLHEP-HepMC-@VERSION@.a \
$(top_builddir)/../Vector/src/libCLHEP-Vector-@VERSION@.a
OUTFLAG = -o $@
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)
OUTFLAG = /Fo$@
else
LIBS += $(MY_LD)$(top_builddir)/src \
$(MY_LD)$(top_builddir)/../HepMC/src \
......@@ -22,9 +24,15 @@ else
LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.$(SHEXT) \
$(top_builddir)/../HepMC/src/libCLHEP-HepMC-@VERSION@.$(SHEXT) \
$(top_builddir)/../Vector/src/libCLHEP-Vector-@VERSION@.$(SHEXT)
OUTFLAG = -o $@
endif
endif
# normally, CXXLINK is supplied by automake, but we need to use /Fo instead
# of -o when compiling with Visual C++
CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
$(OUTFLAG)
# Identify executables needed during testing:
check_PROGRAMS = \
testStdHepRandomState
......@@ -46,3 +54,19 @@ testStdHepRandomState_SOURCES = testStdHepRandomState.cc SimpleRand.cc
# Identify generated file(s) to be removed when 'make clean' is requested:
CLEANFILES =
# supply our own suffix rule
.cc.obj:
if BUILD_VISUAL
# $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c $(OUTFLAG) `$(CYGPATH_W) '$<'`
# mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
source='$<' object='$@' libtool=no \
DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
$(CXXCOMPILE) -c $(OUTFLAG) `$(CYGPATH_W) '$<'`
else
if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c $(OUTFLAG) `$(CYGPATH_W) '$<'`; \
then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
# source='$<' object='$@' libtool=no \
# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
# $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
endif
......@@ -6,6 +6,17 @@ endif
INCLUDES = -I../
LDADD = @Units_LDFLAGS@ @Units_LIBS@ # libraries to link, and whence
if BUILD_VISUAL
OUTFLAG = /Fo$@
else
OUTFLAG = -o $@
endif
# normally, CXXLINK is supplied by automake, but we need to use /Fo instead
# of -o when compiling with Visual C++
CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
$(OUTFLAG)
# Identify executables needed during testing:
check_PROGRAMS = \
testUnits
......@@ -29,3 +40,19 @@ EXTRA_DIST = \
# Identify generated file(s) to be removed when 'make clean' is requested:
CLEANFILES =
# supply our own suffix rule
.cc.obj:
if BUILD_VISUAL
# $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c $(OUTFLAG) `$(CYGPATH_W) '$<'`
# mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
source='$<' object='$@' libtool=no \
DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
$(CXXCOMPILE) -c $(OUTFLAG) `$(CYGPATH_W) '$<'`
else
if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c $(OUTFLAG) `$(CYGPATH_W) '$<'`; \
then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
# source='$<' object='$@' libtool=no \
# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
# $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
endif
......@@ -55,7 +55,6 @@ EXTRA_DIST = \
# Identify generated file(s) to be removed when 'make clean' is requested:
CLEANFILES = testThreeVector.sh testLorentzVector.sh testRotation.sh testSubscripts.sh
# supply our own suffix rule
.cc.obj:
if BUILD_VISUAL
......
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