*** empty log message ***

Units/Makefile.am

@@ -7,54 +7,8 @@ SUBDIRS = Units . test
 # list all subdirectories - for distribution and cleaning
 DIST_SUBDIRS = Units . test doc
 
-all-local: $(top_builddir)/CLHEP
-
-# create temporary CLHEP header tree
-# search for header directories in the following order:
-#	1.  $(top_srcdir)/..
-#	2.  $(CLHEPSOURCE_DIR)/CLHEP
-#	3.  $(CLHEP_DIR)/CLHEP
-#
-# abs_ => absolute path
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-
-$(top_builddir)/CLHEP:
-	mkdir $(top_builddir)/CLHEP;
-	cd $(abs_top_builddir); list=`ls $(abs_top_srcdir)/..`;  \
-	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
-
 docs:
 	cd doc; $(MAKE) $(AM_MAKEFLAGS)
 
 install-docs:
 	cd doc; $(MAKE) $(AM_MAKEFLAGS) install-docs
-
-# extra clean rule
-clean-local:
-	rm -rf $(top_builddir)/CLHEP

Units/Units/Makefile.am

 ## Process this file with automake to produce Makefile.in
 
 includedir = $(prefix)/include/CLHEP
+tempincludedir = $(TEMPDIR)/CLHEP/@PACKAGE@
+COPY_P = @COPY_P@
 
 pkginclude_HEADERS = \
 	PhysicalConstants.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"

Units/configure.in

@@ -46,6 +46,7 @@ AC_SUBST(Units_CPPFLAGS)
 AC_SUBST(Units_LIBS)
 AC_SUBST(Units_LDFLAGS)
 
+AC_SUBST(COPY_P)
 
 # ----------------------------------------------------------------------
 # Supply boilerplate for Units/defs.h source header:
@@ -103,7 +104,7 @@ AH_BOTTOM([#endif  // UNITS_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++)
@@ -115,64 +116,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