===================================================================
RCS file: /home/cvs/OpenXM/src/ox_ntl/Attic/Makefile,v
retrieving revision 1.1
retrieving revision 1.5
diff -u -p -r1.1 -r1.5
--- OpenXM/src/ox_ntl/Attic/Makefile	2003/11/03 03:11:21	1.1
+++ OpenXM/src/ox_ntl/Attic/Makefile	2003/11/12 12:56:05	1.5
@@ -1,4 +1,4 @@
-# $OpenXM$
+# $OpenXM: OpenXM/src/ox_ntl/Makefile,v 1.4 2003/11/08 12:35:08 iwane Exp $
 #
 #
 #
@@ -8,13 +8,15 @@
 
 PROG=ox_ntl
 
+OpenXM_HOME=../..
+
 CPP=g++
 CC =gcc
 
 RM =/bin/rm
 CP =/bin/cp
 
-CFLAGS=-I$(PREFIX)/include 
+CFLAGS=-I$(PREFIX)/include
 CPPFLAGS=$(CFLAGS)
 
 PREFIX=$(OpenXM_HOME)
@@ -29,11 +31,12 @@ DISTFILEDIR=ntl-5.3.1
 DISTFILE=ntl-5.3.1.tar.gz
 WORK=$(PWD)/work
 
+GMPOPT=NTL_GMP_LIP=on GMP_PREFIX=${OpenXM_HOME} GMP_INCDIR=${OpenXM_HOME}/include GMP_LIBDIR=${OpenXM_HOME}/lib
 
 .SUFFIXES: .cpp .o .c
 
-SRCC=oxserv.c
-SRCP=main.cpp ntl.cpp
+SRCC=oxserv.c oxstack.c
+SRCP=main.cpp ntl.cpp ntlconv.cpp
 
 OBJC=$(SRCC:.c=.o) $(SRCP:.cpp=.o)
 
@@ -44,10 +47,22 @@ all: $(PROG)
 $(PROG): $(OBJC) $(LIBDIR)/libox.a $(NTL_LIBDIR)/libntl.a
 	$(CPP) $(CPPFLAGS) -L$(LIBDIR) -L$(NTL_LIBDIR) $(OBJC) -o $@ -lntl -lgmp -lox -lgc
 
-oxserv.c: oxserv.h
 
-main.cpp: oxserv.h ntl.h
+ox_ntl_debug: ntl.cpp ntl.h oxstack.o
+	$(CPP) $(CPPFLAGS) -g -D__NTL_DEBUG=1 -L/usr/local/lib -L$(LIBDIR) -L$(NTL_LIBDIR) ntl.cpp ntlconv.o oxstack.o -o $@ -lntl -lgmp -lox -lgc
 
+oxserv_debug: oxserv.h oxserv.c
+	$(CC) $(CFLAGS) -g -D__OXSERV_DEBUG=1 -L$(LIBDIR) oxserv.c oxstack.o -o $@ -lox -lgc
+
+cpp.exe: cpp.cpp
+	$(CPP) $(CPPFLAGS) -g -L/usr/local/lib -L$(LIBDIR) -L$(NTL_LIBDIR) cpp.cpp -o $@ -lntl -lgmp -lox -lgc
+
+oxserv.c: oxserv.h oxstack.h
+
+oxstack.c: oxstack.h
+
+main.cpp: oxserv.h ntl.h oxstack.h
+
 ntl.cpp: ntl.h
 
 .cpp.o:
@@ -60,9 +75,9 @@ install: all
 	$(CP) $(PROG) $(PREFIX)/bin
 
 clean:
-	-$(RM) -f $(OBJC) $(PROG)
+	-$(RM) -f $(OBJC) $(PROG) ox_ntl_debug oxserv_debug
 	-$(RM) -fr ${WORK}
-	-$(RM) -f .*-ntl-done
+	@-$(RM) -f .*-ntl-done
 
 
 pre-fetch-ntl:
@@ -73,7 +88,9 @@ pre-fetch-ntl:
 
 fetch-ntl: pre-fetch-ntl
 	@if [ ! -f .fetch-ntl-done ]; then \
-		(cd ${DISTDIR}; wget --passive-ftp ftp://$(MASTER_CITES)/pub/OpenXM/misc/1.2.2/$(DISTFILE)); \
+		if [ ! -f ${DISTDIR}/${DISTFILE} ]; then \
+			(cd ${DISTDIR}; wget --no-directories --passive-ftp ftp://$(MASTER_CITES)/pub/OpenXM/misc/1.2.2/$(DISTFILE)) ; \
+		fi ; \
 		(cd ${WORK}; tar xvzf ${DISTDIR}/${DISTFILE}); \
 		touch .fetch-ntl-done; \
 	fi
@@ -82,11 +99,11 @@ patch-ntl: fetch-ntl
 	@if [ ! -f .patch-ntl-done ]; then \
 		touch .patch-ntl-done; \
 	fi
-	
 
+
 build-ntl: patch-ntl
 	@if [ ! -f .build-ntl-done ]; then \
-		(cd ${WORK}/${DISTFILEDIR}/src; ./configure LIBDIR=${NTL_LIBDIR} PREFIX=${PREFIX}; make); \
+		(cd ${WORK}/${DISTFILEDIR}/src; LD_LIBRARY_PATH=${OpenXM_HOME}/lib; export LD_LIBRARY_PATH; ./configure LIBDIR=${NTL_LIBDIR} PREFIX=${PREFIX} ${GMPOPT}; make); \
 		touch .build-ntl-done; \
 	fi