summaryrefslogtreecommitdiff
path: root/jni/iodine/tests/Makefile
diff options
context:
space:
mode:
authorYves Fischer <yvesf-git@xapek.org>2014-08-11 23:26:36 +0200
committerYves Fischer <yvesf-git@xapek.org>2014-08-11 23:26:36 +0200
commit5d8801d4687035ae45143f0f3bc3eeaf75dc17ec (patch)
treebf4395fd5938eb1865ba90b6e52e169d727d9404 /jni/iodine/tests/Makefile
parent1251ce0d7cf2619f9b41637dcb88bebb66e54fb3 (diff)
downloadandiodine-5d8801d4687035ae45143f0f3bc3eeaf75dc17ec.tar.gz
andiodine-5d8801d4687035ae45143f0f3bc3eeaf75dc17ec.zip
Upgrade code to iodine 0.7.0 and improve logging
Diffstat (limited to 'jni/iodine/tests/Makefile')
-rw-r--r--jni/iodine/tests/Makefile14
1 files changed, 6 insertions, 8 deletions
diff --git a/jni/iodine/tests/Makefile b/jni/iodine/tests/Makefile
index 3a7ac01..03eed98 100644
--- a/jni/iodine/tests/Makefile
+++ b/jni/iodine/tests/Makefile
@@ -1,26 +1,24 @@
-CC = gcc
TEST = test
-OBJS = test.o base32.o base64.o read.o dns.o encoding.o login.o user.o fw_query.o
-SRCOBJS = ../src/base32.o ../src/base64.o ../src/read.o ../src/dns.o ../src/encoding.o ../src/login.o ../src/md5.o ../src/user.o ../src/fw_query.o
+OBJS = test.o base32.o base64.o common.o read.o dns.o encoding.o login.o user.o fw_query.o
+SRCOBJS = ../src/base32.o ../src/base64.o ../src/common.o ../src/read.o ../src/dns.o ../src/encoding.o ../src/login.o ../src/md5.o ../src/user.o ../src/fw_query.o
OS = `uname | tr "a-z" "A-Z"`
CHECK_PATH = /usr/local
-LDFLAGS = -L$(CHECK_PATH)/lib -lcheck `../src/osflags link`
-CFLAGS = -g -Wall -D$(OS) -I../src -I$(CHECK_PATH)/include -pedantic `../src/osflags cflags`
+LDFLAGS = -L$(CHECK_PATH)/lib `pkg-config check --libs` -lpthread `sh ../src/osflags $(TARGETOS) link`
+CFLAGS = -std=c99 -g -Wall -D$(OS) `pkg-config check --cflags` -I../src -I$(CHECK_PATH)/include -pedantic `sh ../src/osflags $(TARGETOS) cflags`
all: $(TEST)
@LD_LIBRARY_PATH=${CHECK_PATH}/lib ./$(TEST)
$(TEST): $(OBJS) $(SRCOBJS)
@echo LD $(TEST)
- @$(CC) -o $@ $(SRCOBJS) $(OBJS) $(LDFLAGS)
+ @$(CC) -o $@ $(SRCOBJS) $(OBJS) $(LDFLAGS)
-.c.o:
+.c.o:
@echo CC $<
@$(CC) $(CFLAGS) -c $<
-
clean:
@echo "Cleaning tests/"
@rm -f *~ *.core $(TEST) $(OBJS)