Commit 931a0307 authored by Lynn Garren's avatar Lynn Garren
Browse files

copy headers instead of creating links

parent f3e74afa
## Process this file with automake to produce Makefile.in
includedir = $(prefix)/include/CLHEP
tempincludedir = $(TEMPDIR)/CLHEP/@PACKAGE@
COPY_P = @COPY_P@
pkginclude_HEADERS = \
itos.h \
......@@ -9,3 +11,16 @@ pkginclude_HEADERS = \
# Identify generated file(s) to be removed when 'make clean' is requested:
CLEANFILES = defs.h
# copy headers into $(tempincludedir)
install-tmpHEADERS:
@echo " install headers in $(TEMPDIR)/CLHEP "
@list='$(pkginclude_HEADERS)'; \
if test $(TEMPDIR); then \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
echo " $(COPY_P) $$d$$p $(tempincludedir)/$$f"; \
$(COPY_P) $$d$$p $(tempincludedir)/$$f; \
done; \
fi; test -z "$$fail"
......@@ -12,44 +12,48 @@ bin_SCRIPTS = Cast-config
all-local: $(top_builddir)/CLHEP
# create temporary CLHEP header tree
# we only copy headers for packages listed in @PACKAGE@-deps
# search for header directories in the following order:
# 1. $(top_srcdir)/..
# 2. $(CLHEPSOURCE_DIR)/CLHEP
# 3. $(CLHEP_DIR)/CLHEP
# 1. $(top_builddir)/this-package
# 2. $(top_builddir)/../other-packages
# 3. $(CLHEPSOURCE_DIR)/CLHEP
# 4. $(CLHEP_DIR)/include/CLHEP
#
# abs_ => absolute path
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
COPY_P = @COPY_P@
$(top_builddir)/CLHEP:
mkdir $(top_builddir)/CLHEP;
cd $(abs_top_builddir); list=`ls $(abs_top_srcdir)/..`; \
$(top_builddir)/CLHEP: temp-package-dirs
list="`cat @PACKAGE@-deps | sed s/CLHEP-@PACKAGE@-@VERSION@// | sed s/CLHEP-// | sed s/-@VERSION@//`"; \
for pkg in $$list; do \
if test -d $(abs_top_srcdir)/../"$$pkg"/"$$pkg"; then \
(cd $(abs_top_builddir)/CLHEP; mkdir $$pkg; cd $$pkg; \
hdrs=`ls $(abs_top_srcdir)/../$$pkg/$$pkg`; \
for hdr in $$hdrs; do $(LN_S) $(abs_top_srcdir)/../$$pkg/$$pkg/$$hdr $$hdr; done; \
if test -f $(abs_top_builddir)/../"$$pkg"/"$$pkg"/defs.h; then $(LN_S) $(abs_top_builddir)/../$$pkg/$$pkg/defs.h defs.h; fi; \
if test -f $(abs_top_builddir)/"$$pkg"/defs.h && test ! -e defs.h ; then $(LN_S) $(abs_top_builddir)/$$pkg/defs.h defs.h; fi); \
fi; done
cd $(abs_top_builddir); \
if test -n "$(CLHEPSOURCE_DIR)" && test -d $(CLHEPSOURCE_DIR)/CLHEP; then \
(list=`ls $(CLHEPSOURCE_DIR)/CLHEP`; \
for pkg in $$list; do cd $(abs_top_builddir)/CLHEP; \
if test -d $(CLHEPSOURCE_DIR)/CLHEP/"$$pkg"/"$$pkg" && test ! -d "$$pkg"; then \
(mkdir $$pkg; cd $$pkg; \
hdrs=`ls $(CLHEPSOURCE_DIR)/CLHEP/$$pkg/$$pkg`; \
for hdr in $$hdrs; do $(LN_S) $(CLHEPSOURCE_DIR)/CLHEP/$$pkg/$$pkg/$$hdr $$hdr; done); \
fi; done); fi
cd $(abs_top_builddir); \
if test -n "$(CLHEP_DIR)" && test -d $(CLHEP_DIR)/CLHEP; then \
(list=`ls $(CLHEP_DIR)/CLHEP`; \
for pkg in $$list; do cd $(abs_top_builddir)/CLHEP; \
if test -d $(CLHEP_DIR)/CLHEP/"$$pkg"/"$$pkg" && test ! -d "$$pkg"; then \
(mkdir $$pkg; cd $$pkg; \
hdrs=`ls $(CLHEP_DIR)/CLHEP/$$pkg/$$pkg`; \
for hdr in $$hdrs; do $(LN_S) $(CLHEP_DIR)/CLHEP/$$pkg/$$pkg/$$hdr $$hdr; done); \
fi; done); fi
if test -d "$$pkg" ; then \
(cd $$pkg && $(MAKE) $(AM_MAKEFLAGS) TEMPDIR=$(abs_top_builddir) install-tmpHEADERS) || exit 1 ; \
else \
if test -d ../"$$pkg"/"$$pkg" ; then \
(cd ../$$pkg/$$pkg && $(MAKE) $(AM_MAKEFLAGS) TEMPDIR=$(abs_top_builddir) install-tmpHEADERS) || exit 1 ; \
else \
if test -d $(CLHEPSOURCE_DIR)/CLHEP/"$$pkg"/"$$pkg"; then \
hdrs=`ls $(CLHEPSOURCE_DIR)/CLHEP/$$pkg/$$pkg`; \
for hdr in $$hdrs; do $(COPY_P) $(CLHEPSOURCE_DIR)/CLHEP/$$pkg/$$pkg/$$hdr $(abs_top_builddir)/CLHEP/$$pkg/$$hdr; done; \
else \
if test -n "$(CLHEP_DIR)" && test -d $(CLHEP_DIR)/include/CLHEP; then \
if test -d $(CLHEP_DIR)/include/CLHEP/"$$pkg"; then \
hdrs=`ls $(CLHEP_DIR)/include/CLHEP/$$pkg`; \
for hdr in $$hdrs; do $(COPY_P) $(CLHEP_DIR)/include/CLHEP/$$pkg/$$hdr $(abs_top_builddir)/CLHEP/$$pkg/$$hdr; done; \
fi; \
fi; \
fi; \
fi; \
fi; \
done;
temp-package-dirs:
$(mkinstalldirs) $(abs_top_builddir)/CLHEP;
list="`cat @PACKAGE@-deps | sed s/CLHEP-@PACKAGE@-@VERSION@// | sed s/CLHEP-// | sed s/-@VERSION@//`"; \
for pkg in $$list; do \
$(mkinstalldirs) $(abs_top_builddir)/CLHEP/$$pkg; \
done;
docs:
cd doc; $(MAKE) $(AM_MAKEFLAGS)
......
......@@ -50,6 +50,7 @@ AC_SUBST(Cast_CPPFLAGS)
AC_SUBST(Cast_LIBS)
AC_SUBST(Cast_LDFLAGS)
AC_SUBST(COPY_P)
# ----------------------------------------------------------------------
# Supply boilerplate for Cast/defs.h source header:
......@@ -106,7 +107,7 @@ AH_BOTTOM([#endif // CAST_DEFS_H])
# ----------------------------------------------------------------------
# Locate a C++ compiler:
AC_PROG_CXX(g++ c++ aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC gpp)
AC_PROG_CXX(cl g++ c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
# Use it hereinafter:
AC_LANG(C++)
......@@ -118,69 +119,68 @@ AC_REQUIRE_CPP
case "$target" in
*-*-win32*)
case "$CXX" in
cl) CXXFLAGS="-DWIN32 -O -GX -GR -MD";;
g++) CXXFLAGS="-O";;
c++) CXXFLAGS="-O";;
cl) CXXFLAGS="-DWIN32 -O -GX -GR -MD";COPY_P="copy -p";;
g++) CXXFLAGS="-O";COPY_P="copy -p";;
c++) CXXFLAGS="-O";COPY_P="copy -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
*-*-cygwin*)
case "$CXX" in
cl) CXXFLAGS="-DWIN32 -O -GX -GR -MD";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";;
cl) CXXFLAGS="-DWIN32 -O -GX -GR -MD";COPY_P="cp -p";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
*-*-solaris*)
case "$CXX" in
CC) CXXFLAGS="-O -mt";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";;
CC) CXXFLAGS="-O -mt";COPY_P="cp -p";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
*-*-linux*)
case "$CXX" in
g++) CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE";COPY_P="cp -p";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE";COPY_P="cp -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
alpha*-dec-osf*)
case "$CXX" in
cxx) CXXFLAGS="-O -std strict_ansi -timplicit_local";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";;
cxx) CXXFLAGS="-O -std strict_ansi -timplicit_local";COPY_P="cp -p";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
*-*-hpux*)
case "$CXX" in
aCC) CXXFLAGS="-O -Aa +DAportable +Onolimit";;
CC) CXXFLAGS="+O3 +DAportable +a1 -z -pta +Onolimit";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";;
aCC) CXXFLAGS="-O -Aa +DAportable +Onolimit";COPY_P="cp -p";;
CC) CXXFLAGS="+O3 +DAportable +a1 -z -pta +Onolimit";COPY_P="cp -p";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
*-*-aix*)
case "$CXX" in
xlC) CXXFLAGS="-O3 -qtwolink -+";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";;
xlC) CXXFLAGS="-O3 -qtwolink -+";COPY_P="cp -p";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
*-*-irix*)
case "$CXX" in
CC) CXXFLAGS="-O -OPT:Olimit=0 -pta";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";;
CC) CXXFLAGS="-O -OPT:Olimit=0 -pta";COPY_P="cp -p";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
powerpc-apple-darwin*)
case "$CXX" in
g++) CXXFLAGS="-O -ansi -pedantic -Wall";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
esac
# ----------------------------------------------------------------------
# Set system-dependent options:
# ----------------------------------------------------------------------
......
## Process this file with automake to produce Makefile.in
includedir = $(prefix)/include/CLHEP
tempincludedir = $(TEMPDIR)/CLHEP/@PACKAGE@
COPY_P = @COPY_P@
pkginclude_HEADERS = \
Evaluator.h \
......@@ -8,3 +10,16 @@ pkginclude_HEADERS = \
# Identify generated file(s) to be removed when 'make clean' is requested:
CLEANFILES = defs.h
# copy headers into $(tempincludedir)
install-tmpHEADERS:
@echo " install headers in $(TEMPDIR)/CLHEP "
@list='$(pkginclude_HEADERS)'; \
if test $(TEMPDIR); then \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
echo " $(COPY_P) $$d$$p $(tempincludedir)/$$f"; \
$(COPY_P) $$d$$p $(tempincludedir)/$$f; \
done; \
fi; test -z "$$fail"
......@@ -8,44 +8,48 @@ SUBDIRS = Evaluator . src test
all-local: $(top_builddir)/CLHEP
# create temporary CLHEP header tree
# we only copy headers for packages listed in @PACKAGE@-deps
# search for header directories in the following order:
# 1. $(top_srcdir)/..
# 2. $(CLHEPSOURCE_DIR)/CLHEP
# 3. $(CLHEP_DIR)/CLHEP
# 1. $(top_builddir)/this-package
# 2. $(top_builddir)/../other-packages
# 3. $(CLHEPSOURCE_DIR)/CLHEP
# 4. $(CLHEP_DIR)/include/CLHEP
#
# abs_ => absolute path
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
COPY_P = @COPY_P@
$(top_builddir)/CLHEP:
mkdir $(top_builddir)/CLHEP;
cd $(abs_top_builddir); list=`ls $(abs_top_srcdir)/..`; \
$(top_builddir)/CLHEP: temp-package-dirs
list="`cat @PACKAGE@-deps | sed s/CLHEP-@PACKAGE@-@VERSION@// | sed s/CLHEP-// | sed s/-@VERSION@//`"; \
for pkg in $$list; do \
if test -d $(abs_top_srcdir)/../"$$pkg"/"$$pkg"; then \
(cd $(abs_top_builddir)/CLHEP; mkdir $$pkg; cd $$pkg; \
hdrs=`ls $(abs_top_srcdir)/../$$pkg/$$pkg`; \
for hdr in $$hdrs; do $(LN_S) $(abs_top_srcdir)/../$$pkg/$$pkg/$$hdr $$hdr; done; \
if test -f $(abs_top_builddir)/../"$$pkg"/"$$pkg"/defs.h; then $(LN_S) $(abs_top_builddir)/../$$pkg/$$pkg/defs.h defs.h; fi; \
if test -f $(abs_top_builddir)/"$$pkg"/defs.h && test ! -e defs.h ; then $(LN_S) $(abs_top_builddir)/$$pkg/defs.h defs.h; fi); \
fi; done
cd $(abs_top_builddir); \
if test -n "$(CLHEPSOURCE_DIR)" && test -d $(CLHEPSOURCE_DIR)/CLHEP; then \
(list=`ls $(CLHEPSOURCE_DIR)/CLHEP`; \
for pkg in $$list; do cd $(abs_top_builddir)/CLHEP; \
if test -d $(CLHEPSOURCE_DIR)/CLHEP/"$$pkg"/"$$pkg" && test ! -d "$$pkg"; then \
(mkdir $$pkg; cd $$pkg; \
hdrs=`ls $(CLHEPSOURCE_DIR)/CLHEP/$$pkg/$$pkg`; \
for hdr in $$hdrs; do $(LN_S) $(CLHEPSOURCE_DIR)/CLHEP/$$pkg/$$pkg/$$hdr $$hdr; done); \
fi; done); fi
cd $(abs_top_builddir); \
if test -n "$(CLHEP_DIR)" && test -d $(CLHEP_DIR)/CLHEP; then \
(list=`ls $(CLHEP_DIR)/CLHEP`; \
for pkg in $$list; do cd $(abs_top_builddir)/CLHEP; \
if test -d $(CLHEP_DIR)/CLHEP/"$$pkg"/"$$pkg" && test ! -d "$$pkg"; then \
(mkdir $$pkg; cd $$pkg; \
hdrs=`ls $(CLHEP_DIR)/CLHEP/$$pkg/$$pkg`; \
for hdr in $$hdrs; do $(LN_S) $(CLHEP_DIR)/CLHEP/$$pkg/$$pkg/$$hdr $$hdr; done); \
fi; done); fi
if test -d "$$pkg" ; then \
(cd $$pkg && $(MAKE) $(AM_MAKEFLAGS) TEMPDIR=$(abs_top_builddir) install-tmpHEADERS) || exit 1 ; \
else \
if test -d ../"$$pkg"/"$$pkg" ; then \
(cd ../$$pkg/$$pkg && $(MAKE) $(AM_MAKEFLAGS) TEMPDIR=$(abs_top_builddir) install-tmpHEADERS) || exit 1 ; \
else \
if test -d $(CLHEPSOURCE_DIR)/CLHEP/"$$pkg"/"$$pkg"; then \
hdrs=`ls $(CLHEPSOURCE_DIR)/CLHEP/$$pkg/$$pkg`; \
for hdr in $$hdrs; do $(COPY_P) $(CLHEPSOURCE_DIR)/CLHEP/$$pkg/$$pkg/$$hdr $(abs_top_builddir)/CLHEP/$$pkg/$$hdr; done; \
else \
if test -n "$(CLHEP_DIR)" && test -d $(CLHEP_DIR)/include/CLHEP; then \
if test -d $(CLHEP_DIR)/include/CLHEP/"$$pkg"; then \
hdrs=`ls $(CLHEP_DIR)/include/CLHEP/$$pkg`; \
for hdr in $$hdrs; do $(COPY_P) $(CLHEP_DIR)/include/CLHEP/$$pkg/$$hdr $(abs_top_builddir)/CLHEP/$$pkg/$$hdr; done; \
fi; \
fi; \
fi; \
fi; \
fi; \
done;
temp-package-dirs:
$(mkinstalldirs) $(abs_top_builddir)/CLHEP;
list="`cat @PACKAGE@-deps | sed s/CLHEP-@PACKAGE@-@VERSION@// | sed s/CLHEP-// | sed s/-@VERSION@//`"; \
for pkg in $$list; do \
$(mkinstalldirs) $(abs_top_builddir)/CLHEP/$$pkg; \
done;
docs:
cd doc; $(MAKE) $(AM_MAKEFLAGS)
......
......@@ -48,6 +48,7 @@ AC_SUBST(Evaluator_CPPFLAGS)
AC_SUBST(Evaluator_LIBS)
AC_SUBST(Evaluator_LDFLAGS)
AC_SUBST(COPY_P)
# ----------------------------------------------------------------------
# Supply boilerplate for Evaluator/defs.h source header:
......@@ -105,7 +106,7 @@ AH_BOTTOM([#endif // EVALUATOR_DEFS_H])
# ----------------------------------------------------------------------
# Locate a C++ compiler:
AC_PROG_CXX(g++ c++ aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC gpp)
AC_PROG_CXX(cl g++ c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
# Use it hereinafter:
AC_LANG(C++)
......@@ -118,64 +119,64 @@ AC_REQUIRE_CPP
case "$target" in
*-*-win32*)
case "$CXX" in
cl) CXXFLAGS="-DWIN32 -O -GX -GR -MD";;
g++) CXXFLAGS="-O";;
c++) CXXFLAGS="-O";;
cl) CXXFLAGS="-DWIN32 -O -GX -GR -MD";COPY_P="copy -p";;
g++) CXXFLAGS="-O";COPY_P="copy -p";;
c++) CXXFLAGS="-O";COPY_P="copy -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
*-*-cygwin*)
case "$CXX" in
cl) CXXFLAGS="-DWIN32 -O -GX -GR -MD";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";;
cl) CXXFLAGS="-DWIN32 -O -GX -GR -MD";COPY_P="cp -p";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
*-*-solaris*)
case "$CXX" in
CC) CXXFLAGS="-O -mt";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";;
CC) CXXFLAGS="-O -mt";COPY_P="cp -p";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
*-*-linux*)
case "$CXX" in
g++) CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE";COPY_P="cp -p";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE";COPY_P="cp -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
alpha*-dec-osf*)
case "$CXX" in
cxx) CXXFLAGS="-O -std strict_ansi -timplicit_local";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";;
cxx) CXXFLAGS="-O -std strict_ansi -timplicit_local";COPY_P="cp -p";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
*-*-hpux*)
case "$CXX" in
aCC) CXXFLAGS="-O -Aa +DAportable +Onolimit";;
CC) CXXFLAGS="+O3 +DAportable +a1 -z -pta +Onolimit";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";;
aCC) CXXFLAGS="-O -Aa +DAportable +Onolimit";COPY_P="cp -p";;
CC) CXXFLAGS="+O3 +DAportable +a1 -z -pta +Onolimit";COPY_P="cp -p";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
*-*-aix*)
case "$CXX" in
xlC) CXXFLAGS="-O3 -qtwolink -+";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";;
xlC) CXXFLAGS="-O3 -qtwolink -+";COPY_P="cp -p";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
*-*-irix*)
case "$CXX" in
CC) CXXFLAGS="-O -OPT:Olimit=0 -pta";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";;
CC) CXXFLAGS="-O -OPT:Olimit=0 -pta";COPY_P="cp -p";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
powerpc-apple-darwin*)
case "$CXX" in
g++) CXXFLAGS="-O -ansi -pedantic -Wall";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
esac
......
CLHEP-@PACKAGE@-@VERSION@ CLHEP-@PACKAGE@-@VERSION@
CLHEP-@PACKAGE@-@VERSION@ CLHEP-RefCount-@VERSION@
CLHEP-@PACKAGE@-@VERSION@ CLHEP-Cast-@VERSION@
## Process this file with automake to produce Makefile.in
includedir = $(prefix)/include/CLHEP
tempincludedir = $(TEMPDIR)/CLHEP/@PACKAGE@
COPY_P = @COPY_P@
pkginclude_HEADERS = \
ZMerrno.h \
......@@ -22,3 +24,16 @@ pkginclude_HEADERS = \
# Identify generated file(s) to be removed when 'make clean' is requested:
CLEANFILES = defs.h
# copy headers into $(tempincludedir)
install-tmpHEADERS:
@echo " install headers in $(TEMPDIR)/CLHEP "
@list='$(pkginclude_HEADERS)'; \
if test $(TEMPDIR); then \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
echo " $(COPY_P) $$d$$p $(tempincludedir)/$$f"; \
$(COPY_P) $$d$$p $(tempincludedir)/$$f; \
done; \
fi; test -z "$$fail"
......@@ -12,44 +12,48 @@ bin_SCRIPTS = Exceptions-config
all-local: $(top_builddir)/CLHEP
# create temporary CLHEP header tree
# we only copy headers for packages listed in @PACKAGE@-deps
# search for header directories in the following order:
# 1. $(top_srcdir)/..
# 2. $(CLHEPSOURCE_DIR)/CLHEP
# 3. $(CLHEP_DIR)/CLHEP
# 1. $(top_builddir)/this-package
# 2. $(top_builddir)/../other-packages
# 3. $(CLHEPSOURCE_DIR)/CLHEP
# 4. $(CLHEP_DIR)/include/CLHEP
#
# abs_ => absolute path
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
COPY_P = @COPY_P@
$(top_builddir)/CLHEP:
mkdir $(top_builddir)/CLHEP;
cd $(abs_top_builddir); list=`ls $(abs_top_srcdir)/..`; \
$(top_builddir)/CLHEP: temp-package-dirs
list="`cat @PACKAGE@-deps | sed s/CLHEP-@PACKAGE@-@VERSION@// | sed s/CLHEP-// | sed s/-@VERSION@//`"; \
for pkg in $$list; do \
if test -d $(abs_top_srcdir)/../"$$pkg"/"$$pkg"; then \
(cd $(abs_top_builddir)/CLHEP; mkdir $$pkg; cd $$pkg; \
hdrs=`ls $(abs_top_srcdir)/../$$pkg/$$pkg`; \
for hdr in $$hdrs; do $(LN_S) $(abs_top_srcdir)/../$$pkg/$$pkg/$$hdr $$hdr; done; \
if test -f $(abs_top_builddir)/../"$$pkg"/"$$pkg"/defs.h; then $(LN_S) $(abs_top_builddir)/../$$pkg/$$pkg/defs.h defs.h; fi; \
if test -f $(abs_top_builddir)/"$$pkg"/defs.h && test ! -e defs.h ; then $(LN_S) $(abs_top_builddir)/$$pkg/defs.h defs.h; fi); \
fi; done
cd $(abs_top_builddir); \
if test -n "$(CLHEPSOURCE_DIR)" && test -d $(CLHEPSOURCE_DIR)/CLHEP; then \
(list=`ls $(CLHEPSOURCE_DIR)/CLHEP`; \
for pkg in $$list; do cd $(abs_top_builddir)/CLHEP; \
if test -d $(CLHEPSOURCE_DIR)/CLHEP/"$$pkg"/"$$pkg" && test ! -d "$$pkg"; then \
(mkdir $$pkg; cd $$pkg; \
hdrs=`ls $(CLHEPSOURCE_DIR)/CLHEP/$$pkg/$$pkg`; \
for hdr in $$hdrs; do $(LN_S) $(CLHEPSOURCE_DIR)/CLHEP/$$pkg/$$pkg/$$hdr $$hdr; done); \
fi; done); fi
cd $(abs_top_builddir); \
if test -n "$(CLHEP_DIR)" && test -d $(CLHEP_DIR)/CLHEP; then \
(list=`ls $(CLHEP_DIR)/CLHEP`; \
for pkg in $$list; do cd $(abs_top_builddir)/CLHEP; \
if test -d $(CLHEP_DIR)/CLHEP/"$$pkg"/"$$pkg" && test ! -d "$$pkg"; then \
(mkdir $$pkg; cd $$pkg; \
hdrs=`ls $(CLHEP_DIR)/CLHEP/$$pkg/$$pkg`; \
for hdr in $$hdrs; do $(LN_S) $(CLHEP_DIR)/CLHEP/$$pkg/$$pkg/$$hdr $$hdr; done); \
fi; done); fi
if test -d "$$pkg" ; then \
(cd $$pkg && $(MAKE) $(AM_MAKEFLAGS) TEMPDIR=$(abs_top_builddir) install-tmpHEADERS) || exit 1 ; \
else \
if test -d ../"$$pkg"/"$$pkg" ; then \
(cd ../$$pkg/$$pkg && $(MAKE) $(AM_MAKEFLAGS) TEMPDIR=$(abs_top_builddir) install-tmpHEADERS) || exit 1 ; \
else \
if test -d $(CLHEPSOURCE_DIR)/CLHEP/"$$pkg"/"$$pkg"; then \
hdrs=`ls $(CLHEPSOURCE_DIR)/CLHEP/$$pkg/$$pkg`; \
for hdr in $$hdrs; do $(COPY_P) $(CLHEPSOURCE_DIR)/CLHEP/$$pkg/$$pkg/$$hdr $(abs_top_builddir)/CLHEP/$$pkg/$$hdr; done; \
else \
if test -n "$(CLHEP_DIR)" && test -d $(CLHEP_DIR)/include/CLHEP; then \
if test -d $(CLHEP_DIR)/include/CLHEP/"$$pkg"; then \
hdrs=`ls $(CLHEP_DIR)/include/CLHEP/$$pkg`; \
for hdr in $$hdrs; do $(COPY_P) $(CLHEP_DIR)/include/CLHEP/$$pkg/$$hdr $(abs_top_builddir)/CLHEP/$$pkg/$$hdr; done; \
fi; \
fi; \
fi; \
fi; \
fi; \
done;
temp-package-dirs:
$(mkinstalldirs) $(abs_top_builddir)/CLHEP;
list="`cat @PACKAGE@-deps | sed s/CLHEP-@PACKAGE@-@VERSION@// | sed s/CLHEP-// | sed s/-@VERSION@//`"; \
for pkg in $$list; do \
$(mkinstalldirs) $(abs_top_builddir)/CLHEP/$$pkg; \
done;
docs:
cd doc; $(MAKE) $(AM_MAKEFLAGS)
......
......@@ -60,6 +60,7 @@ AC_SUBST(Exceptions_CPPFLAGS)
AC_SUBST(Exceptions_LIBS)
AC_SUBST(Exceptions_LDFLAGS)
AC_SUBST(COPY_P)
# ----------------------------------------------------------------------
# Supply boilerplate for Exceptions/defs.h source header:
......@@ -116,7 +117,7 @@ AH_BOTTOM([#endif // EXCEPTIONS_DEFS_H])
# ----------------------------------------------------------------------
# Locate a C++ compiler:
AC_PROG_CXX(g++ c++ aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC gpp)
AC_PROG_CXX(cl g++ c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
# Use it hereinafter:
AC_LANG(C++)
......@@ -128,69 +129,68 @@ AC_REQUIRE_CPP
case "$target" in
*-*-win32*)
case "$CXX" in
cl) CXXFLAGS="-DWIN32 -O -GX -GR -MD";;
g++) CXXFLAGS="-O";;
c++) CXXFLAGS="-O";;
cl) CXXFLAGS="-DWIN32 -O -GX -GR -MD";COPY_P="copy -p";;
g++) CXXFLAGS="-O";COPY_P="copy -p";;
c++) CXXFLAGS="-O";COPY_P="copy -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
*-*-cygwin*)
case "$CXX" in
cl) CXXFLAGS="-DWIN32 -O -GX -GR -MD";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";;
cl) CXXFLAGS="-DWIN32 -O -GX -GR -MD";COPY_P="cp -p";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
*-*-solaris*)
case "$CXX" in
CC) CXXFLAGS="-O -mt";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";;
CC) CXXFLAGS="-O -mt";COPY_P="cp -p";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
*-*-linux*)
case "$CXX" in
g++) CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE";COPY_P="cp -p";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE";COPY_P="cp -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
alpha*-dec-osf*)
case "$CXX" in
cxx) CXXFLAGS="-O -std strict_ansi -timplicit_local";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";;
cxx) CXXFLAGS="-O -std strict_ansi -timplicit_local";COPY_P="cp -p";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
*-*-hpux*)
case "$CXX" in
aCC) CXXFLAGS="-O -Aa +DAportable +Onolimit";;
CC) CXXFLAGS="+O3 +DAportable +a1 -z -pta +Onolimit";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";;
aCC) CXXFLAGS="-O -Aa +DAportable +Onolimit";COPY_P="cp -p";;
CC) CXXFLAGS="+O3 +DAportable +a1 -z -pta +Onolimit";COPY_P="cp -p";;