From 9a17b36e55aa7684553a423e87387632e18cb3eb Mon Sep 17 00:00:00 2001 From: Amit Khatri Date: Sat, 31 May 2014 13:36:59 +0300 Subject: [PATCH] tests: Makefile change avoiding compiler error for module test wpa_supplicant was giving below error when "CONFIG_MODULE_TESTS=y" and "CONFIG_P2P=y" are in .config file: "wpas_module_tests.c:84: undefined reference to `wps_module_tests'" This error is coming because "CONFIG_WPS=y" is commented out in .config file but CONFIG_WPS is getting enabled by CONFIG_P2P in Makefile. Signed-off-by: Amit Khatri --- wpa_supplicant/Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile index e684555ad..817a69d64 100644 --- a/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile @@ -97,16 +97,6 @@ OBJS += ../src/utils/os_$(CONFIG_OS).o OBJS_p += ../src/utils/os_$(CONFIG_OS).o OBJS_c += ../src/utils/os_$(CONFIG_OS).o -ifdef CONFIG_MODULE_TESTS -CFLAGS += -DCONFIG_MODULE_TESTS -OBJS += wpas_module_tests.o -OBJS += ../src/utils/utils_module_tests.o -OBJS += ../src/common/common_module_tests.o -ifdef CONFIG_WPS -OBJS += ../src/wps/wps_module_tests.o -endif -endif - ifdef CONFIG_WPA_TRACE CFLAGS += -DWPA_TRACE OBJS += ../src/utils/trace.o @@ -1501,6 +1491,16 @@ OBJS += offchannel.o CFLAGS += -DCONFIG_OFFCHANNEL endif +ifdef CONFIG_MODULE_TESTS +CFLAGS += -DCONFIG_MODULE_TESTS +OBJS += wpas_module_tests.o +OBJS += ../src/utils/utils_module_tests.o +OBJS += ../src/common/common_module_tests.o +ifdef CONFIG_WPS +OBJS += ../src/wps/wps_module_tests.o +endif +endif + OBJS += ../src/drivers/driver_common.o OBJS_priv += ../src/drivers/driver_common.o