diff options
-rw-r--r-- | apps/system/cdcacm/Makefile | 35 | ||||
-rw-r--r-- | apps/system/composite/Makefile | 35 | ||||
-rw-r--r-- | apps/system/flash_eraseall/Makefile | 33 | ||||
-rw-r--r-- | apps/system/free/Makefile | 33 | ||||
-rw-r--r-- | apps/system/hex2bin/Makefile | 40 | ||||
-rw-r--r-- | apps/system/i2c/Makefile | 31 | ||||
-rw-r--r-- | apps/system/install/Makefile | 33 | ||||
-rw-r--r-- | apps/system/mdio/Makefile | 29 | ||||
-rw-r--r-- | apps/system/nxplayer/Makefile | 6 | ||||
-rw-r--r-- | apps/system/poweroff/Makefile | 33 | ||||
-rw-r--r-- | apps/system/prun/Makefile | 3 | ||||
-rw-r--r-- | apps/system/ramtest/Makefile | 3 | ||||
-rw-r--r-- | apps/system/ramtron/Makefile | 33 | ||||
-rw-r--r-- | apps/system/sdcard/Makefile | 33 | ||||
-rw-r--r-- | apps/system/stackmonitor/Makefile | 31 | ||||
-rw-r--r-- | apps/system/sudoku/Makefile | 3 | ||||
-rw-r--r-- | apps/system/sysinfo/Makefile | 33 | ||||
-rw-r--r-- | apps/system/usbmonitor/Makefile | 30 | ||||
-rw-r--r-- | apps/system/usbmsc/Makefile | 35 | ||||
-rw-r--r-- | apps/system/vi/Makefile | 33 | ||||
-rw-r--r-- | apps/system/zmodem/Makefile | 36 |
21 files changed, 315 insertions, 266 deletions
diff --git a/apps/system/cdcacm/Makefile b/apps/system/cdcacm/Makefile index 81b161f0b..28c459bbe 100644 --- a/apps/system/cdcacm/Makefile +++ b/apps/system/cdcacm/Makefile @@ -39,27 +39,28 @@ include $(APPDIR)/Make.defs # USB CDC/ACM serial mass storage add-on -ASRCS = -CSRCS = cdcacm_main.c +ASRCS = +CSRCS = +MAINSRC = cdcacm_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 ?= cdcacm$(EXEEXT) PROGNAME = $(CONFIG_XYZ_PROGNAME) -ROOTDEPPATH = --dep-path . +ROOTDEPPATH = --dep-path . # USB CDC/ACM built-in application info -APPNAME1 = sercon -PRIORITY1 = SCHED_PRIORITY_DEFAULT -STACKSIZE1 = 2048 +APPNAME1 = sercon +PRIORITY1 = SCHED_PRIORITY_DEFAULT +STACKSIZE1 = 2048 -APPNAME2 = serdis -PRIORITY2 = SCHED_PRIORITY_DEFAULT -STACKSIZE2 = 2048 +APPNAME2 = serdis +PRIORITY2 = SCHED_PRIORITY_DEFAULT +STACKSIZE2 = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: context clean depend distclean 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 diff --git a/apps/system/flash_eraseall/Makefile b/apps/system/flash_eraseall/Makefile index 544903730..817a2b8f4 100644 --- a/apps/system/flash_eraseall/Makefile +++ b/apps/system/flash_eraseall/Makefile @@ -43,37 +43,38 @@ include $(APPDIR)/Make.defs ifeq ($(WINTOOL),y) -INCDIROPT = -w +INCDIROPT = -w endif # Hello Application # TODO: appname can be automatically extracted from the directory name -APPNAME = flash_eraseall -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 1024 +APPNAME = flash_eraseall +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 1024 -ASRCS = -CSRCS = flash_eraseall.c +ASRCS = +CSRCS = +MAINSRC = flash_eraseall.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 @@ -86,13 +87,13 @@ endif CONFIG_XYZ_PROGNAME ?= flash_eraseall$(EXEEXT) PROGNAME = $(CONFIG_XYZ_PROGNAME) -ROOTDEPPATH = --dep-path . +ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = -all: .built +all: .built .PHONY: context depend clean distclean $(AOBJS): %$(OBJEXT): %.S diff --git a/apps/system/free/Makefile b/apps/system/free/Makefile index 78f0553a8..806307257 100644 --- a/apps/system/free/Makefile +++ b/apps/system/free/Makefile @@ -39,37 +39,38 @@ include $(APPDIR)/Make.defs ifeq ($(WINTOOL),y) -INCDIROPT = -w +INCDIROPT = -w endif # Hello Application # TODO: appname can be automatically extracted from the directory name -APPNAME = free -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 768 +APPNAME = free +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 768 -ASRCS = -CSRCS = free.c +ASRCS = +CSRCS = +MAINSRC = free.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 @@ -82,13 +83,13 @@ endif CONFIG_XYZ_PROGNAME ?= free$(EXEEXT) PROGNAME = $(CONFIG_XYZ_PROGNAME) -ROOTDEPPATH = --dep-path . +ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = -all: .built +all: .built .PHONY: context depend clean distclean $(AOBJS): %$(OBJEXT): %.S diff --git a/apps/system/hex2bin/Makefile b/apps/system/hex2bin/Makefile index 5c4663467..03fbd5910 100644 --- a/apps/system/hex2bin/Makefile +++ b/apps/system/hex2bin/Makefile @@ -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) + +$(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)$(PROGNAME) +install: $(BIN_DIR)$(DELIM)$(HEX2BIN_PROGNAME) $(BIN_DIR)$(DELIM)$(HEX2MEM_PROGNAME) else install: diff --git a/apps/system/i2c/Makefile b/apps/system/i2c/Makefile index 8d4827177..5b960fa8d 100644 --- a/apps/system/i2c/Makefile +++ b/apps/system/i2c/Makefile @@ -39,27 +39,28 @@ 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 +ASRCS = +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)) +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,16 +73,16 @@ endif CONFIG_XYZ_PROGNAME ?= i2c$(EXEEXT) PROGNAME = $(CONFIG_XYZ_PROGNAME) -ROOTDEPPATH = --dep-path . -VPATH = +ROOTDEPPATH = --dep-path . +VPATH = -APPNAME = i2c -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 2048 +APPNAME = i2c +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 2048 # Build targets -all: .built +all: .built .PHONY: context .depend depend clean distclean $(AOBJS): %$(OBJEXT): %.S diff --git a/apps/system/install/Makefile b/apps/system/install/Makefile index 4faeb38c1..79b0a0999 100644 --- a/apps/system/install/Makefile +++ b/apps/system/install/Makefile @@ -43,37 +43,38 @@ include $(APPDIR)/Make.defs ifeq ($(WINTOOL),y) -INCDIROPT = -w +INCDIROPT = -w endif # Hello Application # TODO: appname can be automatically extracted from the directory name -APPNAME = install -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 1024 +APPNAME = install +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 1024 -ASRCS = -CSRCS = install.c +ASRCS = +CSRCS = +MAINSRC = install.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 @@ -86,13 +87,13 @@ endif CONFIG_XYZ_PROGNAME ?= install$(EXEEXT) PROGNAME = $(CONFIG_XYZ_PROGNAME) -ROOTDEPPATH = --dep-path . +ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = -all: .built +all: .built .PHONY: context depend clean distclean $(AOBJS): %$(OBJEXT): %.S diff --git a/apps/system/mdio/Makefile b/apps/system/mdio/Makefile index 1d7d0d58c..7d0fe5981 100644 --- a/apps/system/mdio/Makefile +++ b/apps/system/mdio/Makefile @@ -39,33 +39,34 @@ include $(APPDIR)/Make.defs # MDIO tool built-in application info -APPNAME = mdio -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 2048 +APPNAME = mdio +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 2048 # MDIO tool -ASRCS = -CSRCS = mdio_main.c +ASRCS = +CSRCS = +MAINSRC = mdio_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 @@ -78,11 +79,11 @@ endif CONFIG_XYZ_PROGNAME ?= mdio$(EXEEXT) PROGNAME = $(CONFIG_XYZ_PROGNAME) -ROOTDEPPATH = --dep-path . +ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean diff --git a/apps/system/nxplayer/Makefile b/apps/system/nxplayer/Makefile index d0f5de6ec..a5a473c93 100644 --- a/apps/system/nxplayer/Makefile +++ b/apps/system/nxplayer/Makefile @@ -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)) diff --git a/apps/system/poweroff/Makefile b/apps/system/poweroff/Makefile index 59e5c92c5..34d8851b4 100644 --- a/apps/system/poweroff/Makefile +++ b/apps/system/poweroff/Makefile @@ -43,37 +43,38 @@ include $(APPDIR)/Make.defs ifeq ($(WINTOOL),y) -INCDIROPT = -w +INCDIROPT = -w endif # Hello Application # TODO: appname can be automatically extracted from the directory name -APPNAME = poweroff -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 768 +APPNAME = poweroff +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 768 -ASRCS = -CSRCS = poweroff.c +ASRCS = +CSRCS = +MAINSRC = poweroff.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 @@ -86,13 +87,13 @@ endif CONFIG_XYZ_PROGNAME ?= poweroff$(EXEEXT) PROGNAME = $(CONFIG_XYZ_PROGNAME) -ROOTDEPPATH = --dep-path . +ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = -all: .built +all: .built .PHONY: context depend clean distclean $(AOBJS): %$(OBJEXT): %.S diff --git a/apps/system/prun/Makefile b/apps/system/prun/Makefile index 5516a5523..fb4d6f79d 100644 --- a/apps/system/prun/Makefile +++ b/apps/system/prun/Makefile @@ -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 diff --git a/apps/system/ramtest/Makefile b/apps/system/ramtest/Makefile index 7af004b15..2c443b08b 100644 --- a/apps/system/ramtest/Makefile +++ b/apps/system/ramtest/Makefile @@ -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)) diff --git a/apps/system/ramtron/Makefile b/apps/system/ramtron/Makefile index 3bdd708e2..d4793ca71 100644 --- a/apps/system/ramtron/Makefile +++ b/apps/system/ramtron/Makefile @@ -43,37 +43,38 @@ include $(APPDIR)/Make.defs ifeq ($(WINTOOL),y) -INCDIROPT = -w +INCDIROPT = -w endif # Hello Application # TODO: appname can be automatically extracted from the directory name -APPNAME = ramtron -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 1024 +APPNAME = ramtron +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 1024 -ASRCS = -CSRCS = ramtron.c +ASRCS = +CSRCS = +MAINSRC = ramtron.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 @@ -86,13 +87,13 @@ endif CONFIG_XYZ_PROGNAME ?= ramtron$(EXEEXT) PROGNAME = $(CONFIG_XYZ_PROGNAME) -ROOTDEPPATH = --dep-path . +ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = -all: .built +all: .built .PHONY: context depend clean distclean $(AOBJS): %$(OBJEXT): %.S diff --git a/apps/system/sdcard/Makefile b/apps/system/sdcard/Makefile index 7bc239927..89e4558c9 100644 --- a/apps/system/sdcard/Makefile +++ b/apps/system/sdcard/Makefile @@ -43,37 +43,38 @@ include $(APPDIR)/Make.defs ifeq ($(WINTOOL),y) -INCDIROPT = -w +INCDIROPT = -w endif # Hello Application # TODO: appname can be automatically extracted from the directory name -APPNAME = sdcard -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 1024 +APPNAME = sdcard +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 1024 -ASRCS = -CSRCS = sdcard.c +ASRCS = +CSRCS = +MAINSRC = sdcard.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 @@ -86,13 +87,13 @@ endif CONFIG_XYZ_PROGNAME ?= sdcard$(EXEEXT) PROGNAME = $(CONFIG_XYZ_PROGNAME) -ROOTDEPPATH = --dep-path . +ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = -all: .built +all: .built .PHONY: context depend clean distclean $(AOBJS): %$(OBJEXT): %.S diff --git a/apps/system/stackmonitor/Makefile b/apps/system/stackmonitor/Makefile index 7f78a0f79..c51488142 100644 --- a/apps/system/stackmonitor/Makefile +++ b/apps/system/stackmonitor/Makefile @@ -38,40 +38,41 @@ include $(APPDIR)/Make.defs ifeq ($(WINTOOL),y) -INCDIROPT = -w +INCDIROPT = -w endif # Stack Monitor Application -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 768 +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 768 -ASRCS = -CSRCS = stackmonitor.c +ASRCS = +CSRCS = +MAINSRC = stackmonitor.c -AOBJS = $(ASRCS:.S=$(OBJEXT)) -COBJS = $(CSRCS:.c=$(OBJEXT)) +AOBJS = $(ASRCS:.S=$(OBJEXT)) +COBJS = $(CSRCS:.c=$(OBJEXT)) -SRCS = $(ASRCS) $(CSRCS) -OBJS = $(AOBJS) $(COBJS) +SRCS = $(ASRCS) $(CSRCS) +OBJS = $(AOBJS) $(COBJS) 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 -ROOTDEPPATH = --dep-path . +ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = -all: .built +all: .built .PHONY: context depend clean distclean $(AOBJS): %$(OBJEXT): %.S diff --git a/apps/system/sudoku/Makefile b/apps/system/sudoku/Makefile index 164eea25e..f86355249 100644 --- a/apps/system/sudoku/Makefile +++ b/apps/system/sudoku/Makefile @@ -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)) diff --git a/apps/system/sysinfo/Makefile b/apps/system/sysinfo/Makefile index 5d60107a5..7135d5a06 100644 --- a/apps/system/sysinfo/Makefile +++ b/apps/system/sysinfo/Makefile @@ -43,38 +43,39 @@ include $(APPDIR)/Make.defs ifeq ($(WINTOOL),y) -INCDIROPT = -w +INCDIROPT = -w endif # NSH sysinfo command CONFIG_SYSTEM_SYSINFO_STACKSIZE ?= 1024 -APPNAME = sysinfo -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = $(CONFIG_SYSTEM_SYSINFO_STACKSIZE) +APPNAME = sysinfo +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = $(CONFIG_SYSTEM_SYSINFO_STACKSIZE) -ASRCS = -CSRCS = sysinfo.c +ASRCS = +CSRCS = +MAINSRC = sysinfo.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 @@ -87,13 +88,13 @@ endif CONFIG_XYZ_PROGNAME ?= sysinfo$(EXEEXT) PROGNAME = $(CONFIG_XYZ_PROGNAME) -ROOTDEPPATH = --dep-path . +ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = -all: .built +all: .built .PHONY: context depend clean distclean $(AOBJS): %$(OBJEXT): %.S diff --git a/apps/system/usbmonitor/Makefile b/apps/system/usbmonitor/Makefile index 7b1d3e7ea..5afb249db 100644 --- a/apps/system/usbmonitor/Makefile +++ b/apps/system/usbmonitor/Makefile @@ -38,40 +38,40 @@ include $(APPDIR)/Make.defs ifeq ($(WINTOOL),y) -INCDIROPT = -w +INCDIROPT = -w endif # USB Monitor Application -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 768 +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 768 -ASRCS = -CSRCS = usbmonitor.c +ASRCS = +CSRCS = usbmonitor.c -AOBJS = $(ASRCS:.S=$(OBJEXT)) -COBJS = $(CSRCS:.c=$(OBJEXT)) +AOBJS = $(ASRCS:.S=$(OBJEXT)) +COBJS = $(CSRCS:.c=$(OBJEXT)) -SRCS = $(ASRCS) $(CSRCS) -OBJS = $(AOBJS) $(COBJS) +SRCS = $(ASRCS) $(CSRCS) +OBJS = $(AOBJS) $(COBJS) 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 -ROOTDEPPATH = --dep-path . +ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = -all: .built +all: .built .PHONY: context depend clean distclean $(AOBJS): %$(OBJEXT): %.S diff --git a/apps/system/usbmsc/Makefile b/apps/system/usbmsc/Makefile index d01269730..7a2485dfc 100644 --- a/apps/system/usbmsc/Makefile +++ b/apps/system/usbmsc/Makefile @@ -39,27 +39,28 @@ include $(APPDIR)/Make.defs # USB device mass storage add-on -ASRCS = -CSRCS = usbmsc_main.c +ASRCS = +CSRCS = +MAINSRC = usbmsc_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,24 +73,24 @@ endif CONFIG_XYZ_PROGNAME ?= usbmsc$(EXEEXT) PROGNAME = $(CONFIG_XYZ_PROGNAME) -ROOTDEPPATH = --dep-path . +ROOTDEPPATH = --dep-path . # USB storage built-in application info CONFIG_SYSTEM_USBMSC_CMD_STACKSIZE ?= 768 CONFIG_SYSTEM_USBMSC_CMD_PRIORITY ?= SCHED_PRIORITY_DEFAULT -APPNAME1 = msconn -PRIORITY1 = $(CONFIG_SYSTEM_USBMSC_CMD_PRIORITY) -STACKSIZE1 = $(CONFIG_SYSTEM_USBMSC_CMD_STACKSIZE) +APPNAME1 = msconn +PRIORITY1 = $(CONFIG_SYSTEM_USBMSC_CMD_PRIORITY) +STACKSIZE1 = $(CONFIG_SYSTEM_USBMSC_CMD_STACKSIZE) -APPNAME2 = msdis -PRIORITY2 = $(CONFIG_SYSTEM_USBMSC_CMD_PRIORITY) -STACKSIZE2 = $(CONFIG_SYSTEM_USBMSC_CMD_STACKSIZE) +APPNAME2 = msdis +PRIORITY2 = $(CONFIG_SYSTEM_USBMSC_CMD_PRIORITY) +STACKSIZE2 = $(CONFIG_SYSTEM_USBMSC_CMD_STACKSIZE) # Common build -VPATH = +VPATH = all: .built .PHONY: context clean depend distclean diff --git a/apps/system/vi/Makefile b/apps/system/vi/Makefile index 9a0709006..16514ba54 100644 --- a/apps/system/vi/Makefile +++ b/apps/system/vi/Makefile @@ -38,7 +38,7 @@ include $(APPDIR)/Make.defs ifeq ($(WINTOOL),y) -INCDIROPT = -w +INCDIROPT = -w endif # VI-Workalike Editor @@ -46,31 +46,32 @@ endif CONFIG_SYSTEM_VI_STACKSIZE ?= 2048 CONFIG_SYSTEM_VI_PRIORITY ?= 100 -APPNAME = vi -PRIORITY = $(CONFIG_SYSTEM_VI_PRIORITY) -STACKSIZE = $(CONFIG_SYSTEM_VI_STACKSIZE) +APPNAME = vi +PRIORITY = $(CONFIG_SYSTEM_VI_PRIORITY) +STACKSIZE = $(CONFIG_SYSTEM_VI_STACKSIZE) -ASRCS = -CSRCS = vi.c +ASRCS = +CSRCS = +MAINSRC = vi.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 @@ -83,13 +84,13 @@ endif CONFIG_XYZ_PROGNAME ?= vi$(EXEEXT) PROGNAME = $(CONFIG_XYZ_PROGNAME) -ROOTDEPPATH = --dep-path . +ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = -all: .built +all: .built .PHONY: context depend clean distclean $(AOBJS): %$(OBJEXT): %.S diff --git a/apps/system/zmodem/Makefile b/apps/system/zmodem/Makefile index ad0edc9e8..a4d59c74e 100644 --- a/apps/system/zmodem/Makefile +++ b/apps/system/zmodem/Makefile @@ -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) + +$(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)$(PROGNAME) +install: $(BIN_DIR)$(DELIM)$(SZ_PROGNAME) $(BIN_DIR)$(DELIM)$(RZ_PROGNAME) else install: |