Index: trunk/Ohana/src/opihi/Makefile
===================================================================
--- trunk/Ohana/src/opihi/Makefile	(revision 4693)
+++ trunk/Ohana/src/opihi/Makefile	(revision 4747)
@@ -14,5 +14,5 @@
 pcontrol: lib.data lib.shell cmd.basic
 
-LIBS = cmd.basic cmd.data cmd.astro lib.data lib.shell
+LIBS = lib.data lib.shell cmd.basic cmd.data cmd.astro
 
 PROGRAM = mana dvo
@@ -25,4 +25,7 @@
 	for i in $(PROGRAM); do make $$i || exit; done
 
+libs:
+	for i in $(LIBS); do make $$i || exit; done
+
 extras:
 	for i in $(EXTRAS); do make $$i || exit; done
@@ -31,5 +34,5 @@
 	for i in $(PROGRAM); do make $$i.install || exit; done
 
-extra-install:
+extras-install:
 	for i in $(EXTRAS); do make $$i.install || exit; done
 
@@ -37,7 +40,11 @@
 	for i in $(PROGRAM) $(EXTRAS) $(LIBS); do make $$i.clean || exit; done
 
+libs-uninstall:
+	for i in $(LIBS); do make $$i.uninstall || exit; done
+
 dist: clean
-	rm -f bin/*.*
-	rm -f lib/*.a
+	for i in $(PROGRAM) $(EXTRAS) $(LIBS); do make $$i.dist || exit; done
+	rm -rf bin
+	rm -rf lib
 
 #############################################################
@@ -53,4 +60,10 @@
 	if [ -d "$*" ]; then (cd $* && make clean); fi
 
+%.dist:
+	if [ -d "$*" ]; then (cd $* && make dist); fi
+
+%.uninstall:
+	if [ -d "$*" ]; then (cd $* && make uninstall); fi
+
 .PHONY: $(PROGRAM) $(LIBS)