summaryrefslogtreecommitdiff
path: root/math/ntl/patches/patch-aa
diff options
context:
space:
mode:
Diffstat (limited to 'math/ntl/patches/patch-aa')
-rw-r--r--math/ntl/patches/patch-aa311
1 files changed, 158 insertions, 153 deletions
diff --git a/math/ntl/patches/patch-aa b/math/ntl/patches/patch-aa
index 2932baca344..84f1b482ee8 100644
--- a/math/ntl/patches/patch-aa
+++ b/math/ntl/patches/patch-aa
@@ -1,6 +1,9 @@
-$NetBSD: patch-aa,v 1.6 2009/12/03 17:48:58 joerg Exp $
+$NetBSD: patch-aa,v 1.7 2012/01/02 23:42:28 dholland Exp $
---- makefile.orig Tue Dec 17 15:43:30 2002
+- configure for pkgsrc
+- libtoolize
+
+--- makefile.orig 2009-08-14 12:53:13.000000000 +0000
+++ makefile
@@ -7,7 +7,7 @@
###############################################################
@@ -25,7 +28,7 @@ $NetBSD: patch-aa,v 1.6 2009/12/03 17:48:58 joerg Exp $
# Flags for the C compiler
# Some useful flags:
# -O2 -- recommended level of optimization
-@@ -31,7 +31,7 @@ CFLAGS=-O2
+@@ -32,7 +32,7 @@ CFLAGS=-O2
@@ -34,7 +37,7 @@ $NetBSD: patch-aa,v 1.6 2009/12/03 17:48:58 joerg Exp $
# Flags for the C++ compiler (usually the same as CFLAGS)
# Some useful flags:
# -+ -- needed with xlC to make it treat .c files as C++ files
-@@ -40,16 +40,16 @@ CXXFLAGS=$(CFLAGS)
+@@ -41,16 +41,16 @@ CXXFLAGS=$(CFLAGS)
# The defaults should almost always be OK.
@@ -52,10 +55,10 @@ $NetBSD: patch-aa,v 1.6 2009/12/03 17:48:58 joerg Exp $
-LDFLAGS=
+#LDFLAGS=
- # arguments for linker for C++ programs
+ # arguments for linker for C programs
LDFLAGS_CXX=$(LDFLAGS)
-@@ -61,13 +61,13 @@ LDLIBS=-lm
+@@ -62,15 +62,15 @@ LDLIBS=-lm
LDLIBS_CXX=$(LDLIBS)
# libraries for linking C++ programs
@@ -63,35 +66,61 @@ $NetBSD: patch-aa,v 1.6 2009/12/03 17:48:58 joerg Exp $
+#CPPFLAGS=
# arguments for the C preprocessor
--PREFIX=/usr/local
-+#PREFIX=/usr/local
+-LIBTOOL=libtool
++#LIBTOOL=libtool
+ # libtool command
+
+-DEF_PREFIX=/usr/local
++DEF_PREFIX=/nonexistent
+
+-PREFIX=$(DEF_PREFIX)
++#PREFIX=$(DEF_PREFIX)
LIBDIR=$(PREFIX)/lib
INCLUDEDIR=$(PREFIX)/include
--DOCDIR=$(PREFIX)/doc
-+DOCDIR=$(PREFIX)/share/doc
- # where to install NTL
-
- ###############################################################
-@@ -87,15 +87,15 @@ DOCDIR=$(PREFIX)/doc
+ DOCDIR=$(PREFIX)/share/doc
+@@ -92,17 +92,17 @@ DOCDIR=$(PREFIX)/share/doc
###############################################################
--GMP_INCDIR=
-+GMP_INCDIR= -I${BUILDLINK_PREFIX.gmp}/include
- # Set to -I<directory containing gmp.h> if using GMP and GMP
- # is not installed in a standard system directory, empty otherwise
+-GMP_PREFIX=$(DEF_PREFIX)
++GMP_PREFIX=${BUILDLINK_PREFIX.gmp}
--GMP_LIBDIR=
-+GMP_LIBDIR= -Wl,-R${BUILDLINK_PREFIX.gmp}/lib -L${BUILDLINK_PREFIX.gmp}/lib
- # Set to -L<directory containing libgmp.a> if using GMP and GMP
- # is not installed in a standard system directory, empty otherwise
+-GMP_INCDIR=$(GMP_PREFIX)/include
++GMP_INCDIR= ${GMP_PREFIX}/include
+ # directory containing gmp.h if using GMP
--GMP_LIB=
-+GMP_LIB= -lgmp
- # Set to -lgmp if using GMP, empty otherwise
+-GMP_LIBDIR=$(GMP_PREFIX)/lib
++GMP_LIBDIR= ${GMP_PREFIX}/lib
+ # directory containing libgmp.a if using GMP
+-GMP_OPT_INCDIR=# -I$(GMP_INCDIR) # GMP
+-GMP_OPT_LIBDIR=# -L$(GMP_LIBDIR) # GMP
+-GMP_OPT_LIB=# -lgmp # GMP
++GMP_OPT_INCDIR= -I$(GMP_INCDIR) # GMP
++GMP_OPT_LIBDIR= -Wl,-R$(GMP_LIBDIR) -L$(GMP_LIBDIR) # GMP
++GMP_OPT_LIB= -lgmp # GMP
+ # uncomment these if using GMP
+
+
+@@ -116,7 +116,7 @@ GMP_OPT_LIB=# -lgmp # GMP
+ #
###############################################################
-@@ -147,7 +147,7 @@ OBJ=$(O19)
+
+-GF2X_PREFIX=$(DEF_PREFIX)
++GF2X_PREFIX=/nonexistent
+
+ GF2X_INCDIR=$(GF2X_PREFIX)/include
+ # directory containing gf2x.h if using gf2x
+@@ -125,7 +125,7 @@ GF2X_LIBDIR=$(GF2X_PREFIX)/lib
+ # directory containing libgf2x.a
+
+ GF2X_OPT_INCDIR=# -I$(GF2X_INCDIR) # GF2X
+-GF2X_OPT_LIBDIR=# -L$(GF2X_LIBDIR) # GF2X
++GF2X_OPT_LIBDIR=# -Wl,-R$(GF2X_LIBDIR) -L$(GF2X_LIBDIR) # GF2X
+ GF2X_OPT_LIB=# -lgf2x # GF2X
+ # uncomment these if using gf2x
+
+@@ -179,7 +179,7 @@ OBJ=$(O19)
S01=FFT.c FacVec.c GF2.c GF2E.c GF2EX.c GF2EXFactoring.c GF2X.c GF2X1.c
S02=$(S01) GF2XFactoring.c GF2XVec.c HNF.c ctools.c LLL.c LLL_FP.c LLL_QP.c
S03=$(S02) LLL_RR.c LLL_XD.c RR.c WordVector.c ZZ.c ZZVec.c ZZX.c ZZX1.c
@@ -100,7 +129,7 @@ $NetBSD: patch-aa,v 1.6 2009/12/03 17:48:58 joerg Exp $
S05=$(S04) ZZ_pEXFactoring.c ZZ_pX.c ZZ_pX1.c ZZ_pXCharPoly.c
S06=$(S05) ZZ_pXFactoring.c fileio.c lip.c lzz_p.c lzz_pE.c lzz_pEX.c
S07=$(S06) lzz_pEXFactoring.c lzz_pX.c lzz_pX1.c
-@@ -162,8 +162,8 @@ S15=$(S14) vec_long.c vec_lzz_p.c vec_lz
+@@ -194,8 +194,8 @@ S15=$(S14) vec_long.c vec_lzz_p.c vec_lz
S16=$(S15) vec_vec_GF2.c vec_vec_GF2E.c vec_vec_RR.c vec_vec_ZZ.c
S17=$(S16) vec_vec_ZZ_p.c vec_vec_ZZ_pE.c vec_vec_long.c vec_vec_lzz_p.c
S18=$(S17) vec_vec_lzz_pE.c vec_xdouble.c xdouble.c
@@ -111,16 +140,7 @@ $NetBSD: patch-aa,v 1.6 2009/12/03 17:48:58 joerg Exp $
SRC = $(S20)
-@@ -178,7 +178,7 @@ SINC = c_lip_impl.h g_lip_impl.h
- # library header files
-
- IN01= FFT.h FacVec.h GF2.h GF2E.h GF2EX.h GF2EXFactoring.h GF2X.h
--IN02=$(IN01) GF2XFactoring.h GF2XVec.h HNF.h ctools.h LLL.h
-+IN02=$(IN01) GF2XFactoring.h GF2XVec.h HNF.h ctools.h LLL.h
- IN03=$(IN02) RR.h WordVector.h ZZ.h ZZVec.h ZZX.h ZZXFactoring.h ZZ_p.h
- IN04=$(IN03) ZZ_pE.h ZZ_pEX.h ZZ_pEXFactoring.h ZZ_pX.h ZZ_pXFactoring.h
- IN05=$(IN04) fileio.h lip.h lzz_p.h lzz_pE.h lzz_pEX.h lzz_pEXFactoring.h
-@@ -202,9 +202,9 @@ INCL=$(IN18)
+@@ -234,9 +234,9 @@ INCL=$(IN18)
# test data
@@ -133,26 +153,7 @@ $NetBSD: patch-aa,v 1.6 2009/12/03 17:48:58 joerg Exp $
TD4=$(TD3) CharPolyTestOut QuadTestIn QuadTestOut
TD = $(TD4)
-@@ -260,15 +260,15 @@ DOC = $(D18)
- # test program executables
-
- PROG1=QuickTest BerlekampTest CanZassTest ZZXFacTest MoreFacTest LLLTest BitMatTest
--PROG2=$(PROG1) MatrixTest CharPolyTest RRTest QuadTest
-+PROG2=$(PROG1) MatrixTest CharPolyTest RRTest QuadTest
- PROG3=$(PROG2) GF2EXTest subset ZZ_pEXTest lzz_pEXTest
- PROGS = $(PROG3)
-
- # things to save to a tar file
-
--SFI1=makefile $(SRC) $(SINC) $(SCRIPTS) $(MD) $(GT) $(TS) $(TD) mach_desc.win
-+SFI1=makefile $(SRC) $(SINC) $(SCRIPTS) $(MD) $(GT) $(TS) $(TD) mach_desc.win
- SFI2=$(SFI1) MulTimeTest.c PolyTimeTest.c clr_AVOID_BRANCHING clr_AVOID_FLOAT
--SFI3=$(SFI2) clr_FFT_PIPELINE clr_LONG_LONG clr_TBL_REM clr_WIZARD_HACK
-+SFI3=$(SFI2) clr_FFT_PIPELINE clr_LONG_LONG clr_TBL_REM clr_WIZARD_HACK
- SFI4=$(SFI3) InitSettings.c mul_banner poly_banner set_AVOID_BRANCHING set_AVOID_FLOAT
- SFI5=$(SFI4) set_FFT_PIPELINE set_LONG_LONG set_TBL_REM set_WIZARD_HACK
- SFI6=$(SFI5) WizComp.c DispSettings.c config_template WizardAux Wizard def_makefile
-@@ -285,11 +285,11 @@ SFILES=$(SFI6)
+@@ -314,11 +314,11 @@ SFILES=$(SFI3)
NTL_INCLUDE = -I../include -I.
# NTL needs this to find its include files
@@ -168,15 +169,16 @@ $NetBSD: patch-aa,v 1.6 2009/12/03 17:48:58 joerg Exp $
-@@ -298,14 +298,14 @@ all:
+@@ -332,7 +332,7 @@ all:
make setup2
make setup3
make setup4
- make ntl.a
-+ make libntl.la
++ make libntl.a
+ touch all
- # setup1 generates the file ../incluse/NTL/mach_desc.h
+@@ -340,7 +340,7 @@ all:
setup1:
$(COMPILE) MakeDescAux.c
@@ -185,128 +187,131 @@ $NetBSD: patch-aa,v 1.6 2009/12/03 17:48:58 joerg Exp $
./MakeDesc
mv mach_desc.h ../include/NTL/mach_desc.h
-@@ -332,9 +332,10 @@ setup4:
+@@ -367,10 +367,16 @@ setup4:
sh Wizard $(WIZARD)
-ntl.a: $(OBJ)
-- $(AR) $(ARFLAGS) ntl.a $(OBJ)
-- - $(RANLIB) ntl.a
-+libntl.la: $(OBJ)
-+ $(LIBTOOL) --mode=link $(CC) -o libntl.la $(OBJ:.o=.lo) \
-+ $(GMP_LIBDIR) $(GMP_LIB) -rpath $(LIBDIR) \
-+ -version-info 0:1
-
- lip.o: lip.c g_lip_impl.h c_lip_impl.h lip_gmp_aux_impl.h
- $(COMPILE) $(GMP_INCDIR) lip.c
-@@ -343,15 +344,15 @@ ctools.o: ctools.c
- $(COMPILE) ctools.c
-
-
--GetTime.o: GetTime.c
-+GetTime.o: GetTime.c
- $(COMPILE) GetTime.c
-
-
--.c.o:
-+.c.o:
- $(COMPILE_CXX) $<
-
--.c:
-- $(LINK_CXX) -o $@ $< ntl.a $(GMP_LIBDIR) $(GMP_LIB) $(LDLIBS_CXX)
-+.c:
-+ $(LINK_CXX) -o $@ $< libntl.la $(GMP_LIBDIR) $(GMP_LIB) $(LDLIBS_CXX)
+- $(AR) $(ARFLAGS) ntl.a $(OBJ) #LSTAT
+- - $(RANLIB) ntl.a #LSTAT
+-# $(LIBTOOL) --mode=link $(LINK_CXX) -o libntl.la $(OBJ:.o=.lo) $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB) $(LDLIBS_CXX) -rpath $(LIBDIR) -version-info `cat VERSION_INFO` #LSHAR
++libntl.a: $(OBJ)
++ $(LIBTOOL) --mode=link $(CXX) -o libntl.la $(OBJ:.o=.lo) \
++ $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) \
++ $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB) \
++ $(LDLIBS_CXX) \
++ -rpath $(LIBDIR) \
++ -version-info `cat VERSION_INFO`
++# $(AR) $(ARFLAGS) ntl.a $(OBJ) #LSTAT
++# - $(RANLIB) ntl.a #LSTAT
++## $(LIBTOOL) --mode=link $(LINK_CXX) -o libntl.la $(OBJ:.o=.lo) $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB) $(LDLIBS_CXX) -rpath $(LIBDIR) -version-info `cat VERSION_INFO` #LSHAR
+
+ LCOMP= #LSTAT
+ # LCOMP=$(LIBTOOL) --mode=compile #LSHAR
+@@ -391,7 +397,7 @@ GetTime.o: GetTime.c
+ $(LCOMP) $(COMPILE_CXX) $(GF2X_OPT_INCDIR) $<
+
+ .c:
+- $(LINK_CXX) -o $@ $< ntl.a $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB) $(LDLIBS_CXX) #LSTAT
++ $(LINK_CXX) -o $@ $< libntl.la $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB) $(LDLIBS_CXX) #LSTAT
+ # $(LIBTOOL) --mode=link $(LINK_CXX) -o $@ $< libntl.la #LSHAR
#################################################################
- #
-@@ -372,25 +373,20 @@ check:
- # make install just does a simple copy of the include file
- # and library
- # make uninstall removes these files
--#
-+#
- #################################################################
-
-
+@@ -425,23 +431,29 @@ check:
install:
-- mkdir -p $(LIBDIR)
-- cp ntl.a $(LIBDIR)/libntl.a
-- mkdir -p $(INCLUDEDIR)
-- - rm -r $(INCLUDEDIR)/NTL
-- mkdir $(INCLUDEDIR)/NTL
-- cp ../include/NTL/*.h $(INCLUDEDIR)/NTL
-- mkdir -p $(DOCDIR)
-- - rm -r $(DOCDIR)/NTL
-- mkdir $(DOCDIR)/NTL
-- cp ../doc/*.txt $(DOCDIR)/NTL
-- cp ../doc/*.html $(DOCDIR)/NTL
-- cp ../doc/*.gif $(DOCDIR)/NTL
-+ $(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) libntl.la ${DESTDIR}$(LIBDIR)
+- mkdir -p -m 755 $(INCLUDEDIR)
+- rm -rf $(INCLUDEDIR)/NTL
+- mkdir -m 755 $(INCLUDEDIR)/NTL
+- cp -p ../include/NTL/*.h $(INCLUDEDIR)/NTL
+- - chmod -R a+r $(INCLUDEDIR)/NTL
+- mkdir -p -m 755 $(DOCDIR)
+- rm -rf $(DOCDIR)/NTL
+- mkdir -m 755 $(DOCDIR)/NTL
+- cp -p ../doc/*.txt $(DOCDIR)/NTL
+- cp -p ../doc/*.html $(DOCDIR)/NTL
+- cp -p ../doc/*.gif $(DOCDIR)/NTL
+- - chmod -R a+r $(DOCDIR)/NTL
+- mkdir -p -m 755 $(LIBDIR)
+- cp -p ntl.a $(LIBDIR)/libntl.a #LSTAT
+- - chmod a+r $(LIBDIR)/libntl.a #LSTAT
+-# $(LIBTOOL) --mode=install cp -p libntl.la $(LIBDIR) #LSHAR
+-
++# mkdir -p -m 755 $(INCLUDEDIR)
++# rm -rf $(INCLUDEDIR)/NTL
++# mkdir -m 755 $(INCLUDEDIR)/NTL
++# cp -p ../include/NTL/*.h $(INCLUDEDIR)/NTL
++# - chmod -R a+r $(INCLUDEDIR)/NTL
++# mkdir -p -m 755 $(DOCDIR)
++# rm -rf $(DOCDIR)/NTL
++# mkdir -m 755 $(DOCDIR)/NTL
++# cp -p ../doc/*.txt $(DOCDIR)/NTL
++# cp -p ../doc/*.html $(DOCDIR)/NTL
++# cp -p ../doc/*.gif $(DOCDIR)/NTL
++# - chmod -R a+r $(DOCDIR)/NTL
++# mkdir -p -m 755 $(LIBDIR)
++# cp -p ntl.a $(LIBDIR)/libntl.a #LSTAT
++# - chmod a+r $(LIBDIR)/libntl.a #LSTAT
++## $(LIBTOOL) --mode=install cp -p libntl.la $(LIBDIR) #LSHAR
+ $(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(INCLUDEDIR)/NTL
+ $(BSD_INSTALL_DATA) ../include/NTL/*.h ${DESTDIR}$(INCLUDEDIR)/NTL
+ $(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(DOCDIR)/NTL
+ $(BSD_INSTALL_DATA) ../doc/*.txt ${DESTDIR}$(DOCDIR)/NTL
+ $(BSD_INSTALL_DATA) ../doc/*.html ${DESTDIR}$(DOCDIR)/NTL
-+
-
++ $(BSD_INSTALL_DATA) ../doc/*.gif ${DESTDIR}$(DOCDIR)/NTL
++ $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) libntl.la ${DESTDIR}$(LIBDIR)
uninstall:
-@@ -409,17 +405,17 @@ uninstall:
- #
+ rm -f $(LIBDIR)/libntl.a #LSTAT
+@@ -461,7 +473,7 @@ uninstall:
#################################################################
--clobber:
-- - rm ntl.a mach_desc.h ../include/NTL/mach_desc.h GetTime.c
-- - rm lip_gmp_aux_impl.h ../include/NTL/gmp_aux.h
-+clobber:
-+ - rm -fr libntl.la .libs mach_desc.h ../include/NTL/mach_desc.h GetTime.c
-+ - rm -f lip_gmp_aux_impl.h ../include/NTL/gmp_aux.h
- - sh RemoveProg $(PROGS) MakeDesc TestGetTime gen_lip_gmp_aux gen_gmp_aux
-- - rm *.o
-- - rm -r small
-+ - rm -f *.o *.lo
-+ - rm -fr small
+ clobber:
+- rm -f ntl.a mach_desc.h ../include/NTL/mach_desc.h GetTime.c
++ rm -f mach_desc.h ../include/NTL/mach_desc.h GetTime.c
+ rm -f lip_gmp_aux_impl.h ../include/NTL/gmp_aux.h
+ sh RemoveProg $(PROGS) MakeDesc TestGetTime gen_lip_gmp_aux gen_gmp_aux
+ rm -f *.o
+@@ -472,7 +484,7 @@ clobber:
clean:
-- - rm *.o
-+ - rm -f *.o *.lo
- - sh RemoveProg MakeDesc TestGetTime gen_lip_gmp_aux gen_gmp_aux
-- - rm -r small
-+ - rm -fr small
-
- #################################################################
- #
-@@ -436,7 +432,7 @@ DIRNAME=ntl-5.3.1
- WINDIR=WinNTL-5_3_1
-
- package:
-- sh unixify "$(SFILES)" "$(INCL)" "$(DOC)"
-+ sh unixify "$(SFILES)" "$(INCL)" "$(DOC)"
- -rm -r $(DIRNAME)
- mv unix $(DIRNAME)
- chmod -R a+rX $(DIRNAME)
-@@ -467,17 +463,17 @@ WO2 = $(WO1) ZZ_pX1.o lip.o tools.o vec_
- WOBJ = $(WO2)
+ sh RemoveProg MakeDesc TestGetTime gen_lip_gmp_aux gen_gmp_aux
+- rm -f *.o
++ rm -f *.o *.lo
+ rm -rf small
+ # - $(LIBTOOL) --mode=clean rm -f libntl.la *.lo #LSHAR
+@@ -522,22 +534,25 @@ WO3 = $(WO2) GF2.o WordVector.o vec_GF2.
+ WOBJ = $(WO3)
+ # wntl.a: LCOMP= #LSHAR
-wntl.a: $(WOBJ)
- $(AR) $(ARFLAGS) wntl.a $(WOBJ)
- - $(RANLIB) wntl.a
-+libwntl.la: $(WOBJ)
-+ $(LIBTOOL) --mode=link $(CC) -o libwntl.la $(WOBJ:.o=.lo) -rpath $(LIBDIR) \
-+ -version-info 0:0
-
-
++libwntl.la: $(WOBJ)
++# $(AR) $(ARFLAGS) wntl.a $(WOBJ)
++# - $(RANLIB) wntl.a
++ $(LIBTOOL) --mode=link $(CC) -o libwntl.la $(WOBJ:.o=.lo) \
++ -rpath $(LIBDIR) \
++ -version-info 0:0
MulTimeTest:
-- $(LINK_CXX) -o MulTimeTest MulTimeTest.c wntl.a $(GMP_LIBDIR) $(GMP_LIB) $(LDLIBS_CXX)
-+ $(LINK_CXX) -o MulTimeTest MulTimeTest.c libwntl.la $(GMP_LIBDIR) $(GMP_LIB) $(LDLIBS_CXX)
+- $(LINK_CXX) -o MulTimeTest MulTimeTest.c wntl.a $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(LDLIBS_CXX)
++ $(LINK_CXX) -o MulTimeTest MulTimeTest.c libwntl.la $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(LDLIBS_CXX)
PolyTimeTest:
-- $(LINK_CXX) -o PolyTimeTest PolyTimeTest.c wntl.a $(GMP_LIBDIR) $(GMP_LIB) $(LDLIBS_CXX)
-+ $(LINK_CXX) -o PolyTimeTest PolyTimeTest.c libwntl.la $(GMP_LIBDIR) $(GMP_LIB) $(LDLIBS_CXX)
+- $(LINK_CXX) -o PolyTimeTest PolyTimeTest.c wntl.a $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(LDLIBS_CXX)
++ $(LINK_CXX) -o PolyTimeTest PolyTimeTest.c libwntl.la $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(LDLIBS_CXX)
+
+ Poly1TimeTest:
+- $(LINK_CXX) -o Poly1TimeTest Poly1TimeTest.c wntl.a $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(LDLIBS_CXX)
++ $(LINK_CXX) -o Poly1TimeTest Poly1TimeTest.c libwntl.la $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(LDLIBS_CXX)
+
+
+ GF2XTimeTest:
+- $(LINK_CXX) -o GF2XTimeTest GF2XTimeTest.c wntl.a $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(LDLIBS_CXX)
++ $(LINK_CXX) -o GF2XTimeTest GF2XTimeTest.c libwntl.la $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(LDLIBS_CXX)
InitSettings:
$(LINK_CXX) -o InitSettings InitSettings.c $(LDLIBS_CXX)