diff options
-rw-r--r-- | apps/examples/elf/tests/Makefile | 8 | ||||
-rw-r--r-- | apps/examples/nxflat/tests/Makefile | 12 |
2 files changed, 16 insertions, 4 deletions
diff --git a/apps/examples/elf/tests/Makefile b/apps/examples/elf/tests/Makefile index 17732c775..84e0e322e 100644 --- a/apps/examples/elf/tests/Makefile +++ b/apps/examples/elf/tests/Makefile @@ -1,7 +1,7 @@ ############################################################################ # apps/examples/elf/tests/Makefile # -# Copyright (C) 2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -38,7 +38,7 @@ include $(APPDIR)/Make.defs ALL_SUBDIRS = errno hello helloxx longjmp mutex pthread signal task struct -BUILD_SUBDIRS = errno hello task struct +BUILD_SUBDIRS = errno hello struct ifeq ($(CONFIG_HAVE_CXX),y) BUILD_SUBDIRS += helloxx @@ -56,6 +56,10 @@ ifneq ($(CONFIG_DISABLE_SIGNALS),y) BUILD_SUBDIRS += signal endif +ifneq ($(CONFIG_ARCH_ADDRENV),y) +BUILD_SUBDIRS += task +endif + ELF_DIR = $(APPDIR)/examples/elf TESTS_DIR = $(ELF_DIR)/tests ROMFS_DIR = $(TESTS_DIR)/romfs diff --git a/apps/examples/nxflat/tests/Makefile b/apps/examples/nxflat/tests/Makefile index 8a65d6494..265ac27c1 100644 --- a/apps/examples/nxflat/tests/Makefile +++ b/apps/examples/nxflat/tests/Makefile @@ -1,7 +1,7 @@ ############################################################################ # apps/examples/nxflat/tests/Makefile # -# Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. +# Copyright (C) 2009, 2011, 2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -35,7 +35,15 @@ # Most of these do no build yet #SUBDIRS = errno hello hello++ longjmp mutex pthread signal task struct -SUBDIRS = errno hello mutex pthread task struct +SUBDIRS = errno hello struct + +ifneq ($(CONFIG_DISABLE_PTHREAD),y) +BUILD_SUBDIRS += mutex pthread +endif + +ifneq ($(CONFIG_ARCH_ADDRENV),y) +BUILD_SUBDIRS += task +endif NXFLAT_DIR = $(APPDIR)/examples/nxflat TESTS_DIR = $(NXFLAT_DIR)/tests |