===================================================================
RCS file: /home/cvs/OpenXM/src/ox_ntl/crypt/rsa/Makefile,v
retrieving revision 1.1
retrieving revision 1.3
diff -u -p -r1.1 -r1.3
--- OpenXM/src/ox_ntl/crypt/rsa/Makefile	2004/05/16 15:04:54	1.1
+++ OpenXM/src/ox_ntl/crypt/rsa/Makefile	2004/08/16 03:59:58	1.3
@@ -1,18 +1,22 @@
-# $OpenXM$
+# $OpenXM: OpenXM/src/ox_ntl/crypt/rsa/Makefile,v 1.2 2004/07/04 02:31:51 iwane Exp $
 
-# OpenXM_HOME=${PWD}/../../..
+VPATH=.:../sha1
 
-CPP=g++
-CC =gcc
+OpenXM_HOME ?= ${PWD}/../../../..
+PREFIX=$(OpenXM_HOME)
 
-RM =/bin/rm
-CP =/bin/cp
+CXX ?= g++
+CC  ?= gcc
 
-CFLAGS=-I$(PREFIX)/include -g -Wall
-CPPFLAGS=$(CFLAGS)
+RM  ?= /bin/rm
+CP  ?= /bin/cp
 
-PREFIX=$(OpenXM_HOME)
 
+CFLAGS   += -g -Wall
+CXXFLAGS += -g -Wall
+CPPFLAGS  = -I$(PREFIX)/include  -I../sha1
+
+
 NTL_LIBDIR=$(PREFIX)/lib/NTL
 LIBDIR=$(PREFIX)/lib 
 
@@ -20,26 +24,40 @@ LDFLAGS=-L$(LIBDIR) -L$(NTL_LIBDIR)
 
 .SUFFIXES: .cpp .o .c
 
-SRCC=
-SRCP=ntlrsa.cpp ntlrsatest.cpp
+SRCCG=gmprsa.c sha1.c gmprsatest.c
+SRCPN=ntlrsa.cpp ntlrsatest.cpp
 
-PROG=rsa
-OBJC=$(SRCP:.cpp=.o)
+NTL=ntlrsatest
+GMP=gmprsatest
 
-all: rsa
+PROGS=$(NTL) $(GMP)
 
+OBJCN=$(SRCPN:.cpp=.o) $(SRCCN:.c=.o)
+OBJCG=$(SRCPG:.cpp=.o) $(SRCCG:.c=.o)
 
-$(PROG): $(OBJC)
-	$(CPP) $(CPPFLAGS) $(LDFLAGS) $(OBJC) -o $@ -lntl -lgmp
 
 
+all: $(PROGS)
+
+
+$(GMP): $(OBJCG)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJCG) -o $@ -lgmp
+
+
+$(NTL): $(OBJCN)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJCN) -o $@ -lntl -lgmp
 .cpp.o:
-	$(CPP) $(CPPFLAGS) -c $< -o $@
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@
 
 .c.o:
-	$(CC) $(CFLAGS) -c $< -o $@
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
 
 clean:
-	-$(RM) -f $(OBJC) $(PROG)
+	-$(RM) -f $(OBJCG) $(OBJCN) $(PROGS)
 
 
+
+gmprsa.o: gmprsa.h
+gmprsatest.o: gmprsa.h
+ntlrsa.o: ntlrsa.h
+ntlrsatest.o : ntlrsa.h