diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-07 08:43:01 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-07 08:43:01 -0600 |
commit | 26b2fe3e5bfff38e941312edf4a6fe94a9e4dd43 (patch) | |
tree | f1eaf63c160822c9e89b9211678d2893d368e3df /apps/examples/ostest | |
parent | 0245ea571aff1a005054c608dd187dbb4cfd194f (diff) | |
download | nuttx-26b2fe3e5bfff38e941312edf4a6fe94a9e4dd43.tar.gz nuttx-26b2fe3e5bfff38e941312edf4a6fe94a9e4dd43.tar.bz2 nuttx-26b2fe3e5bfff38e941312edf4a6fe94a9e4dd43.zip |
Changes to many Makefiles. For kernel buil object containing main cannot go into library because of name collisions. The object file must be handled as a special case in every Makefile
Diffstat (limited to 'apps/examples/ostest')
-rw-r--r-- | apps/examples/ostest/Makefile | 51 |
1 files changed, 26 insertions, 25 deletions
diff --git a/apps/examples/ostest/Makefile b/apps/examples/ostest/Makefile index d121c683e..c6712038e 100644 --- a/apps/examples/ostest/Makefile +++ b/apps/examples/ostest/Makefile @@ -39,82 +39,83 @@ include $(APPDIR)/Make.defs # ostest built-in application info -APPNAME = ostest -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 2048 +APPNAME = ostest +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 2048 # NuttX OS Test -ASRCS = -CSRCS = ostest_main.c dev_null.c restart.c +ASRCS = +CSRCS = dev_null.c restart.c +MAINSRC = ostest_main.c ifeq ($(CONFIG_ARCH_FPU),y) -CSRCS += fpu.c +CSRCS += fpu.c endif ifeq ($(CONFIG_SCHED_WAITPID),y) -CSRCS += waitpid.c +CSRCS += waitpid.c endif ifneq ($(CONFIG_DISABLE_PTHREAD),y) -CSRCS += cancel.c cond.c mutex.c sem.c barrier.c +CSRCS += cancel.c cond.c mutex.c sem.c barrier.c ifneq ($(CONFIG_RR_INTERVAL),0) -CSRCS += roundrobin.c +CSRCS += roundrobin.c endif # CONFIG_RR_INTERVAL ifeq ($(CONFIG_MUTEX_TYPES),y) -CSRCS += rmutex.c +CSRCS += rmutex.c endif # CONFIG_MUTEX_TYPES endif # CONFIG_DISABLE_PTHREAD ifneq ($(CONFIG_DISABLE_SIGNALS),y) -CSRCS += sighand.c +CSRCS += sighand.c ifneq ($(CONFIG_DISABLE_PTHREAD),y) -CSRCS += timedwait.c +CSRCS += timedwait.c endif # CONFIG_DISABLE_PTHREAD endif # CONFIG_DISABLE_SIGNALS ifneq ($(CONFIG_DISABLE_MQUEUE),y) ifneq ($(CONFIG_DISABLE_PTHREAD),y) -CSRCS += mqueue.c timedmqueue.c +CSRCS += mqueue.c timedmqueue.c endif # CONFIG_DISABLE_PTHREAD endif # CONFIG_DISABLE_MQUEUE ifneq ($(CONFIG_DISABLE_POSIX_TIMERS),y) -CSRCS += posixtimer.c +CSRCS += posixtimer.c endif ifeq ($(CONFIG_ARCH_HAVE_VFORK),y) ifeq ($(CONFIG_SCHED_WAITPID),y) -CSRCS += vfork.c +CSRCS += vfork.c endif endif ifneq ($(CONFIG_DISABLE_SIGNALS),y) ifneq ($(CONFIG_DISABLE_PTHREAD),y) ifeq ($(CONFIG_PRIORITY_INHERITANCE),y) -CSRCS += prioinherit.c +CSRCS += prioinherit.c endif # CONFIG_PRIORITY_INHERITANCE endif # CONFIG_DISABLE_PTHREAD endif # CONFIG_DISABLE_SIGNALS -AOBJS = $(ASRCS:.S=$(OBJEXT)) -COBJS = $(CSRCS:.c=$(OBJEXT)) +AOBJS = $(ASRCS:.S=$(OBJEXT)) +COBJS = $(CSRCS:.c=$(OBJEXT)) MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) -SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) -OBJS = $(AOBJS) $(COBJS) +SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) +OBJS = $(AOBJS) $(COBJS) ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif ifeq ($(CONFIG_WINDOWS_NATIVE),y) - BIN = ..\..\libapps$(LIBEXT) + BIN = ..\..\libapps$(LIBEXT) else ifeq ($(WINTOOL),y) - BIN = ..\\..\\libapps$(LIBEXT) + BIN = ..\\..\\libapps$(LIBEXT) else - BIN = ../../libapps$(LIBEXT) + BIN = ../../libapps$(LIBEXT) endif endif @@ -127,11 +128,11 @@ endif CONFIG_XYZ_PROGNAME ?= ostest$(EXEEXT) PROGNAME = $(CONFIG_XYZ_PROGNAME) -ROOTDEPPATH = --dep-path . +ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean |