sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gregory Nutt 2014-09-07 09:17:23 -06:00
parent ab5cf06c48
commit 681b3baf96
21 changed files with 315 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
system/cdcacm/Makefile
View File

@ -40,7 +40,8 @@ include $(APPDIR)/Make.defs
# USB CDC/ACM serial mass storage add-on
ASRCS =
CSRCS = cdcacm_main.c
CSRCS =
MAINSRC = cdcacm_main.c
AOBJS = $(ASRCS:.S=$(OBJEXT))
COBJS = $(CSRCS:.c=$(OBJEXT))

3
system/composite/Makefile
View File

@ -40,7 +40,8 @@ include $(APPDIR)/Make.defs
# USB device mass storage add-on
ASRCS =
CSRCS = composite_main.c
CSRCS =
MAINSRC = composite_main.c
AOBJS = $(ASRCS:.S=$(OBJEXT))
COBJS = $(CSRCS:.c=$(OBJEXT))

3
system/flash_eraseall/Makefile
View File

@ -54,7 +54,8 @@ PRIORITY = SCHED_PRIORITY_DEFAULT
STACKSIZE = 1024
ASRCS =
CSRCS = flash_eraseall.c
CSRCS =
MAINSRC = flash_eraseall.c
AOBJS = $(ASRCS:.S=$(OBJEXT))
COBJS = $(CSRCS:.c=$(OBJEXT))

3
system/free/Makefile
View File

@ -50,7 +50,8 @@ PRIORITY = SCHED_PRIORITY_DEFAULT
STACKSIZE = 768
ASRCS =
CSRCS = free.c
CSRCS =
MAINSRC = free.c
AOBJS = $(ASRCS:.S=$(OBJEXT))
COBJS = $(CSRCS:.c=$(OBJEXT))

40
system/hex2bin/Makefile
View File

@ -42,23 +42,33 @@ include $(APPDIR)/Make.defs
ASRCS =
CSRCS = hex2bin.c hex2mem.c fhex2mem.c
ifeq ($(CONFIG_BUILD_KERNEL),y)
HEX2BIN_MAINSRC = hex2bin_main.c
HEX2MEM_MAINSRC = hex2mem_main.c
else
ifeq ($(CONFIG_SYSTEM_HEX2BIN_BUILTIN),y)
CSRCS += hex2bin_main.c
HEX2BIN_MAINSRC = hex2bin_main.c
endif
ifeq ($(CONFIG_SYSTEM_HEX2MEM_BUILTIN),y)
CSRCS += hex2mem_main.c
HEX2MEM_MAINSRC = hex2mem_main.c
endif
endif
AOBJS = $(ASRCS:.S=$(OBJEXT))
COBJS = $(CSRCS:.c=$(OBJEXT))
MAINOBJ = $(MAINSRC:.c=$(OBJEXT))
HEX2BIN_MAINOBJ = $(HEX2BIN_MAINSRC:.c=$(OBJEXT))
HEX2MEM_MAINOBJ = $(HEX2MEM_MAINSRC:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS) $(MAINSRC)
OBJS = $(AOBJS) $(COBJS)
ifneq ($(CONFIG_BUILD_KERNEL),y)
OBJS += $(MAINOBJ)
OBJS += $(HEX2BIN_MAINOBJ) $(HEX2MEM_MAINOBJ)
endif
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
@ -77,8 +87,11 @@ else
INSTALL_DIR = $(BIN_DIR)
endif
CONFIG_XYZ_PROGNAME ?= hex2bin$(EXEEXT)
PROGNAME = $(CONFIG_XYZ_PROGNAME)
CONFIG_EXAMPLES_HEX2BIN_PROGNAME ?= hex2bin$(EXEEXT)
HEX2BIN_PROGNAME = $(CONFIG_EXAMPLES_HEX2BIN_PROGNAME)
CONFIG_EXAMPLES_HEX2MEM_PROGNAME ?= hex2mem$(EXEEXT)
HEX2MEM_PROGNAME = $(CONFIG_EXAMPLES_HEX2MEM_PROGNAME)
ROOTDEPPATH = --dep-path .
VPATH =
@ -131,12 +144,17 @@ rhex2mem:
endif
ifeq ($(CONFIG_BUILD_KERNEL),y)
$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ)
@echo "LD: $(PROGNAME)"
$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS)
$(Q) $(NM) -u $(INSTALL_DIR)$(DELIM)$(PROGNAME)
$(BIN_DIR)$(DELIM)$(HEX2BIN_PROGNAME): $(OBJS) $(HEX2BIN_MAINOBJ)
@echo "LD: $(HEX2BIN_PROGNAME)"
$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(HEX2BIN_PROGNAME) $(ARCHCRT0OBJ) $(HEX2BIN_MAINOBJ) $(LDLIBS)
$(Q) $(NM) -u $(INSTALL_DIR)$(DELIM)$(HEX2BIN_PROGNAME)
install: $(BIN_DIR)$(DELIM)$(PROGNAME)
$(BIN_DIR)$(DELIM)$(HEX2MEM_PROGNAME): $(OBJS) $(HEX2MEM_MAINOBJ)
@echo "LD: $(HEX2MEM_PROGNAME)"
$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(HEX2MEM_PROGNAME) $(ARCHCRT0OBJ) $(HEX2MEM_MAINOBJ) $(LDLIBS)
$(Q) $(NM) -u $(INSTALL_DIR)$(DELIM)$(HEX2MEM_PROGNAME)
install: $(BIN_DIR)$(DELIM)$(HEX2BIN_PROGNAME) $(BIN_DIR)$(DELIM)$(HEX2MEM_PROGNAME)
else
install:

3
system/i2c/Makefile
View File

@ -40,7 +40,8 @@ include $(APPDIR)/Make.defs
# I2C tool
ASRCS =
CSRCS = i2c_bus.c i2c_common.c i2c_dev.c i2c_get.c i2c_main.c i2c_set.c i2c_verf.c
CSRCS = i2c_bus.c i2c_common.c i2c_dev.c i2c_get.c i2c_set.c i2c_verf.c
MAINSRC = i2c_main.c
AOBJS = $(ASRCS:.S=$(OBJEXT))
COBJS = $(CSRCS:.c=$(OBJEXT))

3
system/install/Makefile
View File

@ -54,7 +54,8 @@ PRIORITY = SCHED_PRIORITY_DEFAULT
STACKSIZE = 1024
ASRCS =
CSRCS = install.c
CSRCS =
MAINSRC = install.c
AOBJS = $(ASRCS:.S=$(OBJEXT))
COBJS = $(CSRCS:.c=$(OBJEXT))

3
system/mdio/Makefile
View File

@ -46,7 +46,8 @@ STACKSIZE = 2048
# MDIO tool
ASRCS =
CSRCS = mdio_main.c
CSRCS =
MAINSRC = mdio_main.c
AOBJS = $(ASRCS:.S=$(OBJEXT))
COBJS = $(CSRCS:.c=$(OBJEXT))

6
system/nxplayer/Makefile
View File

@ -54,8 +54,12 @@ APPNAME = nxplayer
PRIORITY = SCHED_PRIORITY_DEFAULT
STACKSIZE = 2048
ifeq ($(CONFIG_BUILD_KERNEL),y)
MAINSRC = nxplayer_main.c
else
ifeq ($(CONFIG_NXPLAYER_COMMAND_LINE),y)
CSRCS += nxplayer_main.c
MAINSRC = nxplayer_main.c
endif
endif
AOBJS = $(ASRCS:.S=$(OBJEXT))

3
system/poweroff/Makefile
View File

@ -54,7 +54,8 @@ PRIORITY = SCHED_PRIORITY_DEFAULT
STACKSIZE = 768
ASRCS =
CSRCS = poweroff.c
CSRCS =
MAINSRC = poweroff.c
AOBJS = $(ASRCS:.S=$(OBJEXT))
COBJS = $(CSRCS:.c=$(OBJEXT))

3
system/prun/Makefile
View File

@ -56,7 +56,8 @@ PRIORITY = $(CONFIG_SYSTEM_PEXEC_PRIORITY)
STACKSIZE = $(CONFIG_SYSTEM_PEXEC_STACKSIZE)
ASRCS =
CSRCS = prun.c
CSRCS =
MAINSRC = prun.c
ifeq ($(CONFIG_SYSTEM_PEXEC),y)
CSRCS += pexec_main.c

3
system/ramtest/Makefile
View File

@ -47,7 +47,8 @@ PRIORITY = SCHED_PRIORITY_DEFAULT
STACKSIZE = 768
ASRCS =
CSRCS = ramtest.c
CSRCS =
MAINSRC = ramtest.c
AOBJS = $(ASRCS:.S=$(OBJEXT))
COBJS = $(CSRCS:.c=$(OBJEXT))

3
system/ramtron/Makefile
View File

@ -54,7 +54,8 @@ PRIORITY = SCHED_PRIORITY_DEFAULT
STACKSIZE = 1024
ASRCS =
CSRCS = ramtron.c
CSRCS =
MAINSRC = ramtron.c
AOBJS = $(ASRCS:.S=$(OBJEXT))
COBJS = $(CSRCS:.c=$(OBJEXT))

3
system/sdcard/Makefile
View File

@ -54,7 +54,8 @@ PRIORITY = SCHED_PRIORITY_DEFAULT
STACKSIZE = 1024
ASRCS =
CSRCS = sdcard.c
CSRCS =
MAINSRC = sdcard.c
AOBJS = $(ASRCS:.S=$(OBJEXT))
COBJS = $(CSRCS:.c=$(OBJEXT))

3
system/stackmonitor/Makefile
View File

@ -47,7 +47,8 @@ PRIORITY = SCHED_PRIORITY_DEFAULT
STACKSIZE = 768
ASRCS =
CSRCS = stackmonitor.c
CSRCS =
MAINSRC = stackmonitor.c
AOBJS = $(ASRCS:.S=$(OBJEXT))
COBJS = $(CSRCS:.c=$(OBJEXT))

3
system/sudoku/Makefile
View File

@ -50,7 +50,8 @@ STACKSIZE = $(CONFIG_SYSTEM_SUDOKU_STACKSIZE)
PRIORITY = $(CONFIG_SYSTEM_SUDOKU_PRIORITY)
ASRCS =
CSRCS = sudoku.c
CSRCS =
MAINSRC = sudoku.c
AOBJS = $(ASRCS:.S=$(OBJEXT))
COBJS = $(CSRCS:.c=$(OBJEXT))

3
system/sysinfo/Makefile
View File

@ -55,7 +55,8 @@ PRIORITY = SCHED_PRIORITY_DEFAULT
STACKSIZE = $(CONFIG_SYSTEM_SYSINFO_STACKSIZE)
ASRCS =
CSRCS = sysinfo.c
CSRCS =
MAINSRC = sysinfo.c
AOBJS = $(ASRCS:.S=$(OBJEXT))
COBJS = $(CSRCS:.c=$(OBJEXT))

3
system/usbmsc/Makefile
View File

@ -40,7 +40,8 @@ include $(APPDIR)/Make.defs
# USB device mass storage add-on
ASRCS =
CSRCS = usbmsc_main.c
CSRCS =
MAINSRC = usbmsc_main.c
AOBJS = $(ASRCS:.S=$(OBJEXT))
COBJS = $(CSRCS:.c=$(OBJEXT))

3
system/vi/Makefile
View File

@ -51,7 +51,8 @@ PRIORITY = $(CONFIG_SYSTEM_VI_PRIORITY)
STACKSIZE = $(CONFIG_SYSTEM_VI_STACKSIZE)
ASRCS =
CSRCS = vi.c
CSRCS =
MAINSRC = vi.c
AOBJS = $(ASRCS:.S=$(OBJEXT))
COBJS = $(CSRCS:.c=$(OBJEXT))

36
system/zmodem/Makefile
View File

@ -48,19 +48,21 @@ STACKSIZE = 1536
ASRCS =
CSRCS = sz_main.c zm_send.c
CSRCS += rz_main.c zm_receive.c
CSRCS += zm_state.c zm_proto.c zm_watchdog.c zm_utils.c zm_dumpbuffer.c
CSRCS = zm_send.c zm_receive.c zm_state.c zm_proto.c zm_watchdog.c
CSRCS += zm_utils.c zm_dumpbuffer.c
SZ_MAINSRC = sz_main.c
RZ_MAINSRC = rz_main.c
AOBJS = $(ASRCS:.S=$(OBJEXT))
COBJS = $(CSRCS:.c=$(OBJEXT))
MAINOBJ = $(MAINSRC:.c=$(OBJEXT))
SZ_MAINOBJ = $(SZ_MAINSRC:.c=$(OBJEXT))
RZ_MAINOBJ = $(RZ_MAINSRC:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS) $(MAINSRC)
SRCS = $(ASRCS) $(CSRCS) $(SZ_MAINSRC) $(RZ_MAINSRC)
OBJS = $(AOBJS) $(COBJS)
ifneq ($(CONFIG_BUILD_KERNEL),y)
OBJS += $(MAINOBJ)
OBJS += $(SZ_MAINOBJ) $(RZ_MAINOBJ)
endif
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
@ -79,8 +81,11 @@ else
INSTALL_DIR = $(BIN_DIR)
endif
CONFIG_XYZ_PROGNAME ?= zmodem$(EXEEXT)
PROGNAME = $(CONFIG_XYZ_PROGNAME)
CONFIG_SYSTEM_SZPROGNAME ?= sz$(EXEEXT)
SZ_PROGNAME = $(CONFIG_SYSTEM_SZPROGNAME)
CONFIG_SYSTEM_RZPROGNAME ?= rz$(EXEEXT)
RZ_PROGNAME = $(CONFIG_SYSTEM_RZPROGNAME)
ROOTDEPPATH = --dep-path .
@ -102,12 +107,17 @@ $(COBJS): %$(OBJEXT): %.c
$(Q) touch .built
ifeq ($(CONFIG_BUILD_KERNEL),y)
$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ)
@echo "LD: $(PROGNAME)"
$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS)
$(Q) $(NM) -u $(INSTALL_DIR)$(DELIM)$(PROGNAME)
$(BIN_DIR)$(DELIM)$(SZ_PROGNAME): $(OBJS) $(SZ_MAINOBJ)
@echo "LD: $(SZ_PROGNAME)"
$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(SZ_PROGNAME) $(ARCHCRT0OBJ) $(SZ_MAINOBJ) $(LDLIBS)
$(Q) $(NM) -u $(INSTALL_DIR)$(DELIM)$(SZ_PROGNAME)
install: $(BIN_DIR)$(DELIM)$(PROGNAME)
$(BIN_DIR)$(DELIM)$(RZ_PROGNAME): $(OBJS) $(RZ_MAINOBJ)
@echo "LD: $(RZ_PROGNAME)"
$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(RZ_PROGNAME) $(ARCHCRT0OBJ) $(RZ_MAINOBJ) $(LDLIBS)
$(Q) $(NM) -u $(INSTALL_DIR)$(DELIM)$(RZ_PROGNAME)
install: $(BIN_DIR)$(DELIM)$(SZ_PROGNAME) $(BIN_DIR)$(DELIM)$(RZ_PROGNAME)
else
install: