From f011187bed9e3093bc38f5793db4c66d6af3e324 Mon Sep 17 00:00:00 2001 From: John Hodge Date: Mon, 12 May 2014 14:43:26 +0800 Subject: [PATCH] UTest+MTest - Minor makefile fixes for travis-ci --- Tools/NetTest/Makefile | 2 +- Tools/nativelib/Makefile | 2 +- Usermode/Libraries/Makefile.tpl | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Tools/NetTest/Makefile b/Tools/NetTest/Makefile index f76c8b47..913a9bea 100644 --- a/Tools/NetTest/Makefile +++ b/Tools/NetTest/Makefile @@ -23,7 +23,7 @@ L_OBJ = vfs_shim.o nic.o tcpclient.o tcpserver.o helpers.o cmdline_backend.o N_OBJ = main.o tap.o mode_cmdline.o # Compilation Options -CFLAGS := -Wall -std=gnu99 -g -Werror -O0 -pthread +CFLAGS := -Wall -std=gnu99 -g -O0 -pthread CPPFLAGS := -I include/ -I ../nativelib/include K_CPPFLAGS := -I $(KERNEL_SRC)include -I $(MODULE_SRC) -I ../../Usermode/Libraries/ld-acess.so_src/include_exp/ LDFLAGS += -Wl,--defsym,__buildnum=$(BUILD_NUM) -g -L .. -lpthread -lnativelib diff --git a/Tools/nativelib/Makefile b/Tools/nativelib/Makefile index 1a50d881..8a8fc330 100644 --- a/Tools/nativelib/Makefile +++ b/Tools/nativelib/Makefile @@ -19,7 +19,7 @@ KOBJ := $(KOBJ:%.o=obj/_Kernel/%.o) OBJ := $(NOBJ) $(LOBJ) $(KOBJ) BIN := ../libnativelib.a -CFLAGS := -Wall -std=c99 -Werror +CFLAGS := -Wall -std=c99 CPPFLAGS := -I include diff --git a/Usermode/Libraries/Makefile.tpl b/Usermode/Libraries/Makefile.tpl index 5c796c3a..79bb8456 100644 --- a/Usermode/Libraries/Makefile.tpl +++ b/Usermode/Libraries/Makefile.tpl @@ -122,6 +122,8 @@ obj-native/%.no: %.c TEST_%: obj-native/TEST_%.no obj-native/%.no $(NCC) -g -o $@ $^ +.SECONDARY: %.no + -include $(UTESTS:%=obj-native/TEST_%.no.dep) -include $(UTESTS:%=obj-native/%.no.dep) -- 2.20.1