diff --git a/Makefile b/Makefile index cf7d6a93cf1f840a192d4abfd4309d41b8432792..939a8e9d09835b758311be055e717d69e674ee40 100644 --- a/Makefile +++ b/Makefile @@ -98,8 +98,8 @@ endif ifneq ($(FVENUSLIB),) MODULES += venus endif -ifneq ($(STAR),) -MODULES += star +ifneq ($(TABLE),) +MODULES += table endif ifneq ($(SRPUTILLIB),) MODULES += srputils @@ -113,7 +113,7 @@ endif ifneq ($(findstring $(MAKECMDGOALS),distclean maintainer-clean),) MODULES += unix winnt x11 x11ttf win32 win32gdk gl rfio thread pythia \ - pythia6 venus star mysql pgsql sapdb srputils x3d rootx \ + pythia6 venus table mysql pgsql sapdb srputils x3d rootx \ rootd proofd dcache hbook alien MODULES := $(sort $(MODULES)) # removes duplicates endif @@ -589,7 +589,7 @@ showbuild: @echo "FPYTHIALIBDIR = $(FPYTHIALIBDIR)" @echo "FPYTHIA6LIBDIR = $(FPYTHIA6LIBDIR)" @echo "FVENUSLIBDIR = $(FVENUSLIBDIR)" - @echo "STAR = $(STAR)" + @echo "TABLE = $(TABLE)" @echo "XPMLIBDIR = $(XPMLIBDIR)" @echo "XPMLIB = $(XPMLIB)" @echo "TTFLIBDIR = $(TTFLIBDIR)" diff --git a/build/package/lib/makedebdir.sh b/build/package/lib/makedebdir.sh index af8f6dab76322bbaec6f6698da8a2b78ab8b24e9..1185765044aafa39ecb09c1f90489eab75518ba8 100755 --- a/build/package/lib/makedebdir.sh +++ b/build/package/lib/makedebdir.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: makedebdir.sh,v 1.3 2002/01/22 10:53:28 rdm Exp $ +# $Id: makedebdir.sh,v 1.4 2002/05/14 15:45:28 rdm Exp $ # # Make the debian packaging directory # @@ -18,8 +18,8 @@ etcdir=etc/root docdir=${prefix}/share/doc/root-doc ### echo %%% Packages ordered by preference -pkgs="task-root root-daemon root-ttf root-zebra root-gl root-mysql root-pgsql root-star root-shift root-cint root-bin libroot-dev libroot" -pkgs=`./configure linuxdeb --pkglist --enable-soversion --enable-star --enable-thread --enable-shared | sed -n 's,packages: ,,p'` +pkgs="task-root root-daemon root-ttf root-zebra root-gl root-mysql root-pgsql root-table root-shift root-cint root-bin libroot-dev libroot" +pkgs=`./configure linuxdeb --pkglist --enable-soversion --enable-table --enable-thread --enable-shared | sed -n 's,packages: ,,p'` ### echo %%% Package list is: $pkgs lvls="preinst postinst prerm postrm" @@ -131,6 +131,9 @@ chmod 755 ${tgtdir}/rules # # $Log: makedebdir.sh,v $ +# Revision 1.4 2002/05/14 15:45:28 rdm +# several Debian related packaging and build changes. By Christian Holm. +# # Revision 1.3 2002/01/22 10:53:28 rdm # port to Debian distribution of GNU/Hurd by Christian Holm. # diff --git a/build/package/lib/makerpmspec.sh b/build/package/lib/makerpmspec.sh index beef131dffd623ddff98ac71b4c41535f7e3f97f..c206e62aafabf5eb0cbd7333eb2f2c7a31405d16 100755 --- a/build/package/lib/makerpmspec.sh +++ b/build/package/lib/makerpmspec.sh @@ -1,6 +1,6 @@ #!/bin/sh -e # -# $Id: makerpmspec.sh,v 1.2 2002/01/20 14:23:52 rdm Exp $ +# $Id: makerpmspec.sh,v 1.3 2002/01/22 10:53:28 rdm Exp $ # # Make the rpm spec file in ../root.spec # @@ -15,8 +15,8 @@ tgtdir=rpm curdir=`pwd` ### echo %%% Packages ordered by preference -pkgs="task-root root-daemon root-ttf root-zebra root-gl root-mysql root-pgsql root-star root-shift root-cint root-bin libroot-dev libroot" -pkgs=`./configure linux --pkglist --enable-soversion --enable-star --enable-thread --enable-shared | sed -n 's,packages: ,,p'` +pkgs="task-root root-daemon root-ttf root-zebra root-gl root-mysql root-pgsql root-table root-shift root-cint root-bin libroot-dev libroot" +pkgs=`./configure linux --pkglist --enable-soversion --enable-table --enable-thread --enable-shared | sed -n 's,packages: ,,p'` lvls="preinst postinst prerm postrm" # ROOT version @@ -71,6 +71,9 @@ sed -e "s|@libdir@|${libdir}|" \ # # $Log: makerpmspec.sh,v $ +# Revision 1.3 2002/01/22 10:53:28 rdm +# port to Debian distribution of GNU/Hurd by Christian Holm. +# # Revision 1.2 2002/01/20 14:23:52 rdm # Mega patch by Christian Holm concerning the configure, build and # Debian and RedHat packaging scripts. The configure script has been diff --git a/build/unix/makehtml.sh b/build/unix/makehtml.sh index 359335e237efd68ce0be045f1ddc2a97010aaa63..bcfe3e7ee51df3267be2fc5d38b0faea5ace64ba 100755 --- a/build/unix/makehtml.sh +++ b/build/unix/makehtml.sh @@ -25,7 +25,7 @@ $ROOT -b <<makedoc gSystem.Load("libEGPythia"); gSystem.Load("libEGPythia6"); gSystem.Load("libEGVenus"); -// gSystem.Load("libSTAR"); +// gSystem.Load("libTable"); // gSystem.Load("test/libEvent.so"); THtml html; html.MakeAll(); diff --git a/build/unix/makestatic.sh b/build/unix/makestatic.sh index 7a9938f82ed7a82b2ce69ef5c7f53751c24e74ea..81c19bf93ac434fefba7430b19da942ee490b11d 100755 --- a/build/unix/makestatic.sh +++ b/build/unix/makestatic.sh @@ -19,7 +19,7 @@ ROOTAEXE=bin/roota rm -f $ROOTALIB $ROOTAEXE excl="main proofd rootd rootx pythia pythia6 venus mysql pgsql rfio sapdb \ - hbook newdelete star utils srputils krb5auth dcache x11ttf" + hbook newdelete table utils srputils krb5auth dcache x11ttf" objs="" gobjs="" diff --git a/config/Makefile.aix b/config/Makefile.aix index dab0cfff244f51a16deada0e7bbc9ae0da7e6820..8a00fecd395dd5e0cab099e654dc1c9394961447 100644 --- a/config/Makefile.aix +++ b/config/Makefile.aix @@ -75,8 +75,8 @@ VENUSLIBDEP = $(EGLIB) VENUSLIBEXTRA = -lEG $(FVENUSLIBDIR) $(FVENUSLIB) X11TTFLIBDEP = $(X11LIB) X11TTFLIBEXTRA = -lGX11 -L$(TTFLIBDIR) -lttf -lX11 -STARLIBDEP = $(TREELIB) $(GPADLIB) $(G3DLIB) $(GRAFLIB) $(HISTLIB) -STARLIBEXTRA = -lTree -lGpad -lGraf3d -lGraf -lHist +TABLELIBDEP = $(TREELIB) $(GPADLIB) $(G3DLIB) $(GRAFLIB) $(HISTLIB) +TABLELIBEXTRA = -lTree -lGpad -lGraf3d -lGraf -lHist GLLIBDEP = $(GPADLIB) $(G3DLIB) $(GUILIB) GLLIBEXTRA = -lGpad -lGraf3d -lGui $(OPENGLLIBDIR) $(OPENGLULIB) \ $(OPENGLLIB) -lX11 -lXext -lXmu -lXi diff --git a/config/Makefile.aix5 b/config/Makefile.aix5 index 08d2b2977c2f9b26374c66e4c015cf23f093de9e..e38a3d35ea6bbee6abbfa74d3b27467e380059bf 100644 --- a/config/Makefile.aix5 +++ b/config/Makefile.aix5 @@ -75,8 +75,8 @@ VENUSLIBDEP = $(EGLIB) VENUSLIBEXTRA = -lEG $(FVENUSLIBDIR) $(FVENUSLIB) X11TTFLIBDEP = $(X11LIB) X11TTFLIBEXTRA = -lGX11 -L$(TTFLIBDIR) -lttf -lX11 -STARLIBDEP = $(TREELIB) $(GPADLIB) $(G3DLIB) $(GRAFLIB) $(HISTLIB) -STARLIBEXTRA = -lTree -lGpad -lGraf3d -lGraf -lHist +TABLELIBDEP = $(TREELIB) $(GPADLIB) $(G3DLIB) $(GRAFLIB) $(HISTLIB) +TABLELIBEXTRA = -lTree -lGpad -lGraf3d -lGraf -lHist GLLIBDEP = $(GPADLIB) $(G3DLIB) $(GUILIB) GLLIBEXTRA = -lGpad -lGraf3d -lGui $(OPENGLLIBDIR) $(OPENGLULIB) \ $(OPENGLLIB) -lX11 -lXext -lXmu -lXi diff --git a/config/Makefile.in b/config/Makefile.in index 1fd3a227147ab1656fd6c6c4791e824995d26082..7410612a7887243925b3cf91e62f80c5531d4d1d 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -103,7 +103,7 @@ SHADOWFLAGS := @shadowpw@ SHADOWLIB := SHADOWLIBDIR := -STAR := @enable_star@ +TABLE := @enable_table@ INSTALL := cp -dpR INSTALLDATA := cp -dpR diff --git a/config/Makefile.win32 b/config/Makefile.win32 index fe45526a88e5da8e9b2357752ef8c0f1373c8fd5..20e204e5e154db3b693ea1e0d2dd92166f7dc40a 100644 --- a/config/Makefile.win32 +++ b/config/Makefile.win32 @@ -88,8 +88,8 @@ PYTHIA6LIBEXTRA = lib/libEG.lib lib/libGraf.lib \ $(FPYTHIA6LIBDIR) $(FPYTHIA6LIB) VENUSLIBDEP = $(EGLIB) VENUSLIBEXTRA = lib/libEG.lib $(FVENUSLIBDIR) $(FVENUSLIB) -STARLIBDEP = $(TREELIB) $(GPADLIB) $(G3DLIB) $(GRAFLIB) $(HISTLIB) -STARLIBEXTRA = lib/libTree.lib lib/libGpad.lib \ +TABLELIBDEP = $(TREELIB) $(GPADLIB) $(G3DLIB) $(GRAFLIB) $(HISTLIB) +TABLELIBEXTRA = lib/libTree.lib lib/libGpad.lib \ lib/libGraf3d.lib lib/libGraf.lib lib/libHist.lib GLLIBDEP = $(G3DLIB) $(WIN32LIB) GLLIBEXTRA = lib/libGraf3d.lib lib/libWin32.lib Glu32.lib Opengl32.lib diff --git a/config/Makefile.win32gdk b/config/Makefile.win32gdk index 02ce24166ba9dad897bd3e506758bc08425907d6..1ae12e9ca5402c1ff86c7a5eb3e90d5781b130e7 100644 --- a/config/Makefile.win32gdk +++ b/config/Makefile.win32gdk @@ -90,8 +90,8 @@ PYTHIA6LIBEXTRA = lib/libEG.lib lib/libGraf.lib \ $(FPYTHIA6LIBDIR) $(FPYTHIA6LIB) VENUSLIBDEP = $(EGLIB) VENUSLIBEXTRA = lib/libEG.lib $(FVENUSLIBDIR) $(FVENUSLIB) -STARLIBDEP = $(TREELIB) $(GPADLIB) $(G3DLIB) $(GRAFLIB) $(HISTLIB) -STARLIBEXTRA = lib/libTree.lib lib/libGpad.lib \ +TABLELIBDEP = $(TREELIB) $(GPADLIB) $(G3DLIB) $(GRAFLIB) $(HISTLIB) +TABLELIBEXTRA = lib/libTree.lib lib/libGpad.lib \ lib/libGraf3d.lib lib/libGraf.lib lib/libHist.lib GLLIBDEP = $(G3DLIB) $(WIN32GDKLIB) $(GUILIB) $(GDKDLLS) $(GDKLIBS) GLLIBEXTRA = lib/libGraf3d.lib lib/libWin32gdk.lib lib/libGui.lib \ diff --git a/configure b/configure index b2de1962eed8bee65b470b0a87b07ef818f61fe2..97404b72ab917ce77147baec045a3326b6aac2bd 100755 --- a/configure +++ b/configure @@ -37,7 +37,7 @@ enable_shadowpw= enable_shared=yes enable_soversion=no enable_srp=yes -enable_star=no +enable_table=no enable_thread= # must be set explicitely via --enable-thread enable_exceptions=yes enable_ttf=yes @@ -47,7 +47,7 @@ show_pkglist=no options="enable_afs enable_cern enable_mysql enable_opengl enable_pgsql \ enable_pythia enable_pythia6 enable_rfio enable_dcache enable_rpath \ enable_sapdb enable_shadowpw enable_shared enable_soversion \ - enable_srp enable_star enable_thread enable_ttf enable_venus \ + enable_srp enable_table enable_thread enable_ttf enable_venus \ enable_krb5 enable_exceptions enable_openiv enable_alien" @@ -293,7 +293,7 @@ confhelp() { echo " shared Use shared 3rd party libraries if possible" echo " rpath Set library path on executables" echo " thread Thread support" - echo " star Build STAR contrib library" + echo " table Build libTable contrib library" echo " ttf True Type Font support, requires libtff" echo " opengl OpenGL support, requires libGL and libGLU" echo " openiv OpenInventor support, requires libInventor and libInventorXt" @@ -1227,13 +1227,13 @@ echo $enable_shadowpw ###################################################################### # -### echo %%% STAR Library - Contributed library +### echo %%% Table Library - Contributed library # -if test "x$enable_star" = "xyes" || test ! "x$STAR" = "x"; then - enable_star="1" - echo "Building libStar ... yes" +if test "x$enable_table" = "xyes" || test ! "x$TABLE" = "x"; then + enable_table="1" + echo "Building libTable ... yes" else - enable_star="" + enable_table="" fi @@ -1254,7 +1254,7 @@ if test "x$show_pkglist" = "xyes" ; then test "x$enable_pgsql" = "xyes" && pkglist="$pkglist root-pgsql" test "x$enable_sapdb" = "xyes" && pkglist="$pkglist root-sapdb" test "x$enable_pythia" = "xyes" && test "x$enable_pythia6" = "xyes" && pkglist="$pkglist root-pythia" - test "x$enable_star" = "x1" && pkglist="$pkglist root-star" + test "x$enable_table" = "x1" && pkglist="$pkglist root-table" test "x$enable_rfio" = "xyes" && pkglist="$pkglist root-shift" test "x$enable_srputil" = "xyes" && pkglist="$pkglist root-srp" @@ -1414,7 +1414,7 @@ sed -e "s|@architecture@|$arch|" \ -e "s|@srcdir@|$srcdir|" \ -e "s|@xpmlibdir@|$xpmlibdir|" \ -e "s|@xpmlib@|$xpmlib|" \ - -e "s|@enable_star@|$enable_star|" \ + -e "s|@enable_table@|$enable_table|" \ -e "s|@enable_thread@|$enable_thread|" \ -e "s|@threadlibdir@|$threadlibdir|" \ -e "s|@threadlib@|$threadlib|" \