[Orca-checkins] rev 186 - in trunk/orca: . orca docs contrib data_gatherers data_gatherers/orcallator data_gatherers/orca_services
blair at orcaware.com
blair at orcaware.com
Sat Jan 4 19:42:09 PST 2003
Author: blair
Date: 2003-01-04 19:38:08 -0800 (Sat, 04 Jan 2003)
New Revision: 186
Added:
trunk/orca/data_gatherers/
trunk/orca/data_gatherers/Makefile.in
trunk/orca/data_gatherers/orca_services/
trunk/orca/data_gatherers/orcallator/
trunk/orca/data_gatherers/procallator/
trunk/orca/orca/
Removed:
trunk/orca/contrib/orca_services/
trunk/orca/contrib/procallator/
trunk/orca/orcallator/
trunk/orca/src/
Modified:
trunk/orca/Makefile.in
trunk/orca/configure.in
trunk/orca/contrib/Makefile.in
trunk/orca/data_gatherers/orca_services/Makefile.in
trunk/orca/data_gatherers/orcallator/Makefile.in
trunk/orca/docs/Makefile.in
trunk/orca/orca/Makefile.in
Log:
Restructure the directories to put all the data gathering tools on
equal footing. Data gathering tools go into a new directory named
data_gatherers.
* data_gatherers:
New directory.
* data_gatherers/Makefile.in:
Copied from contrib/Makefile.in and modified to descend into
orcallator and orca_services. Procallator support will be added
later.
* data_gatherers/orcallator:
Renamed from orcallator.
* data_gatherers/orcallator/Makefile.in:
s|orcallator/|data_gatherers/orcallator/|g.
s|cd ..|cd ../..|g to find config.status now that orcallator moved
down a level.
* data_gatherers/orca_services:
Renamed from contrib/orca_services.
* data_gatherers/orca_services/Makefile.in:
Fix a bug where some of the CONFIG_FILES environmental variables
contained `contrib/contrib/', which doesn't exist.
s|contrib/|data_gatherers/|g.
* data_gatherers/procallator:
Renamed from contrib/procallator.
* orca:
Renamed from src.
* orca/Makefie.in:
s|src/|orca/|g.
* contrib/Makefile.in:
(SUBDIRS): Remove orca_services.
(Makefile): Cd only up one directory to find config.status, not two.
* docs/Makefile.in:
s|src/orca.pl|orca/orca.pl|g.
* Makefile.in:
(SUBDIRS): Descend into orca instead of src and into data_gatherers.
No longer descend conditionally into orcallator.
(orcallator_run_at_boot): s|orcallator/|data_gatherers/orcallator|.
* configure.in:
Sort the config.status generated files alphabetically.
s|src/orca.pl.in|orca/orca.pl.in|g.
s|orcallator|data_gatherers/orcallator|g.
Modified: trunk/orca/Makefile.in
==============================================================================
--- trunk/orca/Makefile.in (original)
+++ trunk/orca/Makefile.in 2003-01-04 19:42:09.000000000 -0800
@@ -10,8 +10,8 @@
SUBDIRS = packages \
lib \
- src \
- @ORCALLATOR_SUBDIR@ \
+ orca \
+ data_gatherers \
docs \
contrib
@@ -55,7 +55,7 @@
cd contrib && $(MAKE) install_contrib
orcallator_run_at_boot:
- cd orcallator && $(MAKE) orcallator_run_at_boot
+ cd data_gatherers/orcallator && $(MAKE) orcallator_run_at_boot
test_modules:
cd packages && $(MAKE) CFLAGS="$(CFLAGS)" test_modules
Copied: orca (from rev 185, trunk/orca/src)
Modified: trunk/orca/orca/Makefile.in
==============================================================================
--- trunk/orca/src/Makefile.in (original)
+++ trunk/orca/orca/Makefile.in 2003-01-04 19:42:09.000000000 -0800
@@ -43,7 +43,7 @@
chmod 0755 $@
Makefile: Makefile.in
- cd .. && CONFIG_FILES=src/Makefile ./config.status
+ cd .. && CONFIG_FILES=orca/Makefile ./config.status
orca.pl: orca.pl.in
- cd .. && CONFIG_FILES=src/orca.pl ./config.status
+ cd .. && CONFIG_FILES=orca/orca.pl ./config.status
Modified: trunk/orca/configure.in
==============================================================================
--- trunk/orca/configure.in (original)
+++ trunk/orca/configure.in 2003-01-04 19:42:09.000000000 -0800
@@ -1,7 +1,7 @@
# This file is an input file used by the GNU "autoconf" program to
# generate the file "configure", which is run during Orca installation
# to configure the system for the local environment.
-AC_INIT(src/orca.pl.in)
+AC_INIT(orca/orca.pl.in)
AC_CONFIG_AUX_DIR(config)
AC_CANONICAL_SYSTEM
@@ -274,7 +274,7 @@
# Always build the orcallator files regardless of the operating system.
BUILD_ORCALLATOR=yes
-ORCALLATOR_SUBDIR=orcallator
+ORCALLATOR_SUBDIR=data_gatherers/orcallator
INSTALL_LIB_RRDTOOL=
AC_SUBST(ORCALLATOR_SUBDIR)
AC_SUBST(INSTALL_LIB_RRDTOOL)
@@ -444,35 +444,37 @@
# variable substitutions.
#--------------------------------------------------------------------
if test "$BUILD_ORCALLATOR" = yes; then
- ORCALLATOR_OUTPUT="orcallator/orcallator.cfg
- orcallator/orcallator_running.pl
- orcallator/restart_orcallator.sh
- orcallator/start_orcallator.sh
- orcallator/stop_orcallator.sh
- orcallator/S99orcallator.sh
- orcallator/Makefile"
+ ORCALLATOR_OUTPUT="data_gatherers/orcallator/Makefile
+ data_gatherers/orcallator/orcallator.cfg
+ data_gatherers/orcallator/orcallator_running.pl
+ data_gatherers/orcallator/restart_orcallator.sh
+ data_gatherers/orcallator/start_orcallator.sh
+ data_gatherers/orcallator/stop_orcallator.sh
+ data_gatherers/orcallator/S99orcallator.sh"
fi
AC_OUTPUT(Makefile
config/PerlHead1
config/PerlHead2
- lib/Makefile
- packages/Makefile
- src/Makefile
- src/orca.pl
- $ORCALLATOR_OUTPUT
- docs/Makefile
contrib/Makefile
contrib/rotate_orca_graphs/Makefile
contrib/rotate_orca_graphs/rotate_orca_graphs.sh
- contrib/orca_services/Makefile
- contrib/orca_services/orca_services.cfg
- contrib/orca_services/orca_services.pl
- contrib/orca_services/orca_services_running.pl
- contrib/orca_services/restart_orca_services.sh
- contrib/orca_services/start_orca_services.sh
- contrib/orca_services/stop_orca_services.sh
- contrib/orca_services/S99orca_services.sh)
+ data_gatherers/Makefile
+ $ORCALLATOR_OUTPUT
+ data_gatherers/orca_services/Makefile
+ data_gatherers/orca_services/orca_services.cfg
+ data_gatherers/orca_services/orca_services.pl
+ data_gatherers/orca_services/orca_services_running.pl
+ data_gatherers/orca_services/restart_orca_services.sh
+ data_gatherers/orca_services/start_orca_services.sh
+ data_gatherers/orca_services/stop_orca_services.sh
+ data_gatherers/orca_services/S99orca_services.sh
+ docs/Makefile
+ lib/Makefile
+ packages/Makefile
+ orca/Makefile
+ orca/orca.pl
+ )
echo
echo "----------------------------------------------------------------"
Modified: trunk/orca/docs/Makefile.in
==============================================================================
--- trunk/orca/docs/Makefile.in (original)
+++ trunk/orca/docs/Makefile.in 2003-01-04 19:42:09.000000000 -0800
@@ -4,7 +4,7 @@
mandir = @mandir@/man1
INSTALL = @INSTALL@
MKDIR = @MKDIR@
-ORCA = ../src/orca.pl
+ORCA = ../orca/orca.pl
POD2HTML = @POD2HTML@
POD2MAN = @POD2MAN@
POD2TEXT = @POD2TEXT@
Modified: trunk/orca/contrib/Makefile.in
==============================================================================
--- trunk/orca/contrib/Makefile.in (original)
+++ trunk/orca/contrib/Makefile.in 2003-01-04 19:42:09.000000000 -0800
@@ -1,7 +1,6 @@
@SET_MAKE@
-SUBDIRS = orca_services \
- rotate_orca_graphs
+SUBDIRS = rotate_orca_graphs
all: Makefile $(TARGETS)
@for dir in $(SUBDIRS); do \
@@ -32,4 +31,4 @@
$(RM) Makefile
Makefile: Makefile.in
- cd ../.. && CONFIG_FILES=contrib/Makefile ./config.status
+ cd .. && CONFIG_FILES=contrib/Makefile ./config.status
Copied: procallator (from rev 185, trunk/orca/contrib/procallator)
Copied: Makefile.in (from rev 185, trunk/orca/contrib/Makefile.in)
==============================================================================
--- trunk/orca/contrib/Makefile.in (original)
+++ trunk/orca/data_gatherers/Makefile.in 2003-01-04 19:42:09.000000000 -0800
@@ -0,0 +1,32 @@
+ at SET_MAKE@
+
+SUBDIRS = orcallator \
+ orca_services
+
+all: Makefile $(TARGETS)
+ @for dir in $(SUBDIRS); do \
+ echo "cd $$dir && $(MAKE) CFLAGS=$(CFLAGS)"; \
+ (cd $$dir && $(MAKE) CFLAGS="$(CFLAGS)"); \
+ done
+
+install:
+ @for dir in $(SUBDIRS); do \
+ echo "cd $$dir && $(MAKE) CFLAGS=$(CFLAGS) install"; \
+ (cd $$dir && $(MAKE) CFLAGS="$(CFLAGS)" install); \
+ done
+
+clean:
+ @for dir in $(SUBDIRS); do \
+ echo "cd $$dir && $(MAKE) CFLAGS=$(CFLAGS) clean"; \
+ (cd $$dir && $(MAKE) CFLAGS="$(CFLAGS)" clean); \
+ done
+
+distclean: clean
+ @for dir in $(SUBDIRS); do \
+ echo "cd $$dir && $(MAKE) CFLAGS=$(CFLAGS) distclean"; \
+ (cd $$dir && $(MAKE) CFLAGS="$(CFLAGS)" distclean); \
+ done
+ $(RM) Makefile
+
+Makefile: Makefile.in
+ cd .. && CONFIG_FILES=data_gatherers/Makefile ./config.status
Copied: orcallator (from rev 185, trunk/orca/orcallator)
Modified: trunk/orca/data_gatherers/orcallator/Makefile.in
==============================================================================
--- trunk/orca/orcallator/Makefile.in (original)
+++ trunk/orca/data_gatherers/orcallator/Makefile.in 2003-01-04 19:42:09.000000000 -0800
@@ -59,22 +59,22 @@
chmod 0755 $@
Makefile: Makefile.in
- cd .. && CONFIG_FILES=orcallator/Makefile ./config.status
+ cd ../.. && CONFIG_FILES=data_gatherers/orcallator/Makefile ./config.status
orcallator.cfg: orcallator.cfg.in
- cd .. && CONFIG_FILES=orcallator/orcallator.cfg ./config.status
+ cd ../.. && CONFIG_FILES=data_gatherers/orcallator/orcallator.cfg ./config.status
orcallator_running.pl: orcallator_running.pl.in
- cd .. && CONFIG_FILES=orcallator/orcallator_running.pl ./config.status
+ cd ../.. && CONFIG_FILES=data_gatherers/orcallator/orcallator_running.pl ./config.status
restart_orcallator.sh: restart_orcallator.sh.in
- cd .. && CONFIG_FILES=orcallator/restart_orcallator.sh ./config.status
+ cd ../.. && CONFIG_FILES=data_gatherers/orcallator/restart_orcallator.sh ./config.status
start_orcallator.sh: start_orcallator.sh.in
- cd .. && CONFIG_FILES=orcallator/start_orcallator.sh ./config.status
+ cd ../.. && CONFIG_FILES=data_gatherers/orcallator/start_orcallator.sh ./config.status
stop_orcallator.sh: stop_orcallator.sh.in
- cd .. && CONFIG_FILES=orcallator/stop_orcallator.sh ./config.status
+ cd ../.. && CONFIG_FILES=data_gatherers/orcallator/stop_orcallator.sh ./config.status
S99orcallator.sh: S99orcallator.sh.in
- cd .. && CONFIG_FILES=orcallator/S99orcallator.sh ./config.status
+ cd ../.. && CONFIG_FILES=data_gatherers/orcallator/S99orcallator.sh ./config.status
Copied: orca_services (from rev 185, trunk/orca/contrib/orca_services)
Modified: trunk/orca/data_gatherers/orca_services/Makefile.in
==============================================================================
--- trunk/orca/contrib/orca_services/Makefile.in (original)
+++ trunk/orca/data_gatherers/orca_services/Makefile.in 2003-01-04 19:42:09.000000000 -0800
@@ -60,29 +60,29 @@
chmod 0755 $@
Makefile: Makefile.in
- cd ../.. && CONFIG_FILES=contrib/orca_services/Makefile ./config.status
+ cd ../.. && CONFIG_FILES=data_gatherers/orca_services/Makefile ./config.status
$(MAKE)
orca_services.cfg: orca_services.cfg.in
- cd ../.. && CONFIG_FILES=contrib/orca_services/orca_services.cfg ./config.status
+ cd ../.. && CONFIG_FILES=data_gatherers/orca_services/orca_services.cfg ./config.status
orca_services.pl: orca_services.pl.in $(PERL_HEAD)
- cd ../.. && CONFIG_FILES=contrib/orca_services/orca_services.pl ./config.status
+ cd ../.. && CONFIG_FILES=data_gatherers/orca_services/orca_services.pl ./config.status
cat $(PERL_HEAD) orca_services.pl > orca_services.perl
mv orca_services.perl orca_services.pl
chmod 0755 orca_services.pl
orca_services_running.pl: orca_services_running.pl.in
- cd ../.. && CONFIG_FILES=contrib/contrib/orca_services/orca_services_running.pl ./config.status
+ cd ../.. && CONFIG_FILES=data_gatherers/orca_services/orca_services_running.pl ./config.status
restart_orca_services.sh: restart_orca_services.sh.in
- cd ../.. && CONFIG_FILES=contrib/contrib/orca_services/restart_orca_services.sh ./config.status
+ cd ../.. && CONFIG_FILES=data_gatherers/orca_services/restart_orca_services.sh ./config.status
start_orca_services.sh: start_orca_services.sh.in
- cd ../.. && CONFIG_FILES=contrib/contrib/orca_services/start_orca_services.sh ./config.status
+ cd ../.. && CONFIG_FILES=data_gatherers/orca_services/start_orca_services.sh ./config.status
stop_orca_services.sh: stop_orca_services.sh.in
- cd ../.. && CONFIG_FILES=contrib/contrib/orca_services/stop_orca_services.sh ./config.status
+ cd ../.. && CONFIG_FILES=data_gatherers/orca_services/stop_orca_services.sh ./config.status
S99orca_services.sh: S99orca_services.sh.in
- cd ../.. && CONFIG_FILES=contrib/contrib/orca_services/S99orca_services.sh ./config.status
+ cd ../.. && CONFIG_FILES=data_gatherers/orca_services/S99orca_services.sh ./config.status
More information about the Orca-checkins
mailing list