tweaks

CASCADE/Makefile

@@ -9,6 +9,7 @@
 
 NAME=cascade
 include ../Makefile.p690
+LIBFILE=lib$(NAME)$(BITS).a
 
 # object (all the interesting bits to do the erosion/sedimentation
 #         computations)
@@ -49,9 +50,9 @@ del_flip.o
 
 # make the library
 #
-all: lib$(NAME).a
-lib$(NAME).a: $(OBJECTS) $(UTILS)
-	$(AR) -rv lib$(NAME).a $(OBJECTS)
+all: $(LIBFILE)
+$(LIBFILE): $(OBJECTS) $(UTILS)
+	$(AR) -rv $(LIBFILE) $(OBJECTS) >$(LIBFILE).ar
 	echo "--"
 	echo "compiler output...."
 	more $(COMPILE_OUT)
@@ -62,5 +63,5 @@ objclean:
 
 .PHONY: clean
 clean: objclean
-	rm -f lib$(NAME).a
+	rm -f $(LIBFILE)
 

Makefile.p690

@@ -45,10 +45,10 @@ CFLAGS  = -O2 -qstrict -Q $(BITS)  -qarch=pwr4 -qtune=pwr4 \
 # -lacml
 
 LIBS = \
--LOCTREE -lOctree \
--LNN -lnn \
--LCASCADE -lcascade \
--LRESAMPLE -lresample \
+-LOCTREE -lOctree$(BITS) \
+-LNN -lnn$(BITS) \
+-LCASCADE -lcascade$(BITS) \
+-LRESAMPLE -lresample$(BITS) \
 $(WSMP_LIB) \
 -L$(X11) -lX11 \
 -L$(PGPLOT) -lpgplot \

NN/Makefile

 NAME=nn
 include ../Makefile.p690
+LIBFILE=lib$(NAME)$(BITS).a
 
 OBJECTS_NN = \
 delaun.o \
@@ -11,9 +12,9 @@ stack.o \
 stackpair.o \
 volume.o
 
-all: lib$(NAME).a
-lib$(NAME).a: $(OBJECTS_NN)
-	$(AR) rcv lib$(NAME).a $(OBJECTS_NN)
+all: $(LIBFILE)
+$(LIBFILE): $(OBJECTS_NN)
+	$(AR) -rv $(LIBFILE) $(OBJECTS_NN) >$(LIBFILE).ar
 	echo "--"
 	echo "compiler output...."
 	more $(COMPILE_OUT)
@@ -24,5 +25,5 @@ objclean:
 
 .PHONY: clean
 clean: objclean
-	rm -f lib$(NAME).a
+	rm -f $(LIBFILE)
 

OCTREE/Makefile

 NAME=Octree
 include ../Makefile.p690
+LIBFILE=lib$(NAME)$(BITS).a
 
 OBJECTS_OCTREE = \
 OctreeBitPlus.o \
@@ -12,9 +13,9 @@ profil_sloan.o \
 rootls_sloan.o
 
 
-all: lib$(NAME).a
-lib$(NAME).a: $(OBJECTS_OCTREE)
-	$(AR) rcv lib$(NAME).a $(OBJECTS_OCTREE)
+all: $(LIBFILE)
+$(LIBFILE): $(OBJECTS_OCTREE)
+	$(AR) -rv $(LIBFILE) $(OBJECTS_OCTREE) >$(LIBFILE).ar
 	echo "--"
 	echo "compiler output...."
 	more $(COMPILE_OUT)
@@ -25,5 +26,5 @@ objclean:
 
 .PHONY: clean
 clean: objclean
-	rm -f lib$(NAME).a
+	rm -f $(LIBFILE)
 

RESAMPLE/Makefile

 NAME=resample
 include ../Makefile.p690
+LIBFILE=lib$(NAME)$(BITS).a
 
 OBJECTS = \
 curfit.o \
@@ -16,9 +17,9 @@ curfit.o \
 splev.o \
 resample.o
 
-all: lib$(NAME).a
-lib$(NAME).a: $(OBJECTS)
-	$(AR) rcv lib$(NAME).a $(OBJECTS)
+all: $(LIBFILE)
+$(LIBFILE): $(OBJECTS)
+	$(AR) -rv $(LIBFILE) $(OBJECTS) >$(LIBFILE).ar
 	echo "--"
 	echo "compiler output...."
 	more $(COMPILE_OUT)
@@ -29,5 +30,5 @@ objclean:
 
 .PHONY: clean
 clean: objclean
-	rm -f lib$(NAME).a
+	rm -f $(LIBFILE)