1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
diff --git a/src/makefile b/src/makefile
index 42e70bb..89b8ad0 100644
--- a/src/makefile
+++ b/src/makefile
@@ -110,13 +110,13 @@ libopaque.$(AEXT): common.o opaque.o $(EXTRA_OBJECTS)
$(AR) -rcs libopaque.$(AEXT) $^
tests/opaque-test$(EXT): tests/opaque-test.c libopaque.$(SOEXT)
- $(CC) $(CFLAGS) -o tests/opaque-test$(EXT) tests/opaque-test.c -L. -lopaque $(LDFLAGS)
+ $(CC) $(CPPFLAGS) $(CFLAGS) -o tests/opaque-test$(EXT) tests/opaque-test.c -L. -lopaque $(LDFLAGS)
tests/opaque-munit$(EXT): tests/opaque-munit.c libopaque.$(SOEXT)
- $(CC) $(CFLAGS) -o tests/opaque-munit$(EXT) tests/munit/munit.c tests/opaque-munit.c -L. -lopaque $(LDFLAGS)
+ $(CC) $(CPPFLAGS) $(CFLAGS) -o tests/opaque-munit$(EXT) tests/munit/munit.c tests/opaque-munit.c -L. -lopaque $(LDFLAGS)
common-v.o: common.c
- $(CC) $(CFLAGS) -DCFRG_TEST_VEC -o $@ -c $<
+ $(CC) $(CPPFLAGS) $(CFLAGS) -DCFRG_TEST_VEC -o $@ -c $<
opaque-tv1.o: opaque.c
$(CC) $(CFLAGS) -I$(OPRFHOME) -DCFRG_TEST_VEC -o $@ -c $<
@@ -133,7 +133,7 @@ test: tests
LD_LIBRARY_PATH=. ./tests/opaque-munit$(EXT) --fatal-failures
utils/opaque: utils/main.c libopaque.$(SOEXT)
- $(CC) $(CFLAGS) -I. -o utils/opaque utils/main.c -L. $(LDFLAGS) -lopaque -lsodium
+ $(CC) $(CPPFLAGS) $(CFLAGS) -I. -o utils/opaque utils/main.c -L. $(LDFLAGS) -lopaque -lsodium
install: $(DESTDIR)$(PREFIX)/lib/libopaque.$(SOEXT) $(DESTDIR)$(PREFIX)/lib/libopaque.$(AEXT) $(DESTDIR)$(PREFIX)/include/opaque.h $(DESTDIR)$(PREFIX)/bin/opaque $(MANPAGES-install)
@@ -170,10 +170,10 @@ $(DESTDIR)$(PREFIX)/bin/opaque: utils/opaque
cp $< $@
opaque.o: opaque.c
- $(CC) $(CFLAGS) -I$(OPRFINCDIR) -o $@ -c $<
+ $(CC) $(CPPFLAGS) $(CFLAGS) -I$(OPRFINCDIR) -o $@ -c $<
%.o: %.c
- $(CC) $(CFLAGS) -o $@ -c $<
+ $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
win/libsodium-win64:
@echo 'win/libsodium-win64 not found.'
|
