diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-07 09:17:23 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-07 09:17:23 -0600 |
| commit | 14ba1f33ae8f55a3c7f556cf28647c7116b6c3c4 (patch) | |
| tree | 20444f1055f8c11f92fa29978ed0b2bd3a9559f6 /apps/system/composite/Makefile | |
| parent | fb7a08922178beb0cb053a00d1377366d4279e87 (diff) | |
| download | nuttx-14ba1f33ae8f55a3c7f556cf28647c7116b6c3c4.tar.gz nuttx-14ba1f33ae8f55a3c7f556cf28647c7116b6c3c4.tar.bz2 nuttx-14ba1f33ae8f55a3c7f556cf28647c7116b6c3c4.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/system/composite/Makefile')
| -rw-r--r-- | apps/system/composite/Makefile | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/apps/system/composite/Makefile b/apps/system/composite/Makefile index ee7a816ab..98cb66d54 100644 --- a/apps/system/composite/Makefile +++ b/apps/system/composite/Makefile @@ -39,27 +39,28 @@ include $(APPDIR)/Make.defs # USB device mass storage add-on -ASRCS = -CSRCS = composite_main.c +ASRCS = +CSRCS = +MAINSRC = composite_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 @@ -72,21 +73,21 @@ endif CONFIG_XYZ_PROGNAME ?= composite$(EXEEXT) PROGNAME = $(CONFIG_XYZ_PROGNAME) -ROOTDEPPATH = --dep-path . +ROOTDEPPATH = --dep-path . # USB storage built-in application info -APPNAME1 = conn -PRIORITY1 = SCHED_PRIORITY_DEFAULT -STACKSIZE1 = 2048 +APPNAME1 = conn +PRIORITY1 = SCHED_PRIORITY_DEFAULT +STACKSIZE1 = 2048 -APPNAME2 = disconn -PRIORITY2 = SCHED_PRIORITY_DEFAULT -STACKSIZE2 = 2048 +APPNAME2 = disconn +PRIORITY2 = SCHED_PRIORITY_DEFAULT +STACKSIZE2 = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: context clean depend distclean |