[Orca-checkins] r446 - in trunk/orca: contrib contrib/rotate_orca_graphs data_gatherers data_gatherers/aix data_gatherers/hp data_gatherers/orca_services data_gatherers/orcallator data_gatherers/procallator data_gatherers/winallator docs lib orca packages

blair at orcaware.com blair at orcaware.com
Wed May 4 12:38:59 PDT 2005


Author: blair at orcaware.com
Date: Wed May  4 12:38:03 2005
New Revision: 446

Modified:
   trunk/orca/contrib/Makefile.in
   trunk/orca/contrib/rotate_orca_graphs/Makefile.in
   trunk/orca/data_gatherers/Makefile.in
   trunk/orca/data_gatherers/aix/Makefile.in
   trunk/orca/data_gatherers/hp/Makefile.in
   trunk/orca/data_gatherers/orca_services/Makefile.in
   trunk/orca/data_gatherers/orcallator/Makefile.in
   trunk/orca/data_gatherers/procallator/Makefile.in
   trunk/orca/data_gatherers/winallator/Makefile.in
   trunk/orca/docs/Makefile.in
   trunk/orca/lib/Makefile.in
   trunk/orca/orca/Makefile.in
   trunk/orca/packages/Makefile.in
Log:
Continue to bring Orca's Makefile.in's more in line with how GNU
packages work.  Add check targets to all 'make check' to work, but
most of the time, do nothing.

* contrib/Makefile.in:
  Also pass $(CC) down to the subdirectories.
  Use the same rule for the all and check targets.
  When the install target is run, output a message that
    'make install_contrib' should be run.
  Simplify the clean and distclean rules.
  Add a test target that depends on the check target.

* data_gatherers/Makefile.in:
  Also pass $(CC) down to the subdirectories.

* contrib/rotate_orca_graphs/Makefile.in,
* data_gatherers/aix/Makefile.in,
* data_gatherers/hp/Makefile.in,
* data_gatherers/Makefile.in,
* data_gatherers/orcallator/Makefile.in,
* data_gatherers/orca_services/Makefile.in,
* data_gatherers/procallator/Makefile.in,
* data_gatherers/winallator/Makefile.in,
* docs/Makefile.in,
* lib/Makefile.in,
* orca/Makefile.in:
  Add a check target that does nothing and a test target that depends
    upon the check target.

* packages/Makefile.in:
  Have the test target depend upon the check target.


Modified: trunk/orca/contrib/Makefile.in
==============================================================================
--- trunk/orca/contrib/Makefile.in	(original)
+++ trunk/orca/contrib/Makefile.in	Wed May  4 12:38:03 2005
@@ -1,34 +1,45 @@
 @SET_MAKE@
 
+CC                    = @CC@
+CFLAGS                = @CFLAGS@
+
 SUBDIRS               = rotate_orca_graphs
 
-all:	Makefile $(TARGETS)
-	@for dir in $(SUBDIRS); do \
-	  echo "cd $$dir && $(MAKE) CFLAGS=$(CFLAGS)"; \
-	  (cd $$dir && $(MAKE) CFLAGS="$(CFLAGS)"); \
+ORCA_MAKE_DEFINES     = CC='$(CC)' CFLAGS='$(CFLAGS)'
+
+all check: Makefile
+	@for subdir in $(SUBDIRS); do \
+	  echo making $@ in $$subdir; \
+	  (cd $$subdir && $(MAKE) $(ORCA_MAKE_DEFINES) $@) || exit 1; \
 	done
 
+test: check
+
 # Users will need to install the contributed programs by hand.
 install:
+	@echo "Run make install_contrib to install contributed packages"
 
 install_contrib:
-	@for dir in $(SUBDIRS); do \
-	  echo "cd $$dir && $(MAKE) CFLAGS=$(CFLAGS) install"; \
-	  (cd $$dir && $(MAKE) CFLAGS="$(CFLAGS)" install); \
+	@for subdir in $(SUBDIRS); do \
+	  echo making install in $$subdir; \
+	  (cd $$subdir && $(MAKE) $(ORCA_MAKE_DEFINES) install) || exit 1; \
 	done
 
-clean:
-	@for dir in $(SUBDIRS); do \
-	  echo "cd $$dir && $(MAKE) CFLAGS=$(CFLAGS) clean"; \
-	  (cd $$dir && $(MAKE) CFLAGS="$(CFLAGS)" clean); \
-	done
+clean: clean-recursive clean-local
 
-distclean: clean
-	@for dir in $(SUBDIRS); do \
-	  echo "cd $$dir && $(MAKE) CFLAGS=$(CFLAGS) distclean"; \
-	  (cd $$dir && $(MAKE) CFLAGS="$(CFLAGS)" distclean); \
-	done
+distclean: distclean-recursive distclean-local
+
+clean-local:
+
+distclean-local: clean-local
 	$(RM) Makefile
 
+clean-recursive distclean-recursive:
+	@for subdir in $(SUBDIRS); do \
+	  target=`echo $@ | sed 's/-recursive//'`; \
+	  echo making $$target in $$subdir; \
+	  (cd $$subdir && $(MAKE) $$target) || exit 1; \
+	done
+
 Makefile: Makefile.in
 	cd .. && CONFIG_FILES=contrib/Makefile ./config.status

Modified: trunk/orca/contrib/rotate_orca_graphs/Makefile.in
==============================================================================
--- trunk/orca/contrib/rotate_orca_graphs/Makefile.in	(original)
+++ trunk/orca/contrib/rotate_orca_graphs/Makefile.in	Wed May  4 12:38:03 2005
@@ -8,6 +8,10 @@
 
 all:	Makefile $(TARGETS)
 
+check:
+
+test: check
+
 Makefile: Makefile.in
 	cd ../.. && CONFIG_FILES=contrib/rotate_orca_graphs/Makefile ./config.status
 

Modified: trunk/orca/data_gatherers/Makefile.in
==============================================================================
--- trunk/orca/data_gatherers/Makefile.in	(original)
+++ trunk/orca/data_gatherers/Makefile.in	Wed May  4 12:38:03 2005
@@ -1,5 +1,8 @@
 @SET_MAKE@
 
+CC                    = @CC@
+CFLAGS                = @CFLAGS@
+
 AIXALLATOR_SUBDIR     = @AIXALLATOR_SUBDIR@
 HPALLATOR_SUBDIR      = @HPALLATOR_SUBDIR@
 ORCALLATOR_SUBDIR     = @ORCALLATOR_SUBDIR@
@@ -14,7 +17,7 @@
                         $(PROCALLATOR_SUBDIR) \
                         $(WINALLATOR_SUBDIR)
 
-ORCA_MAKE_DEFINES     = CFLAGS='$(CFLAGS)'
+ORCA_MAKE_DEFINES     = CC='$(CC)' CFLAGS='$(CFLAGS)'
 
 all install: Makefile $(TARGETS)
 	@for subdir in $(SUBDIRS); do \
@@ -22,6 +25,10 @@
 	  (cd $$subdir && $(MAKE) $(ORCA_MAKE_DEFINES) $@) || exit 1; \
 	done
 
+check:
+
+test: check
+
 orcallator_run_at_boot:
 	cd orcallator && $(MAKE) orcallator_run_at_boot
 

Modified: trunk/orca/data_gatherers/aix/Makefile.in
==============================================================================
--- trunk/orca/data_gatherers/aix/Makefile.in	(original)
+++ trunk/orca/data_gatherers/aix/Makefile.in	Wed May  4 12:38:03 2005
@@ -33,6 +33,10 @@
 
 all: Makefile $(TARGETS)
 
+check:
+
+test: check
+
 install: all
 	$(MKDIR) $(bindir)
 	@for file in `echo $(BIN_TARGETS)`; do \

Modified: trunk/orca/data_gatherers/hp/Makefile.in
==============================================================================
--- trunk/orca/data_gatherers/hp/Makefile.in	(original)
+++ trunk/orca/data_gatherers/hp/Makefile.in	Wed May  4 12:38:03 2005
@@ -33,6 +33,10 @@
 
 all: Makefile $(TARGETS)
 
+check:
+
+test: check
+
 install: all
 	$(MKDIR) $(bindir)
 	@for file in `echo $(BIN_TARGETS)`; do \

Modified: trunk/orca/data_gatherers/orca_services/Makefile.in
==============================================================================
--- trunk/orca/data_gatherers/orca_services/Makefile.in	(original)
+++ trunk/orca/data_gatherers/orca_services/Makefile.in	Wed May  4 12:38:03 2005
@@ -41,6 +41,10 @@
 
 all: Makefile $(TARGETS) orca_services.cfg
 
+check:
+
+test: check
+
 install: all
 	$(MKDIR) $(bindir)
 	$(MKDIR) $(libexecdir)

Modified: trunk/orca/data_gatherers/orcallator/Makefile.in
==============================================================================
--- trunk/orca/data_gatherers/orcallator/Makefile.in	(original)
+++ trunk/orca/data_gatherers/orcallator/Makefile.in	Wed May  4 12:38:03 2005
@@ -42,6 +42,10 @@
 
 all: Makefile $(TARGETS) orcallator.cfg
 
+check:
+
+test: check
+
 install: all
 	$(MKDIR) $(bindir)
 	$(MKDIR) $(libdir)

Modified: trunk/orca/data_gatherers/procallator/Makefile.in
==============================================================================
--- trunk/orca/data_gatherers/procallator/Makefile.in	(original)
+++ trunk/orca/data_gatherers/procallator/Makefile.in	Wed May  4 12:38:03 2005
@@ -40,6 +40,10 @@
 
 all: Makefile $(TARGETS) procallator.cfg
 
+check:
+
+test: check
+
 install: all
 	$(MKDIR) $(bindir)
 	$(MKDIR) $(RAW_PROCALLATOR_DIR)

Modified: trunk/orca/data_gatherers/winallator/Makefile.in
==============================================================================
--- trunk/orca/data_gatherers/winallator/Makefile.in	(original)
+++ trunk/orca/data_gatherers/winallator/Makefile.in	Wed May  4 12:38:03 2005
@@ -36,6 +36,10 @@
 
 all: Makefile $(TARGETS) winallator.cfg
 
+check:
+
+test: check
+
 install: all
 	$(MKDIR) $(bindir)
 	$(MKDIR) $(libdir)

Modified: trunk/orca/docs/Makefile.in
==============================================================================
--- trunk/orca/docs/Makefile.in	(original)
+++ trunk/orca/docs/Makefile.in	Wed May  4 12:38:03 2005
@@ -24,6 +24,10 @@
 orca.txt: $(ORCA)
 	$(POD2TEXT) $(ORCA) > $@
 
+check:
+
+test: check
+
 install: all
 	$(MKDIR) $(mandir)
 	$(INSTALL) -m 0644 orca.man $(mandir)/orca.1

Modified: trunk/orca/lib/Makefile.in
==============================================================================
--- trunk/orca/lib/Makefile.in	(original)
+++ trunk/orca/lib/Makefile.in	Wed May  4 12:38:03 2005
@@ -27,6 +27,10 @@
 rothschild_image_logo.png.hex: rothschild_image_logo.png
 	$(PERL) -e 'while (sysread(STDIN, $$b, 35)){print unpack("h*", $$b),"\n"}' < $< > $@
 
+check:
+
+test: check
+
 install: all
 	$(MKDIR) $(libdir)/Orca
 	$(MKDIR) $(libdir)/SE/3.2.1

Modified: trunk/orca/orca/Makefile.in
==============================================================================
--- trunk/orca/orca/Makefile.in	(original)
+++ trunk/orca/orca/Makefile.in	Wed May  4 12:38:03 2005
@@ -33,6 +33,10 @@
 
 all: Makefile $(TARGETS)
 
+check:
+
+test: check
+
 install: all
 	$(MKDIR) $(bindir)
 	@for file in $(BIN_TARGETS); do \

Modified: trunk/orca/packages/Makefile.in
==============================================================================
--- trunk/orca/packages/Makefile.in	(original)
+++ trunk/orca/packages/Makefile.in	Wed May  4 12:38:03 2005
@@ -145,7 +145,7 @@
 
 check:
 
-test:
+test: check
 
 test_modules: $(TEST_TARGETS)
 



More information about the Orca-checkins mailing list