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

apps/platform/Makefile was not dealing with the bin subdirectory correctly

Browse Source
This commit is contained in:
Gregory Nutt 2013-11-02 11:04:12 -06:00
parent 891d1892e5
commit dc7f894963
4 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog.txt
View File

@ -720,3 +720,6 @@
options to the hexdump command. From Ken Pettit (2013-11-1). options to the hexdump command. From Ken Pettit (2013-11-1).
* apps/platrorm/mikroe-stm32f4: Now uses /dev/config for configuration * apps/platrorm/mikroe-stm32f4: Now uses /dev/config for configuration
data storage. From Ken Pettit (2013-11-1). data storage. From Ken Pettit (2013-11-1).
* apps/platform/Makefile: Was not dealing with the bin sub-directory
correctly (2013-11-2).

3
platform/.gitignore vendored
View File

@ -1,4 +1,5 @@
/.built /.built
/Make.defs /.depend
/Make.dep
board board

17
platform/Makefile
View File

@ -51,7 +51,6 @@ endif
# Directories # Directories
BINDIR = $(APPDIR)$(DELIM)platform$(DELIM)bin
PLATFORMDIR = $(APPDIR)$(DELIM)platform$(DELIM)board PLATFORMDIR = $(APPDIR)$(DELIM)platform$(DELIM)board
DUMMYDIR = $(APPDIR)$(DELIM)platform$(DELIM)dummy DUMMYDIR = $(APPDIR)$(DELIM)platform$(DELIM)dummy
BOARDDIR = $(APPDIR)$(DELIM)platform$(DELIM)$(CONFIG_ARCH_BOARD) BOARDDIR = $(APPDIR)$(DELIM)platform$(DELIM)$(CONFIG_ARCH_BOARD)
@ -66,8 +65,8 @@ CSRCS =
-include $(PLATFORMDIR)$(DELIM)Make.defs -include $(PLATFORMDIR)$(DELIM)Make.defs
AOBJS = $(ASRCS:.S=$(OBJEXT)) AOBJS = $(patsubst %.S, bin$(DELIM)%$(OBJEXT), $(ASRCS))
COBJS = $(CSRCS:.c=$(OBJEXT)) COBJS = $(patsubst %.c, bin$(DELIM)%$(OBJEXT), $(CSRCS))
SRCS = $(ASRCS) $(CSRCS) SRCS = $(ASRCS) $(CSRCS)
OBJS = $(AOBJS) $(COBJS) OBJS = $(AOBJS) $(COBJS)
@ -87,18 +86,18 @@ endif
all: .built all: .built
.PHONY: context .depend depend clean distclean .PHONY: context .depend depend clean distclean
ifneq ($(AOBJS),) ifneq ($(ASRCS),)
$(AOBJS): %$(OBJEXT): %.S $(AOBJS): bin$(DELIM)%$(OBJEXT): %.S
$(call ASSEMBLE, $<, $@) $(call ASSEMBLE, $<, $@)
endif endif
ifneq ($(COBJS),) ifneq ($(CSRCS),)
$(COBJS): %$(OBJEXT): %.c $(COBJS): bin$(DELIM)%$(OBJEXT): %.c
$(call COMPILE, $<, $@) $(call COMPILE, $<, $@)
endif endif
.built: $(OBJS) .built: $(OBJS)
ifneq ($(OBJS),) ifneq ($(SRCS),)
$(call ARCHIVE, $(BIN), $(OBJS)) $(call ARCHIVE, $(BIN), $(OBJS))
endif endif
$(Q) touch .built $(Q) touch .built
@ -124,7 +123,7 @@ depend: .depend
clean: $(PLATFORMDIR) clean: $(PLATFORMDIR)
$(call DELFILE, .built) $(call DELFILE, .built)
$(Q) $(MAKE) -C $(BINDIR) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" clean $(Q) $(MAKE) -C bin TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" clean
distclean: clean distclean: clean
$(call DELFILE, Make.dep) $(call DELFILE, Make.dep)

8
platform/bin/.gitignore vendored Normal file
View File

@ -0,0 +1,8 @@
/*.asm
/*.rel
/*.lst
/*.sym
/*.adb
/*.lib
/*.src
/*.obj