move functionality of makeCLHEPdir into Makefile.am

make temporary links for each header, not header directory
can now #include "CLHEP/pkg/defs.h"

Evaluator/Evaluator/Makefile.am

@@ -5,3 +5,6 @@ includedir = $(prefix)/include/CLHEP
 pkginclude_HEADERS = \
 	Evaluator.h	\
 	defs.h
+
+# Identify generated file(s) to be removed when 'make clean' is requested:
+CLEANFILES = defs.h

Evaluator/Makefile.am

@@ -3,15 +3,52 @@
 includedir = $(prefix)/include/CLHEP
 
 # put . first so that CLHEP directory is built before anything else
-SUBDIRS = . Evaluator src test
+SUBDIRS = Evaluator . src test
 
 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
 $(top_builddir)/CLHEP:
-	$(top_srcdir)/makeCLHEPdir  $(top_srcdir)/..
+	mkdir $(top_builddir)/CLHEP; linktree=`pwd`;  \
+	cd $(top_srcdir)/..; linksource=`pwd`;  \
+	list=`ls $$linksource`;  \
+	for pkg in $$list; do \
+	  if test -d "$$linksource"/"$$pkg"/"$$pkg"; then \
+	    (cd $$linktree/CLHEP; mkdir $$pkg; cd $$pkg; \
+	    hdrs=`ls $$linksource/$$pkg/$$pkg`; \
+	    for hdr in $$hdrs; do $(LN_S) $$linksource/$$pkg/$$pkg/$$hdr $$hdr; done; \
+	    if test -f "$$linktree"/../"$$pkg"/"$$pkg"/defs.h; then $(LN_S) $$linktree/../$$pkg/$$pkg/defs.h defs.h; fi; \
+	    if test -f "$$linktree/$$pkg"/defs.h && test ! -l defs.h ; then $(LN_S) $$linktree/$$pkg/defs.h defs.h; fi); \
+	  fi; done
+	cd $(top_builddir); linktree=`pwd`; \
+	if test -n $(CLHEPSOURCE_DIR) && test -d $(CLHEPSOURCE_DIR)/CLHEP; then \
+	  (list=`ls $(CLHEPSOURCE_DIR)/CLHEP`;  \
+	  for pkg in $$list; do cd $$linktree/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 $(top_builddir); linktree=`pwd`; \
+	if test -n $(CLHEP_DIR) && test -d $(CLHEP_DIR)/CLHEP; then \
+	  (list=`ls $(CLHEP_DIR)/CLHEP`;  \
+	  for pkg in $$list; do cd $$linktree/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

Evaluator/configure.in

@@ -16,6 +16,7 @@ AC_CONFIG_SRCDIR([src/Evaluator.cc])
 AM_INIT_AUTOMAKE(1.6 foreign)
 AC_PROG_LIBTOOL
 AC_PROG_INSTALL
+AC_PROG_LN_S
 
 
 # ----------------------------------------------------------------------
@@ -83,34 +84,34 @@ case "$target" in
   cl)  CXXFLAGS="-DWIN32 -O -GX -GR -MD";;
   g++) CXXFLAGS="-O";;
   c++) CXXFLAGS="-O";;
-  *)   echo UNEXPECTED CHOISE OF C++ COMPILER: $CXX
+  *)   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";;
-  *)   echo UNEXPECTED CHOISE OF C++ COMPILER: $CXX
+  *)   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";;
-  *)   echo UNEXPECTED CHOISE OF C++ COMPILER: $CXX
+  *)   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";;
-  *)   echo UNEXPECTED CHOISE OF C++ COMPILER: $CXX
+  *)   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";;
-  *)   echo UNEXPECTED CHOISE OF C++ COMPILER: $CXX
+  *)   echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
   esac;;
 *-*-hpux*)
   case "$CXX" in
@@ -118,27 +119,27 @@ alpha*-dec-osf*)
   CC)  CXXFLAGS="+O3 +DAportable +a1 -z -pta +Onolimit";;
   g++) CXXFLAGS="-O -ansi -pedantic -Wall";;
   c++) CXXFLAGS="-O -ansi -pedantic -Wall";;
-  *)   echo UNEXPECTED CHOISE OF C++ COMPILER: $CXX
+  *)   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";;
-  *)   echo UNEXPECTED CHOISE OF C++ COMPILER: $CXX
+  *)   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";;
-  *)   echo UNEXPECTED CHOISE OF C++ COMPILER: $CXX
+  *)   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";;
-  *)   echo UNEXPECTED CHOISE OF C++ COMPILER: $CXX
+  *)   echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
   esac;; 
 esac
 

Evaluator/makeCLHEPdir

-#!/bin/sh
-
-# create a temporary CLHEP include subdirectory
-# use this in the build directory, NOT in the source code tree
-
-# makeCLHEP <top of source>
-#  $1 is the CLHEP (or equivalent) source code direcotry
-#  e.g. for /path/somedir/Vector, $1 is /path/somedir
-
-if [ $# -lt 1 ] 
-then
-   echo "you must supply the path to the top of the source code directory"
-   exit 1
-fi
-
-# create temporary include subdirectory
-# if this directory already exists, we assume that everything is correct
-if [ ! -d CLHEP ] 
-then
-  # make sure we have the full path
-  thisdir=`pwd`
-  cd $1; thatdir=`pwd`
-  cd $thisdir
-  # make the directory and links
-  mkdir CLHEP
-  for pkg in `ls $thatdir`
-  do
-    if [ -d $thatdir/$pkg/$pkg ] 
-    then
-       ln -s $thatdir/$pkg/$pkg CLHEP/$pkg
-    fi
-  done
-  # check $CLHEP_DIR for extra packages
-  if [ -n $CLHEP_DIR ] && [ -d $CLHEP_DIR/CLHEP ]
-  then
-     for cpkg in `ls $CLHEP_DIR/CLHEP`
-     do
-         if [ -d $CLHEP_DIR/CLHEP/$cpkg/$cpkg ] && [ ! -L CLHEP/$cpkg ]
-	 then
-	    echo "link $CLHEP_DIR/CLHEP/$cpkg/$cpkg CLHEP/$cpkg"
-	    ln -s  $CLHEP_DIR/CLHEP/$cpkg/$cpkg CLHEP/$cpkg
-	 fi
-     done
-  fi
-fi
-

Evaluator/src/Evaluator.cc

 // -*- C++ -*-
-// $Id: Evaluator.cc,v 1.1.1.1 2003/07/15 20:15:05 garren Exp $
+// $Id: Evaluator.cc,v 1.2 2003/08/13 20:00:10 garren Exp $
 // ---------------------------------------------------------------------------
 
-#include "Evaluator/defs.h"
-
+#include "CLHEP/Evaluator/defs.h"
 #include "CLHEP/Evaluator/Evaluator.h"
+
 #include <iostream>
 #include <cmath>	// for pow()
 #include "stack.src"

Evaluator/src/setStdMath.cc

 // -*- C++ -*-
-// $Id: setStdMath.cc,v 1.1.1.1 2003/07/15 20:15:05 garren Exp $
+// $Id: setStdMath.cc,v 1.2 2003/08/13 20:00:10 garren Exp $
 // ----------------------------------------------------------------------
 
-#include "Evaluator/defs.h"
+#include "CLHEP/Evaluator/defs.h"
+#include "CLHEP/Evaluator/Evaluator.h"
 
 #include <cmath>	// for sqrt and pow
 
-#include "CLHEP/Evaluator/Evaluator.h"
-
 using namespace std;
 
 static double eval_abs  (double a)           { return (a < 0) ? -a : a; } 

Evaluator/src/setSystemOfUnits.cc

 // -*- C++ -*-
-// $Id: setSystemOfUnits.cc,v 1.1.1.1 2003/07/15 20:15:05 garren Exp $
+// $Id: setSystemOfUnits.cc,v 1.2 2003/08/13 20:00:10 garren Exp $
 // ----------------------------------------------------------------------
 
-#include "Evaluator/defs.h"
-
+#include "CLHEP/Evaluator/defs.h"
 #include "CLHEP/Evaluator/Evaluator.h"
 
 namespace HepTool {

GenericFunctions/GenericFunctions/Makefile.am

@@ -82,4 +82,8 @@ pkginclude_HEADERS = \
 	Tan.hh         \
 	TrivariateGaussian.hh         \
 	Variable.hh         \
-	X.hh
+	X.hh	\
+	defs.h
+
+# Identify generated file(s) to be removed when 'make clean' is requested:
+CLEANFILES = defs.h

GenericFunctions/Makefile.am

@@ -3,15 +3,54 @@
 includedir = $(prefix)/include/CLHEP
 
 # put . first so that CLHEP directory is built before anything else
-SUBDIRS = . GenericFunctions src test
+SUBDIRS = GenericFunctions . src test
+# list all subdirectories - for distribution and cleaning
+DIST_SUBDIRS = GenericFunctions . src 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
 $(top_builddir)/CLHEP:
-	$(top_srcdir)/makeCLHEPdir  $(top_srcdir)/..
+	mkdir $(top_builddir)/CLHEP; linktree=`pwd`;  \
+	cd $(top_srcdir)/..; linksource=`pwd`;  \
+	list=`ls $$linksource`;  \
+	for pkg in $$list; do \
+	  if test -d "$$linksource"/"$$pkg"/"$$pkg"; then \
+	    (cd $$linktree/CLHEP; mkdir $$pkg; cd $$pkg; \
+	    hdrs=`ls $$linksource/$$pkg/$$pkg`; \
+	    for hdr in $$hdrs; do $(LN_S) $$linksource/$$pkg/$$pkg/$$hdr $$hdr; done; \
+	    if test -f "$$linktree"/../"$$pkg"/"$$pkg"/defs.h; then $(LN_S) $$linktree/../$$pkg/$$pkg/defs.h defs.h; fi; \
+	    if test -f "$$linktree/$$pkg"/defs.h && test ! -l defs.h ; then $(LN_S) $$linktree/$$pkg/defs.h defs.h; fi); \
+	  fi; done
+	cd $(top_builddir); linktree=`pwd`; \
+	if test -n $(CLHEPSOURCE_DIR) && test -d $(CLHEPSOURCE_DIR)/CLHEP; then \
+	  (list=`ls $(CLHEPSOURCE_DIR)/CLHEP`;  \
+	  for pkg in $$list; do cd $$linktree/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 $(top_builddir); linktree=`pwd`; \
+	if test -n $(CLHEP_DIR) && test -d $(CLHEP_DIR)/CLHEP; then \
+	  (list=`ls $(CLHEP_DIR)/CLHEP`;  \
+	  for pkg in $$list; do cd $$linktree/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

GenericFunctions/configure.in

@@ -16,6 +16,7 @@ AC_CONFIG_SRCDIR([src/Abs.cc])
 AM_INIT_AUTOMAKE(1.6 foreign)
 AC_PROG_LIBTOOL
 AC_PROG_INSTALL
+AC_PROG_LN_S
 
 
 # ----------------------------------------------------------------------
@@ -83,34 +84,34 @@ case "$target" in
   cl)  CXXFLAGS="-DWIN32 -O -GX -GR -MD";;
   g++) CXXFLAGS="-O";;
   c++) CXXFLAGS="-O";;
-  *)   echo UNEXPECTED CHOISE OF C++ COMPILER: $CXX
+  *)   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";;
-  *)   echo UNEXPECTED CHOISE OF C++ COMPILER: $CXX
+  *)   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";;
-  *)   echo UNEXPECTED CHOISE OF C++ COMPILER: $CXX
+  *)   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";;
-  *)   echo UNEXPECTED CHOISE OF C++ COMPILER: $CXX
+  *)   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";;
-  *)   echo UNEXPECTED CHOISE OF C++ COMPILER: $CXX
+  *)   echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
   esac;;
 *-*-hpux*)
   case "$CXX" in
@@ -118,27 +119,27 @@ alpha*-dec-osf*)
   CC)  CXXFLAGS="+O3 +DAportable +a1 -z -pta +Onolimit";;
   g++) CXXFLAGS="-O -ansi -pedantic -Wall";;
   c++) CXXFLAGS="-O -ansi -pedantic -Wall";;
-  *)   echo UNEXPECTED CHOISE OF C++ COMPILER: $CXX
+  *)   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";;
-  *)   echo UNEXPECTED CHOISE OF C++ COMPILER: $CXX
+  *)   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";;
-  *)   echo UNEXPECTED CHOISE OF C++ COMPILER: $CXX
+  *)   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";;
-  *)   echo UNEXPECTED CHOISE OF C++ COMPILER: $CXX
+  *)   echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
   esac;; 
 esac
 

GenericFunctions/makeCLHEPdir

-#!/bin/sh
-
-# create a temporary CLHEP include subdirectory
-# use this in the build directory, NOT in the source code tree
-
-# makeCLHEP <top of source>
-#  $1 is the CLHEP (or equivalent) source code direcotry
-#  e.g. for /path/somedir/Vector, $1 is /path/somedir
-
-if [ $# -lt 1 ] 
-then
-   echo "you must supply the path to the top of the source code directory"
-   exit 1
-fi
-
-# create temporary include subdirectory
-# if this directory already exists, we assume that everything is correct
-if [ ! -d CLHEP ] 
-then
-  # make sure we have the full path
-  thisdir=`pwd`
-  cd $1; thatdir=`pwd`
-  cd $thisdir
-  # make the directory and links
-  mkdir CLHEP
-  for pkg in `ls $thatdir`
-  do
-    if [ -d $thatdir/$pkg/$pkg ] 
-    then
-       ln -s $thatdir/$pkg/$pkg CLHEP/$pkg
-    fi
-  done
-  # check $CLHEP_DIR for extra packages
-  if [ -n $CLHEP_DIR ] && [ -d $CLHEP_DIR/CLHEP ]
-  then
-     for cpkg in `ls $CLHEP_DIR/CLHEP`
-     do
-         if [ -d $CLHEP_DIR/CLHEP/$cpkg/$cpkg ] && [ ! -L CLHEP/$cpkg ]
-	 then
-	    echo "link $CLHEP_DIR/CLHEP/$cpkg/$cpkg CLHEP/$cpkg"
-	    ln -s  $CLHEP_DIR/CLHEP/$cpkg/$cpkg CLHEP/$cpkg
-	 fi
-     done
-  fi
-fi
-

GenericFunctions/src/ACos.cc

 // -*- C++ -*-
-// $Id: ACos.cc,v 1.1.1.1 2003/07/15 20:15:05 garren Exp $
-#include "GenericFunctions/defs.h"
-
+// $Id: ACos.cc,v 1.2 2003/08/13 20:00:10 garren Exp $
+#include "CLHEP/GenericFunctions/defs.h"
 #include "CLHEP/GenericFunctions/ACos.hh"
 #include "CLHEP/GenericFunctions/Sqrt.hh"
 #include "CLHEP/GenericFunctions/Square.hh"

GenericFunctions/src/ASin.cc

 // -*- C++ -*-
-// $Id: ASin.cc,v 1.1.1.1 2003/07/15 20:15:05 garren Exp $
-#include "GenericFunctions/defs.h"
-
+// $Id: ASin.cc,v 1.2 2003/08/13 20:00:10 garren Exp $
+#include "CLHEP/GenericFunctions/defs.h"
 #include "CLHEP/GenericFunctions/ASin.hh"
 #include "CLHEP/GenericFunctions/Sqrt.hh"
 #include "CLHEP/GenericFunctions/Square.hh"

GenericFunctions/src/ATan.cc

 // -*- C++ -*-
-// $Id: ATan.cc,v 1.1.1.1 2003/07/15 20:15:05 garren Exp $ 
-#include "GenericFunctions/defs.h"
-
+// $Id: ATan.cc,v 1.2 2003/08/13 20:00:10 garren Exp $ 
+#include "CLHEP/GenericFunctions/defs.h"
 #include "CLHEP/GenericFunctions/ATan.hh"
 #include "CLHEP/GenericFunctions/Square.hh"
 

GenericFunctions/src/Abs.cc

 // $Id: 
 // -*- C++ -*-
 //
-#include "GenericFunctions/defs.h"
-
+#include "CLHEP/GenericFunctions/defs.h"
 #include "CLHEP/GenericFunctions/Abs.hh"
 #include <cmath>
 

GenericFunctions/src/AbsFunction.cc

 // -*- C++ -*-
-// $Id: AbsFunction.cc,v 1.1.1.1 2003/07/15 20:15:05 garren Exp $
-#include "GenericFunctions/defs.h"
-
+// $Id: AbsFunction.cc,v 1.2 2003/08/13 20:00:10 garren Exp $
+#include "CLHEP/GenericFunctions/defs.h"
 #include "CLHEP/GenericFunctions/AbsFunction.hh"
 #include "CLHEP/GenericFunctions/ConstTimesFunction.hh"
 #include "CLHEP/GenericFunctions/ConstOverFunction.hh"
@@ -20,7 +19,9 @@
 #include "CLHEP/GenericFunctions/Variable.hh"
 #include "CLHEP/GenericFunctions/FunctionNoop.hh"
 #include <assert.h>
+
 namespace Genfun {
+
 AbsFunction::AbsFunction() {
 }
 

GenericFunctions/src/AbsFunctional.cc

 // -*- C++ -*-
-// $Id: AbsFunctional.cc,v 1.1.1.1 2003/07/15 20:15:05 garren Exp $
-#include "GenericFunctions/defs.h"
-
+// $Id: AbsFunctional.cc,v 1.2 2003/08/13 20:00:10 garren Exp $
+#include "CLHEP/GenericFunctions/defs.h"
 #include "CLHEP/GenericFunctions/AbsFunctional.hh"
 
 namespace Genfun {

GenericFunctions/src/AbsParameter.cc

 // -*- C++ -*-
-// $Id: AbsParameter.cc,v 1.1.1.1 2003/07/15 20:15:05 garren Exp $
-#include "GenericFunctions/defs.h"
-
+// $Id: AbsParameter.cc,v 1.2 2003/08/13 20:00:10 garren Exp $
+#include "CLHEP/GenericFunctions/defs.h"
 #include "CLHEP/GenericFunctions/AbsParameter.hh"
 #include "CLHEP/GenericFunctions/Parameter.hh"
+
 namespace Genfun {
 
 // Two do-nothing functions:

GenericFunctions/src/AnalyticConvolution.cc

 // -*- C++ -*-
-// $Id: AnalyticConvolution.cc,v 1.1.1.1 2003/07/15 20:15:05 garren Exp $
-#include "GenericFunctions/defs.h"
-
+// $Id: AnalyticConvolution.cc,v 1.2 2003/08/13 20:00:10 garren Exp $
+#include "CLHEP/GenericFunctions/defs.h"
 #include "CLHEP/GenericFunctions/AnalyticConvolution.hh"
 #include "CLHEP/GenericFunctions/Gaussian.hh"
 #include "CLHEP/GenericFunctions/Exponential.hh"

GenericFunctions/src/AssociatedLaguerre.cc

 // -*- C++ -*-
-// $Id: AssociatedLaguerre.cc,v 1.1.1.1 2003/07/15 20:15:05 garren Exp $
-#include "GenericFunctions/defs.h"
-
+// $Id: AssociatedLaguerre.cc,v 1.2 2003/08/13 20:00:10 garren Exp $
+#include "CLHEP/GenericFunctions/defs.h"
 #include "CLHEP/GenericFunctions/AssociatedLaguerre.hh"
 #include "CLHEP/GenericFunctions/Variable.hh"
 #include "CLHEP/GenericFunctions/FixedConstant.hh"