Index: /trunk/Ohana/Makefile.in
===================================================================
--- /trunk/Ohana/Makefile.in	(revision 11953)
+++ /trunk/Ohana/Makefile.in	(revision 11954)
@@ -65,19 +65,13 @@
 OLD = mana status addusno addrefs addspphot
 
-# Required libraries depends on the architecture
-LIBS-linux = libtap libohana libfits libdvo libkapa
-LIBS-lin64 = libtap libohana libfits libdvo libkapa
-LIBS-linrh = libtap libohana libfits libdvo libkapa
-LIBS-sid   = libtap libohana libfits libdvo libkapa
-LIBS-sol   = libtap libohana libfits libdvo libkapa 
+LIBS = libtap libohana libfits libdvo libkapa
 
 # general build targets:
 libs:
 	@if [ "$(ARCH)" = "" ]; then echo ""; echo " *** please define ARCH ***"; echo; exit 1; fi
-	@if [ "$(LIBS-$(ARCH))" = "" ]; then echo; echo " *** LIBS-$(ARCH) is missing"; echo; exit 1; fi
 	mkdir -p $(DESTINC)
 	mkdir -p $(DESTLIB)
 	mkdir -p $(DESTBIN)
-	for i in $(LIBS-$(ARCH)); do make $$i.install || exit; done
+	for i in $(LIBS); do make $$i.install || exit; done
 	chmod +x ohana-config
 	cp -f ohana-config $(DESTBIN)/
@@ -113,6 +107,5 @@
 clean:
 	@if [ "$(ARCH)" = "" ]; then echo ""; echo " *** please define ARCH ***"; echo; exit 1; fi
-	@if [ "$(LIBS-$(ARCH))" = "" ]; then echo; echo " *** LIBS-$(ARCH) is missing"; echo; exit 1; fi
-	for i in $(LIBS-$(ARCH)); do make $$i.clean || exit; done
+	for i in $(LIBS); 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
@@ -122,12 +115,10 @@
 dist:
 	@if [ "$(ARCH)" = "" ]; then echo ""; echo " *** please define ARCH ***"; echo; exit 1; fi
-	@if [ "$(LIBS-$(ARCH))" = "" ]; then echo; echo " *** LIBS-$(ARCH) is missing"; echo; exit 1; fi
-	for i in $(LIBS-$(ARCH)); do make $$i.dist || exit; done
+	for i in $(LIBS); do make $$i.dist || exit; done
 	for i in $(PROGRAM); do make $$i.dist || exit; done
 
 install:
 	@if [ "$(ARCH)" = "" ]; then echo ""; echo " *** please define ARCH ***"; echo; exit 1; fi
-	@if [ "$(LIBS-$(ARCH))" = "" ]; then echo; echo " *** LIBS-$(ARCH) is missing"; echo; exit 1; fi
-	for i in $(LIBS-$(ARCH)); do make $$i.install || exit; done
+	for i in $(LIBS); do make $$i.install || exit; done
 	for i in $(PROGRAM); do make $$i.install || exit; done
 
@@ -136,5 +127,5 @@
 
 # standard rules: targets are foo, foo.clean, foo.install, foo.dist
-$(PROGRAM) $(LIBS-$(ARCH)) $(EXTRAS): 
+$(PROGRAM) $(LIBS) $(EXTRAS): 
 	if [ -d "src/$@" ]; then (cd src/$@ && make); fi