diff options
| -rw-r--r-- | apps/system/nxplayer/Makefile | 33 | ||||
| -rw-r--r-- | nuttx/Makefile.win | 8 |
2 files changed, 20 insertions, 21 deletions
diff --git a/apps/system/nxplayer/Makefile b/apps/system/nxplayer/Makefile index 8de9d4b02..812b9e7bf 100644 --- a/apps/system/nxplayer/Makefile +++ b/apps/system/nxplayer/Makefile @@ -40,47 +40,47 @@ include $(APPDIR)/Make.defs ifeq ($(WINTOOL),y) -INCDIROPT = -w +INCDIROPT = -w endif # NxPlayer Library -ASRCS = -CSRCS = nxplayer.c +ASRCS = +CSRCS = nxplayer.c # NxPlayer Application -APPNAME = nxplayer -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 2048 +APPNAME = nxplayer +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 2048 ifeq ($(CONFIG_NXPLAYER_COMMAND_LINE),y) CSRCS += nxplayer_main.c endif -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 @@ -119,7 +119,6 @@ depend: .depend clean: $(call DELFILE, .built) $(call CLEAN) - $(Q) rm -rf ..$(DELIM)..$(DELIM)builtin$(DELIM)registry$(DELIM)$(APPNAME)_main.* distclean: clean $(call DELFILE, Make.dep) diff --git a/nuttx/Makefile.win b/nuttx/Makefile.win index d224ea8b5..9fa1248c2 100644 --- a/nuttx/Makefile.win +++ b/nuttx/Makefile.win @@ -806,13 +806,13 @@ endif apps_clean: ifneq ($(APPDIR),) - $(Q) $(MAKE) -C "$(TOPDIR)\$(APPDIR)" TOPDIR="$(TOPDIR)" clean + $(Q) $(MAKE) -C "$(APPDIR)" TOPDIR="$(TOPDIR)" clean endif apps_distclean: ifneq ($(APPDIR),) $(call DELFILE, _SAVED_APPS_config - $(Q) if exist "$(TOPDIR)\$(APPDIR)\.config" ( cp "$(TOPDIR)\$(APPDIR)\.config" _SAVED_APPS_config ) - $(Q) $(MAKE) -C "$(TOPDIR)\$(APPDIR)" TOPDIR="$(TOPDIR)" distclean - $(Q) if exist _SAVED_APPS_config ( mv _SAVED_APPS_config "$(TOPDIR)\$(APPDIR)\.config" ) + $(Q) if exist "$(APPDIR)\.config" ( cp "$(APPDIR)\.config" _SAVED_APPS_config ) + $(Q) $(MAKE) -C "$(APPDIR)" TOPDIR="$(TOPDIR)" distclean + $(Q) if exist _SAVED_APPS_config ( mv _SAVED_APPS_config "$(APPDIR)\.config" ) endif |