hasufell
/
pqc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUILD: rm obsolete tompoly/tommath references

This commit is contained in:
hasufell 2014-05-25 01:36:44 +02:00
parent eb8fa515b4
commit bdb12ac175
No known key found for this signature in database
GPG Key ID: 220CD1C5BDEED020
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -8,8 +8,6 @@ clean:
$(MAKE) -C src clean $(MAKE) -C src clean
clean-all: clean clean-all: clean
$(MAKE) -C external/libtommath-0.42.0 clean
$(MAKE) -C external/libtompoly-0.04 clean
$(MAKE) -C external/flint-2.4.3 clean $(MAKE) -C external/flint-2.4.3 clean
doc: doc:

18
src/Makefile
View File

@ -45,15 +45,11 @@ PQC_HEADERS = err.h poly.h context.h encrypt.h decrypt.h keypair.h
INCS = -I. INCS = -I.
ifndef UNBUNDLE ifndef UNBUNDLE
LIBTOMMATH = ../external/libtommath-0.42.0/libtommath.a
LIBTOMPOLY = ../external/libtompoly-0.04/libtompoly.a
LIBFLINT = ../external/flint-2.4.3/libflint.a LIBFLINT = ../external/flint-2.4.3/libflint.a
INCS += -I../external/libtommath-0.42.0 \ INCS += -I../external/libtommath-0.42.0 \
-I../external/libtompoly-0.04 \ -I../external/libtompoly-0.04 \
-I../external/flint-2.4.3 -I../external/flint-2.4.3
else else
LIBTOMMATH = -ltommath
LIBTOMPOLY = -ltompoly
LIBFLINT = -lflint LIBFLINT = -lflint
endif endif
@ -68,12 +64,6 @@ all: libpqc.a libpqc.so
# $(CC) $(CFLAGS) -o $@ $(CUNIT_OBJS) $(LDFLAGS) $(CUNIT_LIBS) $(PQC_LIBS) $(LIBS) # $(CC) $(CFLAGS) -o $@ $(CUNIT_OBJS) $(LDFLAGS) $(CUNIT_LIBS) $(PQC_LIBS) $(LIBS)
ifndef UNBUNDLE ifndef UNBUNDLE
$(LIBTOMMATH):
$(MAKE) -C ../external/libtommath-0.42.0
$(LIBTOMPOLY):
$(MAKE) -C ../external/libtompoly-0.04
$(LIBFLINT): $(LIBFLINT):
cd ../external/flint-2.4.3 && ./configure --prefix=/usr --with-gmp=/usr --with-mpfr=/usr --disable-shared cd ../external/flint-2.4.3 && ./configure --prefix=/usr --with-gmp=/usr --with-mpfr=/usr --disable-shared
$(MAKE) -C ../external/flint-2.4.3 $(MAKE) -C ../external/flint-2.4.3
@ -82,13 +72,13 @@ endif
libpqc.a: $(PQC_OBJS) $(PQC_HEADERS) libpqc.a: $(PQC_OBJS) $(PQC_HEADERS)
$(AR) cru libpqc.a $(PQC_OBJS) $(AR) cru libpqc.a $(PQC_OBJS)
libpqc.so: libpqc.a $(PQC_HEADERS) $(LIBTOMMATH) $(LIBTOMPOLY) $(LIBFLINT) libpqc.so: libpqc.a $(PQC_HEADERS) $(LIBFLINT)
$(CC) -shared $(CFLAGS) -o $@ $(LDFLAGS) \ $(CC) -shared $(CFLAGS) -o $@ $(LDFLAGS) \
libpqc.a $(LIBTOMMATH) $(LIBTOMPOLY) $(LIBFLINT) $(LIBS) libpqc.a $(LIBFLINT) $(LIBS)
main: main.o libpqc.a $(LIBTOMMATH) $(LIBTOMPOLY) $(LIBFLINT) main: main.o libpqc.a $(LIBFLINT)
$(CC) $(CFLAGS) -o $@ $(LDFLAGS) \ $(CC) $(CFLAGS) -o $@ $(LDFLAGS) \
main.o $(LIBTOMPOLY) libpqc.a $(LIBTOMPOLY) $(LIBTOMMATH) $(LIBFLINT) $(LIBS) main.o libpqc.a $(LIBFLINT) $(LIBS)
install: install:
$(INSTALL_DIR) "$(DESTDIR)$(INSTALL_BINDIR)" $(INSTALL_DIR) "$(DESTDIR)$(INSTALL_BINDIR)"