--- yoda/configure.in 2004/09/21 20:49:36 2.0 +++ yoda/configure.in 2005/01/29 00:26:30 2.4 @@ -65,13 +65,35 @@ AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) + dnl Process the different options AC_ARG_WITH(root, [--with-root=path Use the specified ROOT directory], ROOTSYS=$with_root,) ROOT_LIBRARY="${ROOTSYS}/lib" -ROOT_LDFLAGS="${ROOT_LIBRARY}/libHist.so ${ROOT_LIBRARY}/libMatrix.so ${ROOT_LIBRARY}/libTree.so ${ROOT_LIBRARY}/libCore.so ${ROOT_LIBRARY}/libCint.so -ldl" + +ROOT_LDFLAGS=" \ +${ROOT_LIBRARY}/libCint.so ${ROOT_LIBRARY}/libCore.so \ +${ROOT_LIBRARY}/libMatrix.so ${ROOT_LIBRARY}/libHist.so \ +${ROOT_LIBRARY}/libTree.so ${ROOT_LIBRARY}/libGraf.so \ +${ROOT_LIBRARY}/libGraf3d.so ${ROOT_LIBRARY}/libGpad.so \ +${ROOT_LIBRARY}/libGui.so ${ROOT_LIBRARY}/libMinuit.so \ +${ROOT_LIBRARY}/libHistPainter.so ${ROOT_LIBRARY}/libTreePlayer.so \ +${ROOT_LIBRARY}/libTreeViewer.so ${ROOT_LIBRARY}/libProof.so \ +${ROOT_LIBRARY}/libProofGui.so ${ROOT_LIBRARY}/libPhysics.so \ +${ROOT_LIBRARY}/libRint.so ${ROOT_LIBRARY}/libHtml.so \ +${ROOT_LIBRARY}/libEG.so ${ROOT_LIBRARY}/libGeom.so \ +${ROOT_LIBRARY}/libGeomPainter.so ${ROOT_LIBRARY}/libVMC.so \ +${ROOT_LIBRARY}/libFumili.so ${ROOT_LIBRARY}/libMLP.so \ +${ROOT_LIBRARY}/libGedOld.so ${ROOT_LIBRARY}/libGed.so \ +${ROOT_LIBRARY}/libQuadp.so \ +${ROOT_LIBRARY}/libGX11.so ${ROOT_LIBRARY}/libGX11TTF.so \ +${ROOT_LIBRARY}/libX3d.so \ +${ROOT_LIBRARY}/libRGL.so ${ROOT_LIBRARY}/libASImage.so \ +${ROOT_LIBRARY}/libThread.so ${ROOT_LIBRARY}/libRXML.so \ + -ldl" + ROOT_INCLUDES="-I${ROOTSYS}/include" AC_SUBST(ROOT_INCLUDES) @@ -85,7 +107,7 @@ gprof=$enableval,gprof=no) if test "$gprof" != no then - CFLAGS="-pg $CFLAGS" + CXXFLAGS="-pg $CXXFLAGS" AC_MSG_RESULT(enabled) else AC_MSG_RESULT(no) @@ -103,31 +125,37 @@ dnl Indicates the name of the Makefile which will be generated dnl and the various subDirs where it will be generated one dnl Add your own Makefiles to create here. -AC_OUTPUT(Makefile Doxyfile \ - event/Makefile \ +AC_OUTPUT(Makefile Doxyfile \ + event/Makefile \ + dnl ------------------makes for Packets and SubPackets---------------- - event/mcmd/Makefile \ - event/tmtc/Makefile \ - event/log/Makefile \ - event/arrDump/Makefile \ - event/tabDump/Makefile \ - event/varDump/Makefile \ - event/physics/Makefile \ - event/physics/tracker/Makefile \ - event/physics/anticounter/Makefile \ - event/physics/calorimeter/Makefile \ + event/mcmd/Makefile \ + event/tmtc/Makefile \ + event/log/Makefile \ + event/arrDump/Makefile \ + event/tabDump/Makefile \ + event/varDump/Makefile \ + event/physics/Makefile \ + event/physics/tracker/Makefile \ + event/physics/anticounter/Makefile \ + event/physics/calorimeter/Makefile \ event/physics/neutronDetector/Makefile \ + event/physics/trigger/Makefile \ + event/physics/tof/Makefile \ + event/physics/S4/Makefile \ dnl ------------------makes for Packets and SubPackets---------------- dnl ------------------makes for Techmodel Data---------------- - techmodel/Makefile \ - techmodel/forroutines/tracker/Makefile \ + techmodel/Makefile \ + techmodel/forroutines/tracker/Makefile \ techmodel/forroutines/tracker/readraw/Makefile \ - techmodel/forroutines/anticounter/Makefile \ - techmodel/forroutines/calorimeter/Makefile \ - techmodel/forroutines/Makefile \ - techmodel/physics/Makefile \ + techmodel/forroutines/anticounter/Makefile \ + techmodel/forroutines/calorimeter/Makefile \ + techmodel/forroutines/tof/Makefile \ + techmodel/forroutines/trigger/Makefile \ + techmodel/forroutines/Makefile \ + techmodel/physics/Makefile \ dnl ------------------makes for Techmodel Data---------------- )