[Orca-checkins] rev 185 - in trunk/orca: . src docs contrib contrib/orca_services orcallator lib packages
blair at orcaware.com
blair at orcaware.com
Sat Jan 4 11:58:01 PST 2003
Author: blair
Date: 2003-01-04 11:57:51 -0800 (Sat, 04 Jan 2003)
New Revision: 185
Modified:
trunk/orca/Makefile.in
trunk/orca/contrib/Makefile.in
trunk/orca/contrib/orca_services/Makefile.in
trunk/orca/docs/Makefile.in
trunk/orca/lib/Makefile.in
trunk/orca/orcallator/Makefile.in
trunk/orca/packages/Makefile.in
trunk/orca/src/Makefile.in
Log:
* Makefile.in,
* contrib/Makefile.in,
* contrib/orca_services/Makefile.in,
* docs/Makefile.in,
* lib/Makefile.in,
* orcallator/Makefile.in,
* packages/Makefile.in,
* src/Makefile.in:
Consistency cleanup.
Replace all unnecessary tabs with spaces.
Never begin the first line of a target command with more than one
tab.
In a target command that continues to the next line, place the
continuation \ just after the end of the line, not way over to
the right. This makes it easier to read, since your eye doesn't
have to move to the left to see if the \ is there.
In a target command that continues to the next line and is
indented itself with respect to the previous line, use two
spaces as an indent, not a tab.
Modified: trunk/orca/Makefile.in
==============================================================================
--- trunk/orca/Makefile.in (original)
+++ trunk/orca/Makefile.in 2003-01-04 11:58:00.000000000 -0800
@@ -1,29 +1,35 @@
@SET_MAKE@
-SUBDIRS = packages lib src @ORCALLATOR_SUBDIR@ docs contrib
-prefix = @prefix@
-MKDIR = @MKDIR@
-MAKE_RRDTOOL = @MAKE_RRDTOOL@
-RRD_DIR = @RRD_DIR@
-VAR_DIR = @VAR_DIR@
-ORCALLATOR_DIR = $(VAR_DIR)/orcallator
-CFLAGS = @CFLAGS@
-
-all: configure config/PerlHead1 config/PerlHead2 Makefile
- @for dir in $(SUBDIRS); do \
- if test -d $$dir; then \
- echo "cd $$dir"; \
- cd $$dir || exit 1; \
- echo "$(MAKE) CFLAGS=$(CFLAGS) || exit 1"; \
- $(MAKE) CFLAGS="$(CFLAGS)" || exit 1; \
- echo "cd .."; \
- cd ..; \
- else \
- exit 1; \
- fi \
+prefix = @prefix@
+MKDIR = @MKDIR@
+MAKE_RRDTOOL = @MAKE_RRDTOOL@
+RRD_DIR = @RRD_DIR@
+VAR_DIR = @VAR_DIR@
+ORCALLATOR_DIR = $(VAR_DIR)/orcallator
+CFLAGS = @CFLAGS@
+
+SUBDIRS = packages \
+ lib \
+ src \
+ @ORCALLATOR_SUBDIR@ \
+ docs \
+ contrib
+
+all: configure config/PerlHead1 config/PerlHead2 Makefile
+ @for dir in $(SUBDIRS); do \
+ if test -d $$dir; then \
+ echo "cd $$dir"; \
+ cd $$dir || exit 1; \
+ echo "$(MAKE) CFLAGS=$(CFLAGS) || exit 1"; \
+ $(MAKE) CFLAGS="$(CFLAGS)" || exit 1; \
+ echo "cd .."; \
+ cd ..; \
+ else \
+ exit 1; \
+ fi \
done
-test: configure Makefile
+test: configure Makefile
upgrade:
cd src && $(MAKE) upgrade_installation
@@ -32,17 +38,17 @@
$(MKDIR) $(VAR_DIR)
$(MKDIR) $(ORCALLATOR_DIR)
$(MKDIR) $(RRD_DIR)/orcallator
- @for dir in $(SUBDIRS); do \
- if test -d $$dir; then \
- echo "cd $$dir"; \
- cd $$dir || exit 1; \
- echo "$(MAKE) CFLAGS=$(CFLAGS) install || exit 1"; \
- $(MAKE) CFLAGS="$(CFLAGS)" install || exit 1; \
- echo "cd .."; \
- cd ..; \
- else \
- exit 1; \
- fi \
+ @for dir in $(SUBDIRS); do \
+ if test -d $$dir; then \
+ echo "cd $$dir"; \
+ cd $$dir || exit 1; \
+ echo "$(MAKE) CFLAGS=$(CFLAGS) install || exit 1"; \
+ $(MAKE) CFLAGS="$(CFLAGS)" install || exit 1; \
+ echo "cd .."; \
+ cd ..; \
+ else \
+ exit 1; \
+ fi \
done
install_contrib:
@@ -58,15 +64,15 @@
cd packages && $(MAKE) CFLAGS="$(CFLAGS)" install_modules
clean: $(CLEAN_RRDTOOL)
- @for dir in $(SUBDIRS); do \
- echo "cd $$dir && $(MAKE) clean"; \
- (cd $$dir && $(MAKE) clean); \
+ @for dir in $(SUBDIRS); do \
+ echo "cd $$dir && $(MAKE) clean"; \
+ (cd $$dir && $(MAKE) clean); \
done
distclean: $(DISTCLEAN_RRDTOOL)
- @for dir in $(SUBDIRS); do \
- echo "cd $$dir && $(MAKE) distclean"; \
- (cd $$dir && $(MAKE) distclean); \
+ @for dir in $(SUBDIRS); do \
+ echo "cd $$dir && $(MAKE) distclean"; \
+ (cd $$dir && $(MAKE) distclean); \
done
$(RM) -r autom4te*.cache
$(RM) config/aclocal.m4 config/PerlHead1 config/PerlHead2
Modified: trunk/orca/src/Makefile.in
==============================================================================
--- trunk/orca/src/Makefile.in (original)
+++ trunk/orca/src/Makefile.in 2003-01-04 11:58:00.000000000 -0800
@@ -1,48 +1,49 @@
@SET_MAKE@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-INSTALL = @INSTALL@
-MKDIR = @MKDIR@
-PERL_HEAD = @PERL_HEAD@
-RRD_DIR = @RRD_DIR@
-VAR_DIR = @VAR_DIR@
-ORCALLATOR_DIR = $(VAR_DIR)/orcallator
-PERL_SCRIPTS = orca upgrade_installation
-SHELL_SCRIPTS =
-TARGETS = $(PERL_SCRIPTS) $(SHELL_SCRIPTS)
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+INSTALL = @INSTALL@
+MKDIR = @MKDIR@
+PERL_HEAD = @PERL_HEAD@
+RRD_DIR = @RRD_DIR@
+VAR_DIR = @VAR_DIR@
+ORCALLATOR_DIR = $(VAR_DIR)/orcallator
+PERL_SCRIPTS = orca \
+ upgrade_installation
+SHELL_SCRIPTS =
+TARGETS = $(PERL_SCRIPTS) $(SHELL_SCRIPTS)
-all: Makefile $(TARGETS)
+all: Makefile $(TARGETS)
install: all
- $(MKDIR) $(bindir)
- @for file in $(TARGETS); do \
- echo $(INSTALL) $$file $(bindir); \
- $(INSTALL) $$file $(bindir); \
- done
+ $(MKDIR) $(bindir)
+ @for file in $(TARGETS); do \
+ echo $(INSTALL) $$file $(bindir); \
+ $(INSTALL) $$file $(bindir); \
+ done
-upgrade: upgrade_installation
- ./upgrade_installation $(prefix) $(exec_prefix) $(bindir) $(libdir) $(ORCALLATOR_DIR) $(RRD_DIR)
+upgrade: upgrade_installation
+ ./upgrade_installation $(prefix) $(exec_prefix) $(bindir) $(libdir) $(ORCALLATOR_DIR) $(RRD_DIR)
clean:
- $(RM) $(TARGETS)
+ $(RM) $(TARGETS)
-distclean: clean
- $(RM) *.sh orca.pl Makefile
+distclean: clean
+ $(RM) *.sh orca.pl Makefile
-.SUFFIXES: .pl .sh
+.SUFFIXES: .pl .sh
-.pl: $(PERL_HEAD)
- cat $(PERL_HEAD) $< > $@
- chmod 0755 $@
+.pl: $(PERL_HEAD)
+ cat $(PERL_HEAD) $< > $@
+ chmod 0755 $@
.sh:
- cp $< $@
- chmod 0755 $@
+ cp $< $@
+ chmod 0755 $@
-Makefile: Makefile.in
- cd .. && CONFIG_FILES=src/Makefile ./config.status
+Makefile: Makefile.in
+ cd .. && CONFIG_FILES=src/Makefile ./config.status
-orca.pl: orca.pl.in
- cd .. && CONFIG_FILES=src/orca.pl ./config.status
+orca.pl: orca.pl.in
+ cd .. && CONFIG_FILES=src/orca.pl ./config.status
Modified: trunk/orca/docs/Makefile.in
==============================================================================
--- trunk/orca/docs/Makefile.in (original)
+++ trunk/orca/docs/Makefile.in 2003-01-04 11:58:00.000000000 -0800
@@ -1,17 +1,19 @@
@SET_MAKE@
-prefix = @prefix@
-mandir = @mandir@/man1
-INSTALL = @INSTALL@
-MKDIR = @MKDIR@
-ORCA = ../src/orca.pl
-POD2HTML = @POD2HTML@
-POD2MAN = @POD2MAN@
-POD2TEXT = @POD2TEXT@
+prefix = @prefix@
+mandir = @mandir@/man1
+INSTALL = @INSTALL@
+MKDIR = @MKDIR@
+ORCA = ../src/orca.pl
+POD2HTML = @POD2HTML@
+POD2MAN = @POD2MAN@
+POD2TEXT = @POD2TEXT@
+
+TARGETS = orca.html \
+ orca.man \
+ orca.txt
-TARGETS = orca.html orca.man orca.txt
-
-all: Makefile $(TARGETS)
+all: Makefile $(TARGETS)
orca.html: $(ORCA)
$(POD2HTML) $(ORCA) > $@
Modified: trunk/orca/contrib/Makefile.in
==============================================================================
--- trunk/orca/contrib/Makefile.in (original)
+++ trunk/orca/contrib/Makefile.in 2003-01-04 11:58:00.000000000 -0800
@@ -1,32 +1,33 @@
@SET_MAKE@
-SUBDIRS = orca_services rotate_orca_graphs
+SUBDIRS = orca_services \
+ rotate_orca_graphs
all: Makefile $(TARGETS)
- @for dir in $(SUBDIRS); do \
- echo "cd $$dir && $(MAKE) CFLAGS=$(CFLAGS)"; \
- (cd $$dir && $(MAKE) CFLAGS="$(CFLAGS)"); \
+ @for dir in $(SUBDIRS); do \
+ echo "cd $$dir && $(MAKE) CFLAGS=$(CFLAGS)"; \
+ (cd $$dir && $(MAKE) CFLAGS="$(CFLAGS)"); \
done
# Users will need to install the contributed programs by hand.
install:
install_contrib:
- @for dir in $(SUBDIRS); do \
- echo "cd $$dir && $(MAKE) CFLAGS=$(CFLAGS) install"; \
- (cd $$dir && $(MAKE) CFLAGS="$(CFLAGS)" 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); \
+ @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); \
+ @for dir in $(SUBDIRS); do \
+ echo "cd $$dir && $(MAKE) CFLAGS=$(CFLAGS) distclean"; \
+ (cd $$dir && $(MAKE) CFLAGS="$(CFLAGS)" distclean); \
done
$(RM) Makefile
Modified: trunk/orca/contrib/orca_services/Makefile.in
==============================================================================
--- trunk/orca/contrib/orca_services/Makefile.in (original)
+++ trunk/orca/contrib/orca_services/Makefile.in 2003-01-04 11:58:00.000000000 -0800
@@ -1,85 +1,88 @@
@SET_MAKE@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-libdir = @libdir@
-INSTALL = @INSTALL@
-MKDIR = @MKDIR@
-PERL_HEAD = @PERL_HEAD@
-VAR_DIR = @VAR_DIR@
-RRD_DIR = @RRD_DIR@
-RRDTOOL_DIR = @RRDTOOL_DIR@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+libdir = @libdir@
+INSTALL = @INSTALL@
+MKDIR = @MKDIR@
+PERL_HEAD = @PERL_HEAD@
+VAR_DIR = @VAR_DIR@
+RRD_DIR = @RRD_DIR@
+RRDTOOL_DIR = @RRDTOOL_DIR@
ORCA_SERVICES_DIR = $(VAR_DIR)/orca_services
-PERL_SCRIPTS = orca_services_running orca_services.pl
-SHELL_SCRIPTS = restart_orca_services stop_orca_services start_orca_services \
- S99orca_services
-TARGETS = $(PERL_SCRIPTS) $(SHELL_SCRIPTS)
+PERL_SCRIPTS = orca_services_running \
+ orca_services.pl
+SHELL_SCRIPTS = restart_orca_services \
+ stop_orca_services \
+ start_orca_services \
+ S99orca_services
+TARGETS = $(PERL_SCRIPTS) $(SHELL_SCRIPTS)
-all: Makefile $(TARGETS) orca_services.cfg
+all: Makefile $(TARGETS) orca_services.cfg
install: all
- $(MKDIR) $(bindir)
- $(MKDIR) $(libdir)
- $(MKDIR) $(RRD_DIR)/orca_services
- @for file in $(TARGETS); do \
- echo $(INSTALL) $$file $(bindir); \
- $(INSTALL) $$file $(bindir); \
- done
- if test -r $(libdir)/orca_services.cfg; then \
- cp -p $(libdir)/orca_services.cfg $(libdir)/orca_services.cfg.`date +%Y-%m-%d-%H:%M:%S`; \
- fi
- $(INSTALL) -m 0644 orca_services.cfg $(libdir)
- $(INSTALL) -m 0755 orca_services.pl $(libdir)
+ $(MKDIR) $(bindir)
+ $(MKDIR) $(libdir)
+ $(MKDIR) $(RRD_DIR)/orca_services
+ @for file in $(TARGETS); do \
+ echo $(INSTALL) $$file $(bindir); \
+ $(INSTALL) $$file $(bindir); \
+ done
+ if test -r $(libdir)/orca_services.cfg; then \
+ cp -p $(libdir)/orca_services.cfg $(libdir)/orca_services.cfg.`date +%Y-%m-%d-%H:%M:%S`; \
+ fi
+ $(INSTALL) -m 0644 orca_services.cfg $(libdir)
+ $(INSTALL) -m 0755 orca_services.pl $(libdir)
orca_services_run_at_boot: all
- -$(RM) /etc/init.d/orca_services /etc/rc0.d/K01orca_services
- -$(RM) /etc/rc1.d/K01orca_services /etc/rc3.d/S99orca_services
- $(INSTALL) -m 0744 S99orca_services /etc/init.d/orca_services
- ln /etc/init.d/orca_services /etc/rc0.d/K01orca_services
- ln /etc/init.d/orca_services /etc/rc1.d/K01orca_services
- ln /etc/init.d/orca_services /etc/rc3.d/S99orca_services
+ -$(RM) /etc/init.d/orca_services /etc/rc0.d/K01orca_services
+ -$(RM) /etc/rc1.d/K01orca_services /etc/rc3.d/S99orca_services
+ $(INSTALL) -m 0744 S99orca_services /etc/init.d/orca_services
+ ln /etc/init.d/orca_services /etc/rc0.d/K01orca_services
+ ln /etc/init.d/orca_services /etc/rc1.d/K01orca_services
+ ln /etc/init.d/orca_services /etc/rc3.d/S99orca_services
clean:
- $(RM) $(TARGETS)
+ $(RM) $(TARGETS)
-distclean: clean
- $(RM) *.sh orca_services.cfg orca_services_running.pl Makefile
+distclean: clean
+ $(RM) *.sh orca_services.cfg orca_services_running.pl Makefile
-.SUFFIXES: .pl .sh
+.SUFFIXES: .pl .sh
-.pl: $(PERL_HEAD)
- cat $(PERL_HEAD) $< > $@
- chmod 0755 $@
+.pl: $(PERL_HEAD)
+ cat $(PERL_HEAD) $< > $@
+ chmod 0755 $@
.sh:
- cp $< $@
- chmod 0755 $@
+ cp $< $@
+ chmod 0755 $@
-Makefile: Makefile.in
- cd ../.. && CONFIG_FILES=contrib/orca_services/Makefile ./config.status
- $(MAKE)
+Makefile: Makefile.in
+ cd ../.. && CONFIG_FILES=contrib/orca_services/Makefile ./config.status
+ $(MAKE)
-orca_services.cfg: orca_services.cfg.in
- cd ../.. && CONFIG_FILES=contrib/orca_services/orca_services.cfg ./config.status
+orca_services.cfg: orca_services.cfg.in
+ cd ../.. && CONFIG_FILES=contrib/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
- cat $(PERL_HEAD) orca_services.pl > orca_services.perl
- mv orca_services.perl orca_services.pl
- chmod 0755 orca_services.pl
+orca_services.pl: orca_services.pl.in $(PERL_HEAD)
+ cd ../.. && CONFIG_FILES=contrib/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
+orca_services_running.pl: orca_services_running.pl.in
+ cd ../.. && CONFIG_FILES=contrib/contrib/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
+restart_orca_services.sh: restart_orca_services.sh.in
+ cd ../.. && CONFIG_FILES=contrib/contrib/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
+start_orca_services.sh: start_orca_services.sh.in
+ cd ../.. && CONFIG_FILES=contrib/contrib/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
+stop_orca_services.sh: stop_orca_services.sh.in
+ cd ../.. && CONFIG_FILES=contrib/contrib/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
+S99orca_services.sh: S99orca_services.sh.in
+ cd ../.. && CONFIG_FILES=contrib/contrib/orca_services/S99orca_services.sh ./config.status
Modified: trunk/orca/orcallator/Makefile.in
==============================================================================
--- trunk/orca/orcallator/Makefile.in (original)
+++ trunk/orca/orcallator/Makefile.in 2003-01-04 11:58:00.000000000 -0800
@@ -1,76 +1,80 @@
@SET_MAKE@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-libdir = @libdir@
-INSTALL = @INSTALL@
-MKDIR = @MKDIR@
-PERL_HEAD = @PERL_HEAD@
-VAR_DIR = @VAR_DIR@
-RRD_DIR = @RRD_DIR@
-RRDTOOL_DIR = @RRDTOOL_DIR@
-PERL_SCRIPTS = orcallator_column orcallator_running
-SHELL_SCRIPTS = restart_orcallator stop_orcallator start_orcallator \
- S99orcallator
-TARGETS = $(PERL_SCRIPTS) $(SHELL_SCRIPTS)
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+libdir = @libdir@
+INSTALL = @INSTALL@
+MKDIR = @MKDIR@
+PERL_HEAD = @PERL_HEAD@
+VAR_DIR = @VAR_DIR@
+RRD_DIR = @RRD_DIR@
+RRDTOOL_DIR = @RRDTOOL_DIR@
+ORCALLATOR_DIR = $(VAR_DIR)/orcallator
+PERL_SCRIPTS = orcallator_column \
+ orcallator_running
+SHELL_SCRIPTS = restart_orcallator \
+ stop_orcallator \
+ start_orcallator \
+ S99orcallator
+TARGETS = $(PERL_SCRIPTS) $(SHELL_SCRIPTS)
-all: Makefile $(TARGETS) orcallator.cfg
+all: Makefile $(TARGETS) orcallator.cfg
install: all
- $(MKDIR) $(bindir)
- $(MKDIR) $(libdir)
- @for file in $(TARGETS); do \
- echo $(INSTALL) $$file $(bindir); \
- $(INSTALL) $$file $(bindir); \
- done
- if test -r $(libdir)/orcallator.cfg; then \
- cp -p $(libdir)/orcallator.cfg $(libdir)/orcallator.cfg.`date +%Y-%m-%d-%H:%M:%S`; \
- fi
- $(INSTALL) -m 0644 orcallator.cfg $(libdir)
- $(INSTALL) -m 0644 orcallator.se $(libdir)
+ $(MKDIR) $(bindir)
+ $(MKDIR) $(libdir)
+ @for file in $(TARGETS); do \
+ echo $(INSTALL) $$file $(bindir); \
+ $(INSTALL) $$file $(bindir); \
+ done
+ if test -r $(libdir)/orcallator.cfg; then \
+ cp -p $(libdir)/orcallator.cfg $(libdir)/orcallator.cfg.`date +%Y-%m-%d-%H:%M:%S`; \
+ fi
+ $(INSTALL) -m 0644 orcallator.cfg $(libdir)
+ $(INSTALL) -m 0644 orcallator.se $(libdir)
orcallator_run_at_boot: all
- -$(RM) /etc/init.d/orcallator /etc/rc0.d/K01orcallator
- -$(RM) /etc/rc1.d/K01orcallator /etc/rc3.d/S99orcallator
- $(INSTALL) -m 0744 S99orcallator /etc/init.d/orcallator
- ln /etc/init.d/orcallator /etc/rc0.d/K01orcallator
- ln /etc/init.d/orcallator /etc/rc1.d/K01orcallator
- ln /etc/init.d/orcallator /etc/rc3.d/S99orcallator
+ -$(RM) /etc/init.d/orcallator /etc/rc0.d/K01orcallator
+ -$(RM) /etc/rc1.d/K01orcallator /etc/rc3.d/S99orcallator
+ $(INSTALL) -m 0744 S99orcallator /etc/init.d/orcallator
+ ln /etc/init.d/orcallator /etc/rc0.d/K01orcallator
+ ln /etc/init.d/orcallator /etc/rc1.d/K01orcallator
+ ln /etc/init.d/orcallator /etc/rc3.d/S99orcallator
clean:
- $(RM) $(TARGETS)
+ $(RM) $(TARGETS)
-distclean: clean
- $(RM) *.sh orcallator.cfg orcallator_running.pl Makefile
+distclean: clean
+ $(RM) *.sh orcallator.cfg orcallator_running.pl Makefile
-.SUFFIXES: .pl .sh
+.SUFFIXES: .pl .sh
-.pl: $(PERL_HEAD)
- cat $(PERL_HEAD) $< > $@
- chmod 0755 $@
+.pl: $(PERL_HEAD)
+ cat $(PERL_HEAD) $< > $@
+ chmod 0755 $@
.sh:
- cp $< $@
- chmod 0755 $@
+ cp $< $@
+ chmod 0755 $@
-Makefile: Makefile.in
- cd .. && CONFIG_FILES=orcallator/Makefile ./config.status
+Makefile: Makefile.in
+ cd .. && CONFIG_FILES=orcallator/Makefile ./config.status
-orcallator.cfg: orcallator.cfg.in
- cd .. && CONFIG_FILES=orcallator/orcallator.cfg ./config.status
+orcallator.cfg: orcallator.cfg.in
+ cd .. && CONFIG_FILES=orcallator/orcallator.cfg ./config.status
-orcallator_running.pl: orcallator_running.pl.in
- cd .. && CONFIG_FILES=orcallator/orcallator_running.pl ./config.status
+orcallator_running.pl: orcallator_running.pl.in
+ cd .. && CONFIG_FILES=orcallator/orcallator_running.pl ./config.status
-restart_orcallator.sh: restart_orcallator.sh.in
- cd .. && CONFIG_FILES=orcallator/restart_orcallator.sh ./config.status
+restart_orcallator.sh: restart_orcallator.sh.in
+ cd .. && CONFIG_FILES=orcallator/restart_orcallator.sh ./config.status
-start_orcallator.sh: start_orcallator.sh.in
- cd .. && CONFIG_FILES=orcallator/start_orcallator.sh ./config.status
+start_orcallator.sh: start_orcallator.sh.in
+ cd .. && CONFIG_FILES=orcallator/start_orcallator.sh ./config.status
-stop_orcallator.sh: stop_orcallator.sh.in
- cd .. && CONFIG_FILES=orcallator/stop_orcallator.sh ./config.status
+stop_orcallator.sh: stop_orcallator.sh.in
+ cd .. && CONFIG_FILES=orcallator/stop_orcallator.sh ./config.status
-S99orcallator.sh: S99orcallator.sh.in
- cd .. && CONFIG_FILES=orcallator/S99orcallator.sh ./config.status
+S99orcallator.sh: S99orcallator.sh.in
+ cd .. && CONFIG_FILES=orcallator/S99orcallator.sh ./config.status
Modified: trunk/orca/lib/Makefile.in
==============================================================================
--- trunk/orca/lib/Makefile.in (original)
+++ trunk/orca/lib/Makefile.in 2003-01-04 11:58:00.000000000 -0800
@@ -1,15 +1,15 @@
@SET_MAKE@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-libdir = @libdir@
-INSTALL = @INSTALL@
-MKDIR = @MKDIR@
-
-all: Makefile \
- orca_logo.gif.hex \
- rrdtool_logo.gif.hex \
- rothschild_image_logo.png.hex
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+libdir = @libdir@
+INSTALL = @INSTALL@
+MKDIR = @MKDIR@
+
+all: Makefile \
+ orca_logo.gif.hex \
+ rrdtool_logo.gif.hex \
+ rothschild_image_logo.png.hex
# Create a hex file representation of orca_logo.gif that can be stored
# inside orca.pl.
@@ -28,16 +28,16 @@
install: all
$(MKDIR) $(libdir)/Orca
- @for f in Orca/*.pm; do \
- $(INSTALL) -m 0644 $$f $(libdir)/Orca; \
- echo $(INSTALL) -m 0644 $$f $(libdir)/Orca; \
+ @for f in Orca/*.pm; do \
+ $(INSTALL) -m 0644 $$f $(libdir)/Orca; \
+ echo $(INSTALL) -m 0644 $$f $(libdir)/Orca; \
done
- @if test -d Orca/Config; then \
- $(MKDIR) $(libdir)/Orca/Config; \
- for f in Orca/Config/*.pm; do \
- $(INSTALL) -m 0644 $$f $(libdir)/Orca/Config; \
- echo $(INSTALL) -m 0644 $$f $(libdir)/Orca/Config; \
- done; \
+ @if test -d Orca/Config; then \
+ $(MKDIR) $(libdir)/Orca/Config; \
+ for f in Orca/Config/*.pm; do \
+ $(INSTALL) -m 0644 $$f $(libdir)/Orca/Config; \
+ echo $(INSTALL) -m 0644 $$f $(libdir)/Orca/Config; \
+ done; \
fi
clean:
Modified: trunk/orca/packages/Makefile.in
==============================================================================
--- trunk/orca/packages/Makefile.in (original)
+++ trunk/orca/packages/Makefile.in 2003-01-04 11:58:00.000000000 -0800
@@ -1,65 +1,95 @@
@SET_MAKE@
-PERL = @PERL@
-CFLAGS = @CFLAGS@
+PERL = @PERL@
+CFLAGS = @CFLAGS@
-compress_zlib_dir = @COMPRESS_ZLIB_DIR@
-data_dumper_dir = @DATA_DUMPER_DIR@
-date_parse_dir = @DATE_PARSE_DIR@
-digest_md5_dir = @DIGEST_MD5_DIR@
-math_intervalsearch_dir = @MATH_INTERVALSEARCH_DIR@
-rrdtool_dir = @RRDTOOL_DIR@
-storable_dir = @STORABLE_DIR@
-
-MAKE_COMPRESS_ZLIB = @MAKE_COMPRESS_ZLIB@
-MAKE_DATA_DUMPER = @MAKE_DATA_DUMPER@
-MAKE_DATE_PARSE = @MAKE_DATE_PARSE@
-MAKE_DIGEST_MD5 = @MAKE_DIGEST_MD5@
-MAKE_MATH_INTERVALSEARCH = @MAKE_MATH_INTERVALSEARCH@
-MAKE_RRDTOOL = @MAKE_RRDTOOL@
-MAKE_STORABLE = @MAKE_STORABLE@
-MAKE_TARGETS = $(MAKE_COMPRESS_ZLIB) $(MAKE_DATA_DUMPER) $(MAKE_DATE_PARSE) $(MAKE_DIGEST_MD5) $(MAKE_MATH_INTERVALSEARCH) $(MAKE_RRDTOOL) $(MAKE_STORABLE)
-
-TEST_COMPRESS_ZLIB = @TEST_COMPRESS_ZLIB@
-TEST_DATA_DUMPER = @TEST_DATA_DUMPER@
-TEST_DATE_PARSE = @TEST_DATE_PARSE@
-TEST_DIGEST_MD5 = @TEST_DIGEST_MD5@
-TEST_MATH_INTERVALSEARCH = @TEST_MATH_INTERVALSEARCH@
-TEST_RRDTOOL = @TEST_RRDTOOL@
-TEST_STORABLE = @TEST_STORABLE@
-TEST_TARGETS = $(TEST_COMPRESS_ZLIB) $(TEST_DATA_DUMPER) $(TEST_DATE_PARSE) $(TEST_DIGEST_MD5) $(TEST_MATH_INTERVALSEARCH) $(TEST_RRDTOOL) $(TEST_STORABLE)
-
-INSTALL_PERL_COMPRESS_ZLIB = @INSTALL_PERL_COMPRESS_ZLIB@
-INSTALL_PERL_DATA_DUMPER = @INSTALL_PERL_DATA_DUMPER@
-INSTALL_PERL_DATE_PARSE = @INSTALL_PERL_DATE_PARSE@
-INSTALL_PERL_DIGEST_MD5 = @INSTALL_PERL_DIGEST_MD5@
-INSTALL_PERL_MATH_INTERVALSEARCH= @INSTALL_PERL_MATH_INTERVALSEARCH@
-INSTALL_PERL_RRDTOOL = @INSTALL_PERL_RRDTOOL@
-INSTALL_PERL_STORABLE = @INSTALL_PERL_STORABLE@
-INSTALL_PERL_TARGETS = $(INSTALL_PERL_COMPRESS_ZLIB) $(INSTALL_PERL_DATA_DUMPER) $(INSTALL_PERL_DATE_PARSE) $(INSTALL_PERL_DIGEST_MD5) $(INSTALL_PERL_MATH_INTERVALSEARCH) $(INSTALL_PERL_RRDTOOL) $(INSTALL_PERL_STORABLE)
-
-INSTALL_LIB_RRDTOOL = @INSTALL_LIB_RRDTOOL@
-INSTALL_LIB_TARGETS = $(INSTALL_LIB_RRDTOOL)
-
-CLEAN_COMPRESS_ZLIB = @CLEAN_COMPRESS_ZLIB@
-CLEAN_DATA_DUMPER = @CLEAN_DATA_DUMPER@
-CLEAN_DATE_PARSE = @CLEAN_DATE_PARSE@
-CLEAN_DIGEST_MD5 = @CLEAN_DIGEST_MD5@
-CLEAN_MATH_INTERVALSEARCH = @CLEAN_MATH_INTERVALSEARCH@
-CLEAN_RRDTOOL = @CLEAN_RRDTOOL@
-CLEAN_STORABLE = @CLEAN_STORABLE@
-CLEAN_TARGETS = $(CLEAN_COMPRESS_ZLIB) $(CLEAN_DATA_DUMPER) $(CLEAN_DATE_PARSE) $(CLEAN_DIGEST_MD5) $(CLEAN_MATH_INTERVALSEARCH) $(CLEAN_RRDTOOL) $(CLEAN_STORABLE)
-
-DISTCLEAN_COMPRESS_ZLIB = @DISTCLEAN_COMPRESS_ZLIB@
-DISTCLEAN_DATA_DUMPER = @DISTCLEAN_DATA_DUMPER@
-DISTCLEAN_DATE_PARSE = @DISTCLEAN_DATE_PARSE@
-DISTCLEAN_DIGEST_MD5 = @DISTCLEAN_DIGEST_MD5@
-DISTCLEAN_MATH_INTERVALSEARCH = @DISTCLEAN_MATH_INTERVALSEARCH@
-DISTCLEAN_RRDTOOL = @DISTCLEAN_RRDTOOL@
-DISTCLEAN_STORABLE = @DISTCLEAN_STORABLE@
-DISTCLEAN_TARGETS = $(DISTCLEAN_COMPRESS_ZLIB) $(DISTCLEAN_DATA_DUMPER) $(DISTCLEAN_DATE_PARSE) $(DISTCLEAN_DIGEST_MD5) $(DISTCLEAN_MATH_INTERVALSEARCH) $(DISTCLEAN_RRDTOOL) $(DISTCLEAN_STORABLE)
+compress_zlib_dir = @COMPRESS_ZLIB_DIR@
+data_dumper_dir = @DATA_DUMPER_DIR@
+date_parse_dir = @DATE_PARSE_DIR@
+digest_md5_dir = @DIGEST_MD5_DIR@
+math_intervalsearch_dir = @MATH_INTERVALSEARCH_DIR@
+rrdtool_dir = @RRDTOOL_DIR@
+storable_dir = @STORABLE_DIR@
+
+MAKE_COMPRESS_ZLIB = @MAKE_COMPRESS_ZLIB@
+MAKE_DATA_DUMPER = @MAKE_DATA_DUMPER@
+MAKE_DATE_PARSE = @MAKE_DATE_PARSE@
+MAKE_DIGEST_MD5 = @MAKE_DIGEST_MD5@
+MAKE_MATH_INTERVALSEARCH = @MAKE_MATH_INTERVALSEARCH@
+MAKE_RRDTOOL = @MAKE_RRDTOOL@
+MAKE_STORABLE = @MAKE_STORABLE@
+MAKE_TARGETS = $(MAKE_COMPRESS_ZLIB) \
+ $(MAKE_DATA_DUMPER) \
+ $(MAKE_DATE_PARSE) \
+ $(MAKE_DIGEST_MD5) \
+ $(MAKE_MATH_INTERVALSEARCH) \
+ $(MAKE_RRDTOOL) \
+ $(MAKE_STORABLE)
+
+TEST_COMPRESS_ZLIB = @TEST_COMPRESS_ZLIB@
+TEST_DATA_DUMPER = @TEST_DATA_DUMPER@
+TEST_DATE_PARSE = @TEST_DATE_PARSE@
+TEST_DIGEST_MD5 = @TEST_DIGEST_MD5@
+TEST_MATH_INTERVALSEARCH = @TEST_MATH_INTERVALSEARCH@
+TEST_RRDTOOL = @TEST_RRDTOOL@
+TEST_STORABLE = @TEST_STORABLE@
+TEST_TARGETS = $(TEST_COMPRESS_ZLIB) \
+ $(TEST_DATA_DUMPER) \
+ $(TEST_DATE_PARSE) \
+ $(TEST_DIGEST_MD5) \
+ $(TEST_MATH_INTERVALSEARCH) \
+ $(TEST_RRDTOOL) \
+ $(TEST_STORABLE)
+
+INSTALL_PERL_COMPRESS_ZLIB = @INSTALL_PERL_COMPRESS_ZLIB@
+INSTALL_PERL_DATA_DUMPER = @INSTALL_PERL_DATA_DUMPER@
+INSTALL_PERL_DATE_PARSE = @INSTALL_PERL_DATE_PARSE@
+INSTALL_PERL_DIGEST_MD5 = @INSTALL_PERL_DIGEST_MD5@
+INSTALL_PERL_MATH_INTERVALSEARCH = @INSTALL_PERL_MATH_INTERVALSEARCH@
+INSTALL_PERL_RRDTOOL = @INSTALL_PERL_RRDTOOL@
+INSTALL_PERL_STORABLE = @INSTALL_PERL_STORABLE@
+INSTALL_PERL_TARGETS = $(INSTALL_PERL_COMPRESS_ZLIB) \
+ $(INSTALL_PERL_DATA_DUMPER) \
+ $(INSTALL_PERL_DATE_PARSE) \
+ $(INSTALL_PERL_DIGEST_MD5) \
+ $(INSTALL_PERL_MATH_INTERVALSEARCH) \
+ $(INSTALL_PERL_RRDTOOL) \
+ $(INSTALL_PERL_STORABLE)
+
+INSTALL_LIB_RRDTOOL = @INSTALL_LIB_RRDTOOL@
+INSTALL_LIB_TARGETS = $(INSTALL_LIB_RRDTOOL)
+
+CLEAN_COMPRESS_ZLIB = @CLEAN_COMPRESS_ZLIB@
+CLEAN_DATA_DUMPER = @CLEAN_DATA_DUMPER@
+CLEAN_DATE_PARSE = @CLEAN_DATE_PARSE@
+CLEAN_DIGEST_MD5 = @CLEAN_DIGEST_MD5@
+CLEAN_MATH_INTERVALSEARCH = @CLEAN_MATH_INTERVALSEARCH@
+CLEAN_RRDTOOL = @CLEAN_RRDTOOL@
+CLEAN_STORABLE = @CLEAN_STORABLE@
+CLEAN_TARGETS = $(CLEAN_COMPRESS_ZLIB) \
+ $(CLEAN_DATA_DUMPER) \
+ $(CLEAN_DATE_PARSE) \
+ $(CLEAN_DIGEST_MD5) \
+ $(CLEAN_MATH_INTERVALSEARCH) \
+ $(CLEAN_RRDTOOL) \
+ $(CLEAN_STORABLE)
+
+DISTCLEAN_COMPRESS_ZLIB = @DISTCLEAN_COMPRESS_ZLIB@
+DISTCLEAN_DATA_DUMPER = @DISTCLEAN_DATA_DUMPER@
+DISTCLEAN_DATE_PARSE = @DISTCLEAN_DATE_PARSE@
+DISTCLEAN_DIGEST_MD5 = @DISTCLEAN_DIGEST_MD5@
+DISTCLEAN_MATH_INTERVALSEARCH = @DISTCLEAN_MATH_INTERVALSEARCH@
+DISTCLEAN_RRDTOOL = @DISTCLEAN_RRDTOOL@
+DISTCLEAN_STORABLE = @DISTCLEAN_STORABLE@
+DISTCLEAN_TARGETS = $(DISTCLEAN_COMPRESS_ZLIB) \
+ $(DISTCLEAN_DATA_DUMPER) \
+ $(DISTCLEAN_DATE_PARSE) \
+ $(DISTCLEAN_DIGEST_MD5) \
+ $(DISTCLEAN_MATH_INTERVALSEARCH) \
+ $(DISTCLEAN_RRDTOOL) \
+ $(DISTCLEAN_STORABLE)
-all: Makefile $(MAKE_TARGETS)
+all: Makefile $(MAKE_TARGETS)
make_compress_zlib: make_rrdtool_zlib $(compress_zlib_dir)/Makefile
cd $(compress_zlib_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)"
@@ -165,61 +195,61 @@
clean: $(CLEAN_TARGETS)
clean_compress_zlib: clean_rrdtool
- @if test -r $(compress_zlib_dir)/Makefile; then \
- echo 'cd $(compress_zlib_dir) && $(MAKE) clean'; \
- (cd $(compress_zlib_dir) && $(MAKE) clean); \
+ @if test -r $(compress_zlib_dir)/Makefile; then \
+ echo 'cd $(compress_zlib_dir) && $(MAKE) clean'; \
+ (cd $(compress_zlib_dir) && $(MAKE) clean); \
fi
clean_data_dumper:
- @if test -r $(data_dumper_dir)/Makefile; then \
- echo 'cd $(data_dumper_dir) && $(MAKE) clean'; \
- (cd $(data_dumper_dir) && $(MAKE) clean); \
+ @if test -r $(data_dumper_dir)/Makefile; then \
+ echo 'cd $(data_dumper_dir) && $(MAKE) clean'; \
+ (cd $(data_dumper_dir) && $(MAKE) clean); \
fi
clean_date_parse:
- @if test -r $(date_parse_dir)/Makefile; then \
- echo 'cd $(date_parse_dir) && $(MAKE) clean'; \
- (cd $(date_parse_dir) && $(MAKE) clean); \
+ @if test -r $(date_parse_dir)/Makefile; then \
+ echo 'cd $(date_parse_dir) && $(MAKE) clean'; \
+ (cd $(date_parse_dir) && $(MAKE) clean); \
fi
clean_digest_md5:
- @if test -r $(digest_md5_dir)/Makefile; then \
- echo 'cd $(digest_md5_dir) && $(MAKE) clean'; \
- (cd $(digest_md5_dir) && $(MAKE) clean); \
+ @if test -r $(digest_md5_dir)/Makefile; then \
+ echo 'cd $(digest_md5_dir) && $(MAKE) clean'; \
+ (cd $(digest_md5_dir) && $(MAKE) clean); \
fi
clean_math_intervalsearch:
- @if test -r $(math_intervalsearch_dir)/Makefile; then \
- echo 'cd $(math_intervalsearch_dir) && $(MAKE) clean'; \
- (cd $(math_intervalsearch_dir) && $(MAKE) clean); \
+ @if test -r $(math_intervalsearch_dir)/Makefile; then \
+ echo 'cd $(math_intervalsearch_dir) && $(MAKE) clean'; \
+ (cd $(math_intervalsearch_dir) && $(MAKE) clean); \
fi
clean_rrdtool:
(cd $(rrdtool_dir) && $(MAKE) clean)
clean_storable:
- @if test -r $(storable_dir)/Makefile; then \
- echo 'cd $(storable_dir) && $(MAKE) clean'; \
- (cd $(storable_dir) && $(MAKE) clean); \
+ @if test -r $(storable_dir)/Makefile; then \
+ echo 'cd $(storable_dir) && $(MAKE) clean'; \
+ (cd $(storable_dir) && $(MAKE) clean); \
fi
distclean: $(DISTCLEAN_TARGETS)
$(RM) Makefile
-distclean_compress_zlib: clean_compress_zlib
+distclean_compress_zlib: clean_compress_zlib
-distclean_data_dumper: clean_data_dumper
+distclean_data_dumper: clean_data_dumper
-distclean_date_parse: clean_date_parse
+distclean_date_parse: clean_date_parse
-distclean_digest_md5: clean_digest_md5
+distclean_digest_md5: clean_digest_md5
-distclean_math_intervalsearch: clean_math_intervalsearch
+distclean_math_intervalsearch: clean_math_intervalsearch
-distclean_rrdtool: clean_rrdtool
+distclean_rrdtool: clean_rrdtool
cd $(rrdtool_dir) && $(MAKE) distclean
-distclean_storable: clean_storable
+distclean_storable: clean_storable
Makefile: Makefile.in
cd .. && CONFIG_FILES=packages/Makefile ./config.status
More information about the Orca-checkins
mailing list