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

Changes from Mike

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5361 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-11-16 12:41:58 +00:00
parent b567ff612f
commit 5a44013837
11 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog.txt
View File

@ -419,3 +419,6 @@
by Freddie Chopin. by Freddie Chopin.
* Makefile, */Makefile: Various fixes for Windows native build. Now uses * Makefile, */Makefile: Various fixes for Windows native build. Now uses
make foreach loops instead of shell loops. make foreach loops instead of shell loops.
* apps/examples/elf/test/*/Makefile: OSX doesn't support install -D, use
mkdir -p then install without the -D. From Mike Smith.

11
Makefile
View File

@ -102,15 +102,9 @@ endif
# Create the list of available applications (INSTALLED_APPS) # Create the list of available applications (INSTALLED_APPS)
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
define ADD_BUILTIN define ADD_BUILTIN
INSTALLED_APPS += $(if $(wildcard $1\Makefile),$1,) INSTALLED_APPS += $(if $(wildcard $1$(DELIM)Makefile),$1,)
endef endef
else
define ADD_BUILTIN
INSTALLED_APPS += $(if $(wildcard $1/Makefile),$1,)
endef
endif
$(foreach BUILTIN, $(CONFIGURED_APPS), $(eval $(call ADD_BUILTIN,$(BUILTIN)))) $(foreach BUILTIN, $(CONFIGURED_APPS), $(eval $(call ADD_BUILTIN,$(BUILTIN))))
@ -119,7 +113,8 @@ $(foreach BUILTIN, $(CONFIGURED_APPS), $(eval $(call ADD_BUILTIN,$(BUILTIN))))
# provided by the user (possibly as a symbolic link) to add libraries and # provided by the user (possibly as a symbolic link) to add libraries and
# applications to the standard build from the repository. # applications to the standard build from the repository.
EXTERNAL_DIR := $(dir $(wildcard external/Makefile)) EXTERNAL_DIR := $(dir $(wildcard external$(DELIM)Makefile))
INSTALLED_APPS += $(EXTERNAL_DIR) INSTALLED_APPS += $(EXTERNAL_DIR)
SUBDIRS += $(EXTERNAL_DIR) SUBDIRS += $(EXTERNAL_DIR)

3
examples/elf/tests/errno/Makefile
View File

@ -55,5 +55,6 @@ clean:
@rm -f $(BIN) *.o *~ .*.swp core @rm -f $(BIN) *.o *~ .*.swp core
install: install:
@install -D $(BIN) $(ROMFS_DIR)/$(BIN) @mkdir -p $(ROMFS_DIR)
@install $(BIN) $(ROMFS_DIR)/$(BIN)

3
examples/elf/tests/hello/Makefile
View File

@ -55,4 +55,5 @@ clean:
@rm -f $(BIN) *.o *~ .*.swp core @rm -f $(BIN) *.o *~ .*.swp core
install: install:
@install -D $(BIN) $(ROMFS_DIR)/$(BIN) @mkdir -p $(ROMFS_DIR)
@install $(BIN) $(ROMFS_DIR)/$(BIN)

9
examples/elf/tests/helloxx/Makefile
View File

@ -109,12 +109,13 @@ clean:
@rm -f $(ALL_BIN) *.o *~ .*.swp core @rm -f $(ALL_BIN) *.o *~ .*.swp core
install: $(ALL_BIN) install: $(ALL_BIN)
@install -D $(BIN1) $(ROMFS_DIR)/$(BIN1) @mkdir -p $(ROMFS_DIR)
@install -D $(BIN2) $(ROMFS_DIR)/$(BIN2) @install $(BIN1) $(ROMFS_DIR)/$(BIN1)
@install $(BIN2) $(ROMFS_DIR)/$(BIN2)
ifeq ($(CONFIG_BINFMT_CONSTRUCTORS),y) ifeq ($(CONFIG_BINFMT_CONSTRUCTORS),y)
@install -D $(BIN3) $(ROMFS_DIR)/$(BIN3) @install $(BIN3) $(ROMFS_DIR)/$(BIN3)
endif endif
# @install -D $(BIN4) $(ROMFS_DIR)/$(BIN4) # @install $(BIN4) $(ROMFS_DIR)/$(BIN4)

3
examples/elf/tests/longjmp/Makefile
View File

@ -55,4 +55,5 @@ clean:
@rm -f $(BIN) *.o *~ .*.swp core @rm -f $(BIN) *.o *~ .*.swp core
install: install:
@install -D $(BIN) $(ROMFS_DIR)/$(BIN) @mkdir -p $(ROMFS_DIR)
@install $(BIN) $(ROMFS_DIR)/$(BIN)

3
examples/elf/tests/mutex/Makefile
View File

@ -55,4 +55,5 @@ clean:
@rm -f $(BIN) *.o *~ .*.swp core @rm -f $(BIN) *.o *~ .*.swp core
install: install:
@install -D $(BIN) $(ROMFS_DIR)/$(BIN) @mkdir -p $(ROMFS_DIR)
@install $(BIN) $(ROMFS_DIR)/$(BIN)

3
examples/elf/tests/pthread/Makefile
View File

@ -55,4 +55,5 @@ clean:
@rm -f $(BIN) *.o *~ .*.swp core @rm -f $(BIN) *.o *~ .*.swp core
install: install:
@install -D $(BIN) $(ROMFS_DIR)/$(BIN) @mkdir -p $(ROMFS_DIR)
@install $(BIN) $(ROMFS_DIR)/$(BIN)

3
examples/elf/tests/signal/Makefile
View File

@ -55,4 +55,5 @@ clean:
@rm -f $(BIN) *.o *~ .*.swp core @rm -f $(BIN) *.o *~ .*.swp core
install: install:
@install -D $(BIN) $(ROMFS_DIR)/$(BIN) @mkdir -p $(ROMFS_DIR)
@install $(BIN) $(ROMFS_DIR)/$(BIN)

3
examples/elf/tests/struct/Makefile
View File

@ -56,4 +56,5 @@ clean:
@rm -f $(BIN) *.o *~ .*.swp core @rm -f $(BIN) *.o *~ .*.swp core
install: install:
@install -D $(BIN) $(ROMFS_DIR)/$(BIN) @mkdir -p $(ROMFS_DIR)
@install $(BIN) $(ROMFS_DIR)/$(BIN)

3
examples/elf/tests/task/Makefile
View File

@ -55,4 +55,5 @@ clean:
@rm -f $(BIN) *.o *~ .*.swp core @rm -f $(BIN) *.o *~ .*.swp core
install: install:
@install -D $(BIN) $(ROMFS_DIR)/$(BIN) @mkdir -p $(ROMFS_DIR)
@install $(BIN) $(ROMFS_DIR)/$(BIN)