===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/Attic/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- OpenXM/src/kan96xx/plugin/Attic/Makefile	1999/12/15 14:33:41	1.3
+++ OpenXM/src/kan96xx/plugin/Attic/Makefile	2000/01/10 14:31:38	1.4
@@ -1,102 +1,102 @@
 ## $OpenXM: OpenXM/src/kan96xx/plugin/Makefile,v 1.2 1999/11/02 12:28:57 takayama Exp $ 
-all : sample.a sm1Socket.a asirconv.a   cmo.a file2.a ox.a
 
+OPEMXM_CONTRIB=../../../../OpenXM_contrib
+GC=$(OPEMXM_CONTRIB)/gc
+GMP=$(OPEMXM_CONTRIB)/gmp
+
+AR=/usr/bin/ar
+RM=/bin/rm
+
 CC=gcc
-INCLUDE=-I ../gmp -I ../Kan
-FLAG=-g
-.c.o :
-	$(CC) $(FLAG) $(INCLUDE) -c $<
+CFLAGS+=-g -I$(GMP) -I../Kan
 
-all0 : ak.a libasir.a
+all: asirconv.a cmo.a file2.a ox.a sample.a sm1Socket.a
 
-sample.o : sample.h sample.c sample.hh
+clean:
+	$(RM) -f *.a *.o a.out cmo.h cmotag.hh cmotagToName cmptag.htmp \
+		 ox.h ox.hh ox_kan.h
 
-sample.a : sample.o
-	ar ru sample.a sample.o
-	../gc/if_not_there ../gc/on_sparc_sunos5 ranlib sample.a
+asirconv.a: asirconv.o
 
-sm1Socket.o : sm1Socket.h sm1Socket.c sm1Socket.hh
+asirconv.o: asir.h asir.hh asirconv.c
 
-sm1Socket.a : sm1Socket.o
-	ar ru sm1Socket.a sm1Socket.o
-	../gc/if_not_there ../gc/on_sparc_sunos5 ranlib sm1Socket.a
+cmo.a: cmo.o cmo-gmp.o
 
-sm1pvm.a : sm1pvm.h sm1pvm.c sm1pvm.hh
-	$(CC) $(FLAG) $(INCLUDE) -I $(PVM_ROOT)/include -c sm1pvm.c
-	ar ru sm1pvm.a sm1pvm.o
-	../gc/if_not_there ../gc/on_sparc_sunos5 ranlib sm1pvm.a
+cmo.o: cmo.h cmo.c cmo-gmp.c file2.h mathcap.h cmotag.htmp \
+	oxMessageTag.h oxFunctionId.h
 
-asirconv.o : asir.h asirconv.c asir.hh
+cmo-gmp.o: cmo.h cmo.c cmo-gmp.c file2.h mathcap.h cmotag.htmp \
+	oxMessageTag.h oxFunctionId.h
+	$(CC) $(CFLAGS) -I$(GMP)/mpn -c cmo-gmp.c
 
-asirconv.a : asirconv.o
-	ar ru asirconv.a asirconv.o
-	../gc/if_not_there ../gc/on_sparc_sunos5 ranlib asirconv.a
+cmotag.htmp: cmotagToName
+	$(RM) -f cmotag.htmp
+	./cmotagToName > cmotag.htmp
 
-ak.a : 
-#	ln -s /fuji/taka/noro/ak.a
-	ln -s /dosc/work/noro/ak.a
+cmotagToName: cmotag.h cmotagToName.c
+	$(CC) -o cmotagToName cmotagToName.c
 
-libasir.a :
-#	ln -s /fuji/taka/noro/libasir.a
-	ln -s /dosc/work/noro/libasir.a
+cmo.h: cmo0.h cmotag.h
+	@echo "Making cmo.h"
+	@$(RM) -f cmo.h
+	@echo "/********* DO NOT EDIT THIS FILE *************/" > cmo.h
+	@cat cmotag.h cmo0.h >> cmo.h
 
-cmo.o : cmo.h cmo.c cmo-gmp.c file2.h mathcap.h cmotag.htmp oxMessageTag.h oxFunctionId.h
+file2.a: file2.o
 
-cmo-gmp.o : cmo.h cmo.c cmo-gmp.c file2.h mathcap.h cmotag.htmp oxMessageTag.h oxFunctionId.h
-	$(CC) $(FLAG) $(INCLUDE) -I ../gmp/mpn -c cmo-gmp.c
-cmo.a : cmo.o cmo-gmp.o
-	ar ru cmo.a cmo.o cmo-gmp.o
-	../gc/if_not_there ../gc/on_sparc_sunos5 ranlib cmo.a
+file2.o: file2.h file2.c
 
-cmotag.htmp : cmotagToName
-	touch cmotag.htmp
-	/bin/rm  -rf cmotag.htmp
-	./cmotagToName >cmotag.htmp
+ox.a: mytcpio.o oxmisc.o oxmisc2.o
 
-cmotagToName : cmotagToName.c cmotag.h
-	$(CC) -o cmotagToName cmotagToName.c
+ox.h: oxx.h
+	@echo "Making ox.h"
+	@echo "/********* DO NOT EDIT THIS FILE *************/" > ox.h
+	@cat oxx.h >> ox.h
 
-cmo.h : cmo0.h cmotag.h
-	/bin/rm -f cmo.h
-	echo "/*cmo.h : Dont edit  this file. */" >cmo.h
-	cat cmotag.h  >>cmo.h
-	echo "/*cmo.h : Dont edit  this file. */" >>cmo.h
-	cat cmo0.h >>cmo.h
+ox.hh: oxx.hh
+	@echo "Making ox.hh"
+	@$(RM) -f ox.hh
+	@echo "/********* DO NOT EDIT THIS FILE *************/" > ox.hh
+	@cat oxx.hh >> ox.hh
 
-file2.o : file2.h file2.c
 
-file2.a : file2.o
-	ar ru file2.a file2.o
-	../gc/if_not_there ../gc/on_sparc_sunos5 ranlib file2.a
+ox_kan.h: cmotag.h file2.h mathcap.h oxFunctionId.h oxMessageTag.h oxKan0.h
+	@echo "Making ox_kan.h"
+	@$(RM) -f ox_kan.h
+	@echo "/********* DO NOT EDIT THIS FILE *************/" > ox_kan.h
+	@cat mathcap.h file2.h cmotag.h oxMessageTag.h oxFunctionId.h \
+	    oxKan0.h >> ox_kan.h
 
+mytcpio.o: ox.h ox.hh ox_kan.h mytcpio.c
+oxmisc.o: ox.h ox.hh ox_kan.h oxmisc.c
+oxmisc2.o: cmo.h mathcap.h ox.h ox.hh ox_kan.h oxmisc2.c
 
-mytcpio.o : mytcpio.c ox_kan.h
-oxmisc.o : oxmisc.c ox_kan.h
-oxmisc2.o : oxmisc2.c ox_kan.h mathcap.h cmo.h
-	$(CC) $(FLAG) $(INCLUDE) -c oxmisc2.c
+sample.a: sample.o
 
-ox.a : mytcpio.o oxmisc.o oxmisc2.o ox_kan.h ox.h ox.hh
-	ar ru ox.a mytcpio.o oxmisc.o oxmisc2.o
-	../gc/if_not_there ../gc/on_sparc_sunos5 ranlib ox.a
-ox.h : oxx.h
-	/bin/rm -f tmp.h
-	echo "/*********  DO NOT EDIT THIS FILE *************/" >tmp.h
-	cat oxx.h >>tmp.h
-	cp tmp.h ox.h
-ox.hh : oxx.hh
-	/bin/rm -f tmp.h
-	echo "/*********  DO NOT EDIT THIS FILE *************/" >tmp.h
-	cat oxx.hh >>tmp.h
-	cp tmp.h ox.hh
-	/bin/rm -f tmp.h
+sample.o: sample.h sample.hh sample.c
 
+sm1Socket.a: sm1Socket.o
 
-ox_kan.h : oxMessageTag.h oxFunctionId.h file2.h cmotag.h oxKan0.h mathcap.h
-	/bin/rm -f ox_kan.h
-	echo "/* Do not edit this file. */" >ox_kan.h
-	cat mathcap.h file2.h cmotag.h oxMessageTag.h oxFunctionId.h  oxKan0.h >>ox_kan.h
+sm1Socket.o: sm1Socket.h sm1Socket.hh sm1Socket.c
 
+sm1pvm.a: sm1pvm.o
 
-clean :
-	/bin/rm -f *.a *.o *~ a.out cmotagToName cmo.h cmotag.hh ox.h ox.hh ox_kan.h cmptag.htmp
+sm1pvm.o: sm1pvm.h sm1pvm.hh sm1pvm.c
+	$(CC) $(CFLAGS) -I $(PVM_ROOT)/include -c sm1pvm.c
 
+all0: ak.a libasir.a
+
+ak.a:
+#	ln -s /fuji/taka/noro/ak.a
+	ln -s /dosc/work/noro/ak.a
+
+libasir.a:
+#	ln -s /fuji/taka/noro/libasir.a
+	ln -s /dosc/work/noro/libasir.a
+
+.c.o:
+	$(CC) $(CFLAGS) -c $<
+
+.o.a:
+	$(AR) ru $@ $?
+	$(GC)/if_not_there $(GC)/on_sparc_sunos5 ranlib $@