--- ./fmpz.c.orig 2010-12-23 20:45:11.000000000 -0700
+++ ./fmpz.c 2011-07-18 15:09:24.366375894 -0600
@@ -37,7 +37,7 @@
#include "mpn_extras.h"
#include "F_mpn_mul-tuning.h"
#include "long_extras.h"
-#include "zn_poly/src/zn_poly.h"
+#include <zn_poly/zn_poly.h>
#define SWAP_PTRS(x_dummy_p, y_dummy_p) \
do { \
--- ./fmpz_poly.c.orig 2010-12-23 20:45:11.000000000 -0700
+++ ./fmpz_poly.c 2011-07-18 15:09:24.371375895 -0600
@@ -44,7 +44,7 @@
#include "ZmodF_poly.h"
#include "long_extras.h"
#include "zmod_poly.h"
-#include "zn_poly/src/zn_poly.h"
+#include <zn_poly/zn_poly.h>
#include "F_mpz.h"
#include "F_mpz_poly.h"
--- ./zmod_poly.h.orig 2010-12-23 20:45:11.000000000 -0700
+++ ./zmod_poly.h 2011-07-18 15:09:24.373375895 -0600
@@ -38,7 +38,7 @@
#include "memory-manager.h"
#include "mpn_extras.h"
#include "long_extras.h"
-#include "zn_poly/src/zn_poly.h"
+#include <zn_poly/zn_poly.h>
#ifndef _ZMOD_POLY_H_
#define _ZMOD_POLY_H_
--- ./F_mpz.c.orig 2010-12-23 20:45:11.000000000 -0700
+++ ./F_mpz.c 2011-07-18 15:09:24.375375895 -0600
@@ -40,7 +40,7 @@
#include "long_extras.h"
#include "F_mpz.h"
#include "mpz_extras.h"
-#include "zn_poly/src/zn_poly.h"
+#include <zn_poly/zn_poly.h>
/*===============================================================================
--- ./makefile.orig 2011-07-18 15:09:12.855375894 -0600
+++ ./makefile 2011-07-18 15:09:24.377375895 -0600
@@ -20,9 +20,9 @@
CXX = g++
endif
-LIBS = -L$(FLINT_GMP_LIB_DIR) $(FLINT_LINK_OPTIONS) -lmpfr -lmpir -lpthread -lm
+LIBS = -L$(FLINT_GMP_LIB_DIR) $(FLINT_LINK_OPTIONS) -lzn_poly -lmpfr -lgmp -lm
-LIBS2 = -L$(FLINT_GMP_LIB_DIR) -L$(FLINT_NTL_LIB_DIR) $(FLINT_LINK_OPTIONS) -lntl -lmpfr -lmpir -lpthread -lm
+LIBS2 = -L$(FLINT_GMP_LIB_DIR) -L$(FLINT_NTL_LIB_DIR) $(FLINT_LINK_OPTIONS) -lzn_poly -lmpfr -lgmp -lgomp -lm
ifndef FLINT_NTL_INCLUDE_DIR
INCS = -I$(FLINT_GMP_INCLUDE_DIR) -I$(FLINT_MPFR_INCLUDE_DIR)
@@ -36,11 +36,6 @@
RM = rm -f
HEADERS = \
- zn_poly/src/zn_poly.h \
- zn_poly/src/wide_arith.h \
- zn_poly/src/support.h \
- zn_poly/src/profiler.h \
- zn_poly/src/zn_poly_internal.h \
mpz_extras.h \
F_mpn_mul-tuning.h \
ZmodF.h \
@@ -78,23 +73,6 @@
####### library object files
FLINTOBJ = \
- zn_mod.o \
- misc.o \
- mul_ks.o \
- pack.o \
- mul.o \
- mulmid.o \
- mulmid_ks.o \
- ks_support.o \
- mpn_mulmid.o \
- nuss.o \
- pmf.o \
- pmfvec_fft.o \
- tuning.o \
- mul_fft.o \
- mul_fft_dft.o \
- array.o \
- invert.o \
mpn_extras.o \
mpz_extras.o \
memory-manager.o \
@@ -176,59 +154,6 @@
libflint.a: $(FLINTOBJ)
$(AR) rcs libflint.a $(FLINTOBJ)
-##### zn_poly object files
-
-zn_mod.o: zn_poly/src/zn_mod.c $(HEADERS)
- $(CC) $(CFLAGS) -DNDEBUG -o zn_mod.o -c zn_poly/src/zn_mod.c
-
-misc.o: zn_poly/src/misc.c $(HEADERS)
- $(CC) $(CFLAGS) -DNDEBUG -o misc.o -c zn_poly/src/misc.c
-
-ks_support.o: zn_poly/src/ks_support.c $(HEADERS)
- $(CC) $(CFLAGS) -DNDEBUG -o ks_support.o -c zn_poly/src/ks_support.c
-
-mul_ks.o: zn_poly/src/mul_ks.c $(HEADERS)
- $(CC) $(CFLAGS) -DNDEBUG -o mul_ks.o -c zn_poly/src/mul_ks.c
-
-pack.o: zn_poly/src/pack.c $(HEADERS)
- $(CC) $(CFLAGS) -DNDEBUG -o pack.o -c zn_poly/src/pack.c
-
-nuss.o: zn_poly/src/nuss.c $(HEADERS)
- $(CC) $(CFLAGS) -DNDEBUG -o nuss.o -c zn_poly/src/nuss.c
-
-mul.o: zn_poly/src/mul.c $(HEADERS)
- $(CC) $(CFLAGS) -DNDEBUG -o mul.o -c zn_poly/src/mul.c
-
-mulmid.o: zn_poly/src/mulmid.c $(HEADERS)
- $(CC) $(CFLAGS) -DNDEBUG -o mulmid.o -c zn_poly/src/mulmid.c
-
-mpn_mulmid.o: zn_poly/src/mpn_mulmid.c $(HEADERS)
- $(CC) $(CFLAGS) -DNDEBUG -o mpn_mulmid.o -c zn_poly/src/mpn_mulmid.c
-
-mulmid_ks.o: zn_poly/src/mulmid_ks.c $(HEADERS)
- $(CC) $(CFLAGS) -DNDEBUG -o mulmid_ks.o -c zn_poly/src/mulmid_ks.c
-
-pmf.o: zn_poly/src/pmf.c $(HEADERS)
- $(CC) $(CFLAGS) -DNDEBUG -o pmf.o -c zn_poly/src/pmf.c
-
-pmfvec_fft.o: zn_poly/src/pmfvec_fft.c $(HEADERS)
- $(CC) $(CFLAGS) -DNDEBUG -o pmfvec_fft.o -c zn_poly/src/pmfvec_fft.c
-
-tuning.o: zn_poly/src/tuning.c $(HEADERS)
- $(CC) $(CFLAGS) -DNDEBUG -o tuning.o -c zn_poly/src/tuning.c
-
-mul_fft.o: zn_poly/src/mul_fft.c $(HEADERS)
- $(CC) $(CFLAGS) -DNDEBUG -o mul_fft.o -c zn_poly/src/mul_fft.c
-
-mul_fft_dft.o: zn_poly/src/mul_fft_dft.c $(HEADERS)
- $(CC) $(CFLAGS) -DNDEBUG -o mul_fft_dft.o -c zn_poly/src/mul_fft_dft.c
-
-array.o: zn_poly/src/array.c $(HEADERS)
- $(CC) $(CFLAGS) -DNDEBUG -o array.o -c zn_poly/src/array.c
-
-invert.o: zn_poly/src/invert.c $(HEADERS)
- $(CC) $(CFLAGS) -DNDEBUG -o invert.o -c zn_poly/src/invert.c
-
##### Object files
mpn_extras.o: mpn_extras.c $(HEADERS)
@@ -647,7 +572,7 @@
####### Integer multiplication timing
-ZMULOBJ = zn_mod.o misc.o mul_ks.o pack.o mul.o mulmid.o mulmid_ks.o ks_support.o mpn_mulmid.o nuss.o pmf.o pmfvec_fft.o tuning.o mul_fft.o mul_fft_dft.o array.o invert.o zmod_mat.o zmod_poly.o memory-manager.o fmpz.o ZmodF_mul-tuning.o mpz_poly.o mpz_poly-tuning.o fmpz_poly.o ZmodF_poly.o mpz_extras.o profiler.o ZmodF_mul.o ZmodF.o mpn_extras.o F_mpz_mul-timing.o long_extras.o factor_base.o poly.o sieve.o linear_algebra.o block_lanczos.o
+ZMULOBJ = zmod_mat.o zmod_poly.o memory-manager.o fmpz.o ZmodF_mul-tuning.o mpz_poly.o mpz_poly-tuning.o fmpz_poly.o ZmodF_poly.o mpz_extras.o profiler.o ZmodF_mul.o ZmodF.o mpn_extras.o F_mpz_mul-timing.o long_extras.o factor_base.o poly.o sieve.o linear_algebra.o block_lanczos.o
F_mpz_mul-timing: $(FLINTOBJ)
$(CC) $(CFLAGS) F_mpz_mul-timing.c profiler.o -o Zmul $(FLINTOBJ) $(LIBS)
--- ./F_mpz.h.orig 2010-12-23 20:45:11.000000000 -0700
+++ ./F_mpz.h 2011-07-18 15:09:24.378375895 -0600
@@ -38,7 +38,7 @@
#endif
#include "flint.h"
#include "mpn_extras.h"
-#include "zn_poly/src/zn_poly.h"
+#include <zn_poly/zn_poly.h>
/*
--- ./fmpz.h.orig 2010-12-23 20:45:11.000000000 -0700
+++ ./fmpz.h 2011-07-18 15:09:24.379375895 -0600
@@ -36,7 +36,7 @@
#include "memory-manager.h"
#include "flint.h"
#include "long_extras.h"
-#include "zn_poly/src/zn_poly.h"
+#include <zn_poly/zn_poly.h>
typedef mp_limb_t * fmpz_t;
