Skip to content

GitLab

Commit 1672152f authored by Lynn Garren's avatar Lynn Garren
Browse files

force Solaris to use gmake

parent af93247e
Hide whitespace changes
Inline Side-by-side
Cast/Cast/Makefile.am
View file @ 1672152f
## Process this file with automake to produce Makefile.in
if USE_GMAKE
MAKE = gmake
endif
includedir = $(prefix)/include/CLHEP
tempincludedir = $(TEMPDIR)/CLHEP/@PACKAGE@
COPY_P = @COPY_P@
......
Cast/Makefile.am
View file @ 1672152f
## Process this file with automake to produce Makefile.in
if USE_GMAKE
MAKE = gmake
endif
includedir = $(prefix)/include/CLHEP
# put . first so that CLHEP directory is built before anything else
......
Cast/configure.in
View file @ 1672152f
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Cast, 1.9.1.2, CLHEP@cern.ch, Cast)
AC_INIT(CLHEP Cast, 1.9.2.0, CLHEP@cern.ch, Cast)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/itos.cc])
......@@ -40,6 +40,15 @@ AC_ARG_ENABLE(static,
esac],
[build_static="yes"])
AC_ARG_ENABLE(gmake,
AC_HELP_STRING([--enable-gmake],[use gmake (default is make)]),
[case "${enableval}" in
yes) use_gmake="yes";;
no) use_gmake="no";;
*) use_gmake="no";;
esac],
[use_gmake="no"])
# ----------------------------------------------------------------------
# Identify the files that 'configure' is to produce:
# ----------------------------------------------------------------------
......@@ -145,6 +154,7 @@ case "$target" in
;;
*-*-solaris*)
COPY_P="cp -p";DIFF_Q="diff -b"
use_gmake="yes"
;;
*-*-linux*)
COPY_P="cp -p";DIFF_Q="diff -q -b"
......@@ -153,6 +163,8 @@ case "$target" in
COPY_P="cp -p";DIFF_Q="diff -q -b"
esac
AM_CONDITIONAL(USE_GMAKE, test x$use_gmake = xyes)
AC_SUBST(COPY_P)
AC_SUBST(DIFF_Q)
......
Cast/src/Makefile.am
View file @ 1672152f
## Process this file with automake to produce Makefile.in
if USE_GMAKE
MAKE = gmake
endif
INCLUDES = -I$(top_builddir)
libCLHEP_Cast_@VERSION@_a_SOURCES = \
......
Evaluator/Evaluator/Makefile.am
View file @ 1672152f
## Process this file with automake to produce Makefile.in
if USE_GMAKE
MAKE = gmake
endif
includedir = $(prefix)/include/CLHEP
tempincludedir = $(TEMPDIR)/CLHEP/@PACKAGE@
COPY_P = @COPY_P@
......
Evaluator/Makefile.am
View file @ 1672152f
## Process this file with automake to produce Makefile.in
if USE_GMAKE
MAKE = gmake
endif
includedir = $(prefix)/include/CLHEP
# put . first so that CLHEP directory is built before anything else
......
Evaluator/configure.in
View file @ 1672152f
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Evaluator, 1.9.1.2, CLHEP@cern.ch, Evaluator)
AC_INIT(CLHEP Evaluator, 1.9.2.0, CLHEP@cern.ch, Evaluator)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/Evaluator.cc])
......@@ -40,6 +40,15 @@ AC_ARG_ENABLE(static,
esac],
[build_static="yes"])
AC_ARG_ENABLE(gmake,
AC_HELP_STRING([--enable-gmake],[use gmake (default is make)]),
[case "${enableval}" in
yes) use_gmake="yes";;
no) use_gmake="no";;
*) use_gmake="no";;
esac],
[use_gmake="no"])
# ----------------------------------------------------------------------
# Identify the files that 'configure' is to produce:
# ----------------------------------------------------------------------
......@@ -147,6 +156,7 @@ case "$target" in
;;
*-*-solaris*)
COPY_P="cp -p";DIFF_Q="diff -b"
use_gmake="yes"
;;
*-*-linux*)
COPY_P="cp -p";DIFF_Q="diff -q -b"
......@@ -155,6 +165,8 @@ case "$target" in
COPY_P="cp -p";DIFF_Q="diff -q -b"
esac
AM_CONDITIONAL(USE_GMAKE, test x$use_gmake = xyes)
AC_SUBST(COPY_P)
AC_SUBST(DIFF_Q)
......
Evaluator/src/Makefile.am
View file @ 1672152f
## Process this file with automake to produce Makefile.in
if USE_GMAKE
MAKE = gmake
endif
INCLUDES = -I$(top_builddir)
libCLHEP_Evaluator_@VERSION@_a_SOURCES = \
......
Evaluator/test/Makefile.am
View file @ 1672152f
# Applicable to each test program:
if USE_GMAKE
MAKE = gmake
endif
INCLUDES = -I$(top_builddir)/
# libraries to link, and whence
......
Exceptions/Exceptions/Makefile.am
View file @ 1672152f
## Process this file with automake to produce Makefile.in
if USE_GMAKE
MAKE = gmake
endif
includedir = $(prefix)/include/CLHEP
tempincludedir = $(TEMPDIR)/CLHEP/@PACKAGE@
COPY_P = @COPY_P@
......
Exceptions/Makefile.am
View file @ 1672152f
## Process this file with automake to produce Makefile.in
if USE_GMAKE
MAKE = gmake
endif
includedir = $(prefix)/include/CLHEP
# put . first so that CLHEP directory is built before anything else
......
Exceptions/configure.in
View file @ 1672152f
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Exceptions, 1.9.1.2, CLHEP@cern.ch, Exceptions)
AC_INIT(CLHEP Exceptions, 1.9.2.0, CLHEP@cern.ch, Exceptions)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/ZMerrno.cc])
......@@ -40,6 +40,15 @@ AC_ARG_ENABLE(static,
esac],
[build_static="yes"])
AC_ARG_ENABLE(gmake,
AC_HELP_STRING([--enable-gmake],[use gmake (default is make)]),
[case "${enableval}" in
yes) use_gmake="yes";;
no) use_gmake="no";;
*) use_gmake="no";;
esac],
[use_gmake="no"])
# ----------------------------------------------------------------------
# Identify the files that 'configure' is to produce:
# ----------------------------------------------------------------------
......@@ -155,6 +164,7 @@ case "$target" in
;;
*-*-solaris*)
COPY_P="cp -p";DIFF_Q="diff -b"
use_gmake="yes"
;;
*-*-linux*)
COPY_P="cp -p";DIFF_Q="diff -q -b"
......@@ -163,6 +173,8 @@ case "$target" in
COPY_P="cp -p";DIFF_Q="diff -q -b"
esac
AM_CONDITIONAL(USE_GMAKE, test x$use_gmake = xyes)
AC_SUBST(COPY_P)
AC_SUBST(DIFF_Q)
......
Exceptions/doc/Makefile.am
View file @ 1672152f
## Process this file with automake to produce Makefile.in
if USE_GMAKE
MAKE = gmake
endif
TEX = latex
doc_srcdir = $(top_srcdir)/doc
doc_builddir = $(top_builddir)/doc
......
Exceptions/src/Makefile.am
View file @ 1672152f
## Process this file with automake to produce Makefile.in
if USE_GMAKE
MAKE = gmake
endif
INCLUDES = -I$(top_builddir)
libCLHEP_Exceptions_@VERSION@_a_SOURCES = \
......
Exceptions/test/Makefile.am
View file @ 1672152f
# Applicable to each test program:
if USE_GMAKE
MAKE = gmake
endif
INCLUDES = -I$(top_builddir)/
# libraries to link, and whence
......
GenericFunctions/GenericFunctions/Makefile.am
View file @ 1672152f
## Process this file with automake to produce Makefile.in
if USE_GMAKE
MAKE = gmake
endif
includedir = $(prefix)/include/CLHEP
tempincludedir = $(TEMPDIR)/CLHEP/@PACKAGE@
COPY_P = @COPY_P@
......
GenericFunctions/Makefile.am
View file @ 1672152f
## Process this file with automake to produce Makefile.in
if USE_GMAKE
MAKE = gmake
endif
includedir = $(prefix)/include/CLHEP
# put . first so that CLHEP directory is built before anything else
......
GenericFunctions/configure.in
View file @ 1672152f
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP GenericFunctions, 1.9.1.2, CLHEP@cern.ch, GenericFunctions)
AC_INIT(CLHEP GenericFunctions, 1.9.2.0, CLHEP@cern.ch, GenericFunctions)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/Abs.cc])
......@@ -40,6 +40,15 @@ AC_ARG_ENABLE(static,
esac],
[build_static="yes"])
AC_ARG_ENABLE(gmake,
AC_HELP_STRING([--enable-gmake],[use gmake (default is make)]),
[case "${enableval}" in
yes) use_gmake="yes";;
no) use_gmake="no";;
*) use_gmake="no";;
esac],
[use_gmake="no"])
# ----------------------------------------------------------------------
# Identify the files that 'configure' is to produce:
# ----------------------------------------------------------------------
......@@ -159,6 +168,7 @@ case "$target" in
;;
*-*-solaris*)
COPY_P="cp -p";DIFF_Q="diff -b"
use_gmake="yes"
;;
*-*-linux*)
COPY_P="cp -p";DIFF_Q="diff -q -b"
......@@ -167,6 +177,8 @@ case "$target" in
COPY_P="cp -p";DIFF_Q="diff -q -b"
esac
AM_CONDITIONAL(USE_GMAKE, test x$use_gmake = xyes)
AC_SUBST(COPY_P)
AC_SUBST(DIFF_Q)
......
GenericFunctions/doc/Makefile.am
View file @ 1672152f
## Process this file with automake to produce Makefile.in
if USE_GMAKE
MAKE = gmake
endif
TEX = latex
doc_srcdir = $(top_srcdir)/doc
doc_builddir = $(top_builddir)/doc
......
GenericFunctions/src/Makefile.am
View file @ 1672152f
## Process this file with automake to produce Makefile.in
if USE_GMAKE
MAKE = gmake
endif
INCLUDES = -I$(top_builddir)
libCLHEP_GenericFunctions_@VERSION@_a_SOURCES = \
......
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