From f9f0783f640a5f411cd23226224189e5fa0671ea Mon Sep 17 00:00:00 2001
From: Fons Rademakers <Fons.Rademakers@cern.ch>
Date: Fri, 11 Apr 2008 13:21:02 +0000
Subject: [PATCH] move hbook to hist.
git-svn-id: http://root.cern.ch/svn/root/trunk@23143 27541ba8-7e3a-0410-8455-c3a389f83636
---
Makefile | 4 ++--
build/unix/makestatic.sh | 2 +-
{hbook => hist/hbook}/Module.mk | 15 +++++++++------
{hbook => hist/hbook}/doc/index.txt | 0
{hbook => hist/hbook}/inc/LinkDef.h | 0
{hbook => hist/hbook}/inc/THbookBranch.h | 0
{hbook => hist/hbook}/inc/THbookFile.h | 0
{hbook => hist/hbook}/inc/THbookKey.h | 0
{hbook => hist/hbook}/inc/THbookTree.h | 0
{hbook => hist/hbook}/src/THbookBranch.cxx | 0
{hbook => hist/hbook}/src/THbookFile.cxx | 0
{hbook => hist/hbook}/src/THbookKey.cxx | 0
{hbook => hist/hbook}/src/THbookTree.cxx | 0
{hbook => hist/hbook}/src/hntvar2.f | 0
14 files changed, 12 insertions(+), 9 deletions(-)
rename {hbook => hist/hbook}/Module.mk (86%)
rename {hbook => hist/hbook}/doc/index.txt (100%)
rename {hbook => hist/hbook}/inc/LinkDef.h (100%)
rename {hbook => hist/hbook}/inc/THbookBranch.h (100%)
rename {hbook => hist/hbook}/inc/THbookFile.h (100%)
rename {hbook => hist/hbook}/inc/THbookKey.h (100%)
rename {hbook => hist/hbook}/inc/THbookTree.h (100%)
rename {hbook => hist/hbook}/src/THbookBranch.cxx (100%)
rename {hbook => hist/hbook}/src/THbookFile.cxx (100%)
rename {hbook => hist/hbook}/src/THbookKey.cxx (100%)
rename {hbook => hist/hbook}/src/THbookTree.cxx (100%)
rename {hbook => hist/hbook}/src/hntvar2.f (100%)
diff --git a/Makefile b/Makefile
index c37ed8a9c93..84b1a4de7cd 100644
--- a/Makefile
+++ b/Makefile
@@ -207,7 +207,7 @@ ifeq ($(BUILDGLOBUS),yes)
MODULES += net/globusauth
endif
ifeq ($(BUILDHBOOK),yes)
-MODULES += hbook
+MODULES += hist/hbook
endif
ifeq ($(BUILDXRD),yes)
ifneq ($(XROOTDDIR),)
@@ -242,7 +242,7 @@ MODULES += core/unix core/winnt graf2d/x11 graf2d/x11ttf \
graf2d/win32gdk graf3d/gl graf3d/ftgl io/rfio io/castor \
montecarlo/pythia6 montecarlo/pythia8 table \
sql/mysql sql/pgsql sql/sapdb net/srputils graf3d/x3d \
- rootx net/rootd io/dcache io/chirp hbook graf2d/asimage \
+ rootx net/rootd io/dcache io/chirp hist/hbook graf2d/asimage \
net/ldap net/krb5auth net/rpdutils net/globusauth \
bindings/pyroot bindings/ruby io/gfal \
graf2d/qt gui/qtroot gui/qtgsi net/xrootd net/netx net/alien \
diff --git a/build/unix/makestatic.sh b/build/unix/makestatic.sh
index a405f5c6b54..9e400508380 100755
--- a/build/unix/makestatic.sh
+++ b/build/unix/makestatic.sh
@@ -21,7 +21,7 @@ rm -f $ROOTALIB $ROOTAEXE $PROOFAEXE
excl="main proof/proofd net/rootd net/xrootd rootx montecarlo/pythia6 \
montecarlo/pythia8 sql/mysql sql/pgsql io/rfio sql/sapdb \
- hbook core/newdelete table core/utils net/srputils net/krb5auth \
+ hist/hbook core/newdelete table core/utils net/srputils net/krb5auth \
net/globusauth io/chirp io/dcache graf2d/x11ttf net/alien \
graf2d/asimage net/ldap graf2d/qt gui/qtroot math/quadp \
bindings/pyroot bindings/ruby montecarlo/vmc \
diff --git a/hbook/Module.mk b/hist/hbook/Module.mk
similarity index 86%
rename from hbook/Module.mk
rename to hist/hbook/Module.mk
index 889edb89f0e..4ba307ebea1 100644
--- a/hbook/Module.mk
+++ b/hist/hbook/Module.mk
@@ -3,7 +3,8 @@
#
# Author: Fons Rademakers, 18/2/2002
-MODDIR := hbook
+MODNAME := hbook
+MODDIR := hist/$(MODNAME)
MODDIRS := $(MODDIR)/src
MODDIRI := $(MODDIR)/inc
@@ -38,6 +39,8 @@ ALLMAPS += $(HBOOKMAP)
INCLUDEFILES += $(HBOOKDEP)
##### local rules #####
+.PHONY: all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME)
+
include/%.h: $(HBOOKDIRI)/%.h
cp $< $@
@@ -55,14 +58,14 @@ $(HBOOKMAP): $(RLIBMAP) $(MAKEFILEDEP) $(HBOOKL)
$(RLIBMAP) -o $(HBOOKMAP) -l $(HBOOKLIB) \
-d $(HBOOKLIBDEPM) -c $(HBOOKL)
-all-hbook: $(HBOOKLIB) $(HBOOKMAP)
+all-$(MODNAME): $(HBOOKLIB) $(HBOOKMAP)
-clean-hbook:
+clean-$(MODNAME):
@rm -f $(HBOOKO) $(HBOOKDO)
-clean:: clean-hbook
+clean:: clean-$(MODNAME)
-distclean-hbook: clean-hbook
+distclean-$(MODNAME): clean-$(MODNAME)
@rm -f $(HBOOKDEP) $(HBOOKDS) $(HBOOKDH) $(HBOOKLIB) $(HBOOKMAP)
-distclean:: distclean-hbook
+distclean:: distclean-$(MODNAME)
diff --git a/hbook/doc/index.txt b/hist/hbook/doc/index.txt
similarity index 100%
rename from hbook/doc/index.txt
rename to hist/hbook/doc/index.txt
diff --git a/hbook/inc/LinkDef.h b/hist/hbook/inc/LinkDef.h
similarity index 100%
rename from hbook/inc/LinkDef.h
rename to hist/hbook/inc/LinkDef.h
diff --git a/hbook/inc/THbookBranch.h b/hist/hbook/inc/THbookBranch.h
similarity index 100%
rename from hbook/inc/THbookBranch.h
rename to hist/hbook/inc/THbookBranch.h
diff --git a/hbook/inc/THbookFile.h b/hist/hbook/inc/THbookFile.h
similarity index 100%
rename from hbook/inc/THbookFile.h
rename to hist/hbook/inc/THbookFile.h
diff --git a/hbook/inc/THbookKey.h b/hist/hbook/inc/THbookKey.h
similarity index 100%
rename from hbook/inc/THbookKey.h
rename to hist/hbook/inc/THbookKey.h
diff --git a/hbook/inc/THbookTree.h b/hist/hbook/inc/THbookTree.h
similarity index 100%
rename from hbook/inc/THbookTree.h
rename to hist/hbook/inc/THbookTree.h
diff --git a/hbook/src/THbookBranch.cxx b/hist/hbook/src/THbookBranch.cxx
similarity index 100%
rename from hbook/src/THbookBranch.cxx
rename to hist/hbook/src/THbookBranch.cxx
diff --git a/hbook/src/THbookFile.cxx b/hist/hbook/src/THbookFile.cxx
similarity index 100%
rename from hbook/src/THbookFile.cxx
rename to hist/hbook/src/THbookFile.cxx
diff --git a/hbook/src/THbookKey.cxx b/hist/hbook/src/THbookKey.cxx
similarity index 100%
rename from hbook/src/THbookKey.cxx
rename to hist/hbook/src/THbookKey.cxx
diff --git a/hbook/src/THbookTree.cxx b/hist/hbook/src/THbookTree.cxx
similarity index 100%
rename from hbook/src/THbookTree.cxx
rename to hist/hbook/src/THbookTree.cxx
diff --git a/hbook/src/hntvar2.f b/hist/hbook/src/hntvar2.f
similarity index 100%
rename from hbook/src/hntvar2.f
rename to hist/hbook/src/hntvar2.f
--
GitLab