Index: /trunk/Ohana/Makefile
===================================================================
--- /trunk/Ohana/Makefile	(revision 2614)
+++ /trunk/Ohana/Makefile	(revision 2615)
@@ -51,5 +51,5 @@
 
 # any of these programs can be built with 'make (name)' 
-OTHER =     \
+EXTRAS =     \
 opihi.v2    \
 addusno     \
@@ -80,11 +80,14 @@
 
 all:
-	for i in $(LIBS-$(ARCH)); do make $$i.install || exit; done
+	make libs || exit
 	for i in $(PROGRAM); do make $$i || exit; done
-	for i in $(EXTRA); do make $$i || exit; done
+
+extras:
+	for i in $(EXTRAS); do make $$i || exit; done
 
 clean:
 	for i in $(LIBS-$(ARCH)); do make $$i.clean || exit; done
 	for i in $(PROGRAM); do make $$i.clean || exit; done
+	for i in $(EXTRAS); do make $$i.clean || exit; done
 
 dist:
@@ -96,6 +99,9 @@
 	for i in $(PROGRAM); do make $$i.install || exit; done
 
+install.extras:
+	for i in $(EXTRAS); do make $$i.install || exit; done
+
 # standard rules: targets are foo, foo.clean, foo.install, foo.dist
-$(PROGRAM) $(LIBS-$(ARCH)) $(OTHER): 
+$(PROGRAM) $(LIBS-$(ARCH)) $(EXTRAS): 
 	if [ -e "src/$@" ]; then (cd src/$@ && make); fi
 
Index: /trunk/Ohana/src/opihi/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/Makefile	(revision 2614)
+++ /trunk/Ohana/src/opihi/Makefile	(revision 2615)
@@ -14,8 +14,13 @@
 LIBS = cmd.basic cmd.data cmd.astro lib.data lib.shell
 
-PROGRAM = mana dvo dvo2 sched dimm 
+PROGRAM = mana dvo
+
+EXTRAS = dvo2 sched dimm
 
 all:
 	for i in $(PROGRAM); do make $$i || exit; done
+
+extras:
+	for i in $(EXTRAS); do make $$i || exit; done
 
 install:
@@ -27,5 +32,5 @@
 #############################################################
 
-$(PROGRAM) $(LIBS):
+$(PROGRAM) $(LIBS) $(EXTRAS):
 	if [ -e "$@" ]; then (cd $@ && make); fi
 
