From 226d37ac6fadadbf27659c0dbd4d2f97b7078f26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Thu, 29 Jan 2015 13:15:48 +0000 Subject: [PATCH] Fix merge issue --- programs/Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/programs/Makefile b/programs/Makefile index 0ebcf1faa..7fa901981 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -227,15 +227,11 @@ test/ssl_test: test/ssl_test.c ../library/libmbedtls.a echo " CC test/ssl_test.c" $(CC) $(CFLAGS) $(OFLAGS) test/ssl_test.c $(LDFLAGS) -o $@ -<<<<<<< HEAD -test/udp_proxy: test/udp_proxy.c ../library/libpolarssl.a +test/udp_proxy: test/udp_proxy.c ../library/libmbedtls.a echo " CC test/udp_proxy.c" $(CC) $(CFLAGS) $(OFLAGS) test/udp_proxy.c $(LDFLAGS) -o $@ -test/o_p_test: test/o_p_test.c ../library/libpolarssl.a -======= test/o_p_test: test/o_p_test.c ../library/libmbedtls.a ->>>>>>> development echo " CC test/o_p_test.c" $(CC) $(CFLAGS) $(OFLAGS) test/o_p_test.c $(LDFLAGS) -o $@ -lssl -lcrypto