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/nx | |
| 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/nx')
| -rw-r--r-- | apps/examples/nx/Makefile | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/apps/examples/nx/Makefile b/apps/examples/nx/Makefile index fadcddfa5..6b0d59d11 100644 --- a/apps/examples/nx/Makefile +++ b/apps/examples/nx/Makefile @@ -39,30 +39,31 @@ include $(APPDIR)/Make.defs # NuttX NX Graphics Example. -ASRCS = -CSRCS = nx_main.c nx_events.c nx_kbdin.c +ASRCS = +CSRCS = nx_events.c nx_kbdin.c ifeq ($(CONFIG_NX_MULTIUSER),y) -CSRCS += nx_server.c +CSRCS += nx_server.c endif +MAINSRC = nx_main.c -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 @@ -75,17 +76,17 @@ endif CONFIG_XYZ_PROGNAME ?= nx$(EXEEXT) PROGNAME = $(CONFIG_XYZ_PROGNAME) -ROOTDEPPATH = --dep-path . +ROOTDEPPATH = --dep-path . # NX built-in application info -APPNAME = nx -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 2048 +APPNAME = nx +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: context clean depend distclean |