diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-05-30 16:49:20 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-05-30 16:49:20 -0600 |
| commit | 83d8a80691ba5ae0b9288c8767342ef535ef4958 (patch) | |
| tree | 87832152d48155024a9cec23d569f70a318437df /NxWidgets | |
| parent | 622591fb019b38e7e3daeaee079e26d9ca27394f (diff) | |
| download | px4-nuttx-83d8a80691ba5ae0b9288c8767342ef535ef4958.tar.gz px4-nuttx-83d8a80691ba5ae0b9288c8767342ef535ef4958.tar.bz2 px4-nuttx-83d8a80691ba5ae0b9288c8767342ef535ef4958.zip | |
Fix that way that NxWight UnitTests are reigistered as NSH builtin apps
Diffstat (limited to 'NxWidgets')
39 files changed, 175 insertions, 114 deletions
diff --git a/NxWidgets/ChangeLog.txt b/NxWidgets/ChangeLog.txt index dfd4c8c14..0737e5ca3 100644 --- a/NxWidgets/ChangeLog.txt +++ b/NxWidgets/ChangeLog.txt @@ -366,3 +366,6 @@ NxWidgets::CGlyphSliderHorizontal class. From Ken Pettit (2013-5-17) . * NxWidgets::CGlyphSliderHorizontal: Fix a drawing error. From Ken Pettit (2013-5-17). +* UnitTests/*/Makefile and .gitignore: Update the way that NSH + the Unit Tests are registered as built-in NSH applications (2013-5-30). + diff --git a/NxWidgets/UnitTests/CButton/.gitignore b/NxWidgets/UnitTests/CButton/.gitignore index 105259c49..b14460823 100644 --- a/NxWidgets/UnitTests/CButton/.gitignore +++ b/NxWidgets/UnitTests/CButton/.gitignore @@ -1,5 +1,4 @@ /Make.dep -/.context /.depend /.built /*.asm diff --git a/NxWidgets/UnitTests/CButton/Makefile b/NxWidgets/UnitTests/CButton/Makefile index ea7b5cf25..1547c705e 100644 --- a/NxWidgets/UnitTests/CButton/Makefile +++ b/NxWidgets/UnitTests/CButton/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/Unitests/CButton/Makefile # -# Copyright (C) 2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -142,15 +142,18 @@ else endif $(Q) touch .built -# Standard housekeeping targets +# Register NSH built-in application -.context: ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat +else +context: endif - $(Q) touch $@ -context: .context +# Standard housekeeping targets .depend: Makefile $(SRCS) $(Q) $(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep @@ -159,6 +162,7 @@ context: .context depend: .depend clean: + $(call DELFILE, $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat) $(call DELFILE, .built) $(call CLEAN) diff --git a/NxWidgets/UnitTests/CButtonArray/.gitignore b/NxWidgets/UnitTests/CButtonArray/.gitignore index 105259c49..b14460823 100644 --- a/NxWidgets/UnitTests/CButtonArray/.gitignore +++ b/NxWidgets/UnitTests/CButtonArray/.gitignore @@ -1,5 +1,4 @@ /Make.dep -/.context /.depend /.built /*.asm diff --git a/NxWidgets/UnitTests/CButtonArray/Makefile b/NxWidgets/UnitTests/CButtonArray/Makefile index 6bb490e34..535ceb948 100644 --- a/NxWidgets/UnitTests/CButtonArray/Makefile +++ b/NxWidgets/UnitTests/CButtonArray/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/UnitTests/CButtonArray/Makefile # -# Copyright (C) 2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -142,15 +142,18 @@ else endif $(Q) touch .built -# Standard housekeeping targets +# Register NSH built-in application -.context: ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat +else +context: endif - $(Q) touch $@ -context: .context +# Standard housekeeping targets .depend: Makefile $(SRCS) $(Q) $(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep @@ -159,6 +162,7 @@ context: .context depend: .depend clean: + $(call DELFILE, $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat) $(call DELFILE, .built) $(call CLEAN) diff --git a/NxWidgets/UnitTests/CCheckBox/.gitignore b/NxWidgets/UnitTests/CCheckBox/.gitignore index 105259c49..b14460823 100644 --- a/NxWidgets/UnitTests/CCheckBox/.gitignore +++ b/NxWidgets/UnitTests/CCheckBox/.gitignore @@ -1,5 +1,4 @@ /Make.dep -/.context /.depend /.built /*.asm diff --git a/NxWidgets/UnitTests/CCheckBox/Makefile b/NxWidgets/UnitTests/CCheckBox/Makefile index bd8293983..e2f6a051a 100644 --- a/NxWidgets/UnitTests/CCheckBox/Makefile +++ b/NxWidgets/UnitTests/CCheckBox/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/UnitTests/CCheckBox/Makefile # -# Copyright (C) 2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -142,15 +142,18 @@ else endif $(Q) touch .built -# Standard housekeeping targets +# Register NSH built-in application -.context: ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat +else +context: endif - $(Q) touch $@ -context: .context +# Standard housekeeping targets .depend: Makefile $(SRCS) $(Q) $(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep @@ -159,6 +162,7 @@ context: .context depend: .depend clean: + $(call DELFILE, $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat) $(call DELFILE, .built) $(call CLEAN) diff --git a/NxWidgets/UnitTests/CGlyphButton/.gitignore b/NxWidgets/UnitTests/CGlyphButton/.gitignore index 105259c49..b14460823 100644 --- a/NxWidgets/UnitTests/CGlyphButton/.gitignore +++ b/NxWidgets/UnitTests/CGlyphButton/.gitignore @@ -1,5 +1,4 @@ /Make.dep -/.context /.depend /.built /*.asm diff --git a/NxWidgets/UnitTests/CGlyphButton/Makefile b/NxWidgets/UnitTests/CGlyphButton/Makefile index b69382133..f0ebfa8b6 100644 --- a/NxWidgets/UnitTests/CGlyphButton/Makefile +++ b/NxWidgets/UnitTests/CGlyphButton/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/UnitTests/CGlyphButton/Makefile # -# Copyright (C) 2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -142,15 +142,18 @@ else endif $(Q) touch .built -# Standard housekeeping targets +# Register NSH built-in application -.context: ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat +else +context: endif - $(Q) touch $@ -context: .context +# Standard housekeeping targets .depend: Makefile $(SRCS) $(Q) $(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep @@ -159,6 +162,7 @@ context: .context depend: .depend clean: + $(call DELFILE, $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat) $(call DELFILE, .built) $(call CLEAN) diff --git a/NxWidgets/UnitTests/CGlyphSliderHorizontal/.gitignore b/NxWidgets/UnitTests/CGlyphSliderHorizontal/.gitignore index 105259c49..b14460823 100644 --- a/NxWidgets/UnitTests/CGlyphSliderHorizontal/.gitignore +++ b/NxWidgets/UnitTests/CGlyphSliderHorizontal/.gitignore @@ -1,5 +1,4 @@ /Make.dep -/.context /.depend /.built /*.asm diff --git a/NxWidgets/UnitTests/CGlyphSliderHorizontal/Makefile b/NxWidgets/UnitTests/CGlyphSliderHorizontal/Makefile index 5ab64b10d..96d825953 100644 --- a/NxWidgets/UnitTests/CGlyphSliderHorizontal/Makefile +++ b/NxWidgets/UnitTests/CGlyphSliderHorizontal/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/UnitTests/CGlyphSliderHorizontal/Makefile # -# Copyright (C) 2012-213 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -142,15 +142,18 @@ else endif $(Q) touch .built -# Standard housekeeping targets +# Register NSH built-in application -.context: ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat +else +context: endif - $(Q) touch $@ -context: .context +# Standard housekeeping targets .depend: Makefile $(SRCS) $(Q) $(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep @@ -159,6 +162,7 @@ context: .context depend: .depend clean: + $(call DELFILE, $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat) $(call DELFILE, .built) $(call CLEAN) diff --git a/NxWidgets/UnitTests/CImage/.gitignore b/NxWidgets/UnitTests/CImage/.gitignore index 105259c49..b14460823 100644 --- a/NxWidgets/UnitTests/CImage/.gitignore +++ b/NxWidgets/UnitTests/CImage/.gitignore @@ -1,5 +1,4 @@ /Make.dep -/.context /.depend /.built /*.asm diff --git a/NxWidgets/UnitTests/CImage/Makefile b/NxWidgets/UnitTests/CImage/Makefile index 08e22772f..f6416372f 100644 --- a/NxWidgets/UnitTests/CImage/Makefile +++ b/NxWidgets/UnitTests/CImage/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/UnitTests/CImage/Makefile # -# Copyright (C) 2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -142,15 +142,18 @@ else endif $(Q) touch .built -# Standard housekeeping targets +# Register NSH built-in application -.context: ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat +else +context: endif - $(Q) touch $@ -context: .context +# Standard housekeeping targets .depend: Makefile $(SRCS) $(Q) $(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep @@ -159,6 +162,7 @@ context: .context depend: .depend clean: + $(call DELFILE, $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat) $(call DELFILE, .built) $(call CLEAN) diff --git a/NxWidgets/UnitTests/CKeypad/.gitignore b/NxWidgets/UnitTests/CKeypad/.gitignore index 105259c49..b14460823 100644 --- a/NxWidgets/UnitTests/CKeypad/.gitignore +++ b/NxWidgets/UnitTests/CKeypad/.gitignore @@ -1,5 +1,4 @@ /Make.dep -/.context /.depend /.built /*.asm diff --git a/NxWidgets/UnitTests/CKeypad/Makefile b/NxWidgets/UnitTests/CKeypad/Makefile index 0bbf837d8..ea5b0fb15 100644 --- a/NxWidgets/UnitTests/CKeypad/Makefile +++ b/NxWidgets/UnitTests/CKeypad/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/UnitTests/CKeyPad/Makefile # -# Copyright (C) 2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -142,15 +142,18 @@ else endif $(Q) touch .built -# Standard housekeeping targets +# Register NSH built-in application -.context: ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat +else +context: endif - $(Q) touch $@ -context: .context +# Standard housekeeping targets .depend: Makefile $(SRCS) $(Q) $(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep @@ -159,6 +162,7 @@ context: .context depend: .depend clean: + $(call DELFILE, $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat) $(call DELFILE, .built) $(call CLEAN) diff --git a/NxWidgets/UnitTests/CLabel/.gitignore b/NxWidgets/UnitTests/CLabel/.gitignore index 105259c49..b14460823 100644 --- a/NxWidgets/UnitTests/CLabel/.gitignore +++ b/NxWidgets/UnitTests/CLabel/.gitignore @@ -1,5 +1,4 @@ /Make.dep -/.context /.depend /.built /*.asm diff --git a/NxWidgets/UnitTests/CLabel/Makefile b/NxWidgets/UnitTests/CLabel/Makefile index 4cd3d05d8..906e4754d 100644 --- a/NxWidgets/UnitTests/CLabel/Makefile +++ b/NxWidgets/UnitTests/CLabel/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/UnitTests/CLabel/Makefile # -# Copyright (C) 2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -142,15 +142,18 @@ else endif $(Q) touch .built -# Standard housekeeping targets +# Register NSH built-in application -.context: ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat +else +context: endif - $(Q) touch $@ -context: .context +# Standard housekeeping targets .depend: Makefile $(SRCS) $(Q) $(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep @@ -159,6 +162,7 @@ context: .context depend: .depend clean: + $(call DELFILE, $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat) $(call DELFILE, .built) $(call CLEAN) diff --git a/NxWidgets/UnitTests/CLatchButton/.gitignore b/NxWidgets/UnitTests/CLatchButton/.gitignore index 105259c49..b14460823 100644 --- a/NxWidgets/UnitTests/CLatchButton/.gitignore +++ b/NxWidgets/UnitTests/CLatchButton/.gitignore @@ -1,5 +1,4 @@ /Make.dep -/.context /.depend /.built /*.asm diff --git a/NxWidgets/UnitTests/CLatchButton/Makefile b/NxWidgets/UnitTests/CLatchButton/Makefile index 92909ab62..131a96f7a 100644 --- a/NxWidgets/UnitTests/CLatchButton/Makefile +++ b/NxWidgets/UnitTests/CLatchButton/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/UnitTests/CLatchButton/Makefile # -# Copyright (C) 2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -142,15 +142,18 @@ else endif $(Q) touch .built -# Standard housekeeping targets +# Register NSH built-in application -.context: ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat +else +context: endif - $(Q) touch $@ -context: .context +# Standard housekeeping targets .depend: Makefile $(SRCS) $(Q) $(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep @@ -159,6 +162,7 @@ context: .context depend: .depend clean: + $(call DELFILE, $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat) $(call DELFILE, .built) $(call CLEAN) diff --git a/NxWidgets/UnitTests/CLatchButtonArray/.gitignore b/NxWidgets/UnitTests/CLatchButtonArray/.gitignore index 105259c49..b14460823 100644 --- a/NxWidgets/UnitTests/CLatchButtonArray/.gitignore +++ b/NxWidgets/UnitTests/CLatchButtonArray/.gitignore @@ -1,5 +1,4 @@ /Make.dep -/.context /.depend /.built /*.asm diff --git a/NxWidgets/UnitTests/CLatchButtonArray/Makefile b/NxWidgets/UnitTests/CLatchButtonArray/Makefile index 412174ea2..c712142e3 100644 --- a/NxWidgets/UnitTests/CLatchButtonArray/Makefile +++ b/NxWidgets/UnitTests/CLatchButtonArray/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/UnitTests/CLatchButtonArray/Makefile # -# Copyright (C) 2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -142,15 +142,18 @@ else endif $(Q) touch .built -# Standard housekeeping targets +# Register NSH built-in application -.context: ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat +else +context: endif - $(Q) touch $@ -context: .context +# Standard housekeeping targets .depend: Makefile $(SRCS) $(Q) $(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep @@ -159,6 +162,7 @@ context: .context depend: .depend clean: + $(call DELFILE, $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat) $(call DELFILE, .built) $(call CLEAN) diff --git a/NxWidgets/UnitTests/CListBox/.gitignore b/NxWidgets/UnitTests/CListBox/.gitignore index 105259c49..b14460823 100644 --- a/NxWidgets/UnitTests/CListBox/.gitignore +++ b/NxWidgets/UnitTests/CListBox/.gitignore @@ -1,5 +1,4 @@ /Make.dep -/.context /.depend /.built /*.asm diff --git a/NxWidgets/UnitTests/CListBox/Makefile b/NxWidgets/UnitTests/CListBox/Makefile index 58d313b4f..5647002d6 100644 --- a/NxWidgets/UnitTests/CListBox/Makefile +++ b/NxWidgets/UnitTests/CListBox/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/UnitTests/CListBox/Makefile # -# Copyright (C) 2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -142,15 +142,18 @@ else endif $(Q) touch .built -# Standard housekeeping targets +# Register NSH built-in application -.context: ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat +else +context: endif - $(Q) touch $@ -context: .context +# Standard housekeeping targets .depend: Makefile $(SRCS) $(Q) $(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep @@ -159,6 +162,7 @@ context: .context depend: .depend clean: + $(call DELFILE, $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat) $(call DELFILE, .built) $(call CLEAN) diff --git a/NxWidgets/UnitTests/CProgressBar/.gitignore b/NxWidgets/UnitTests/CProgressBar/.gitignore index 105259c49..b14460823 100644 --- a/NxWidgets/UnitTests/CProgressBar/.gitignore +++ b/NxWidgets/UnitTests/CProgressBar/.gitignore @@ -1,5 +1,4 @@ /Make.dep -/.context /.depend /.built /*.asm diff --git a/NxWidgets/UnitTests/CProgressBar/Makefile b/NxWidgets/UnitTests/CProgressBar/Makefile index c57b0cf6e..90e09db72 100644 --- a/NxWidgets/UnitTests/CProgressBar/Makefile +++ b/NxWidgets/UnitTests/CProgressBar/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/UnitTests/CProgressBar/Makefile # -# Copyright (C) 2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -142,15 +142,18 @@ else endif $(Q) touch .built -# Standard housekeeping targets +# Register NSH built-in application -.context: ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat +else +context: endif - $(Q) touch $@ -context: .context +# Standard housekeeping targets .depend: Makefile $(SRCS) $(Q) $(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep @@ -159,6 +162,7 @@ context: .context depend: .depend clean: + $(call DELFILE, $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat) $(call DELFILE, .built) $(call CLEAN) diff --git a/NxWidgets/UnitTests/CRadioButton/.gitignore b/NxWidgets/UnitTests/CRadioButton/.gitignore index 105259c49..b14460823 100644 --- a/NxWidgets/UnitTests/CRadioButton/.gitignore +++ b/NxWidgets/UnitTests/CRadioButton/.gitignore @@ -1,5 +1,4 @@ /Make.dep -/.context /.depend /.built /*.asm diff --git a/NxWidgets/UnitTests/CRadioButton/Makefile b/NxWidgets/UnitTests/CRadioButton/Makefile index 1278c8f53..c64cf008c 100644 --- a/NxWidgets/UnitTests/CRadioButton/Makefile +++ b/NxWidgets/UnitTests/CRadioButton/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/UnitTests/CRadioButton/Makefile # -# Copyright (C) 2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -142,15 +142,18 @@ else endif $(Q) touch .built -# Standard housekeeping targets +# Register NSH built-in application -.context: ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat +else +context: endif - $(Q) touch $@ -context: .context +# Standard housekeeping targets .depend: Makefile $(SRCS) $(Q) $(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep @@ -159,6 +162,7 @@ context: .context depend: .depend clean: + $(call DELFILE, $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat) $(call DELFILE, .built) $(call CLEAN) diff --git a/NxWidgets/UnitTests/CScrollbarHorizontal/.gitignore b/NxWidgets/UnitTests/CScrollbarHorizontal/.gitignore index 105259c49..b14460823 100644 --- a/NxWidgets/UnitTests/CScrollbarHorizontal/.gitignore +++ b/NxWidgets/UnitTests/CScrollbarHorizontal/.gitignore @@ -1,5 +1,4 @@ /Make.dep -/.context /.depend /.built /*.asm diff --git a/NxWidgets/UnitTests/CScrollbarHorizontal/Makefile b/NxWidgets/UnitTests/CScrollbarHorizontal/Makefile index c1edc8936..cf7bf3724 100644 --- a/NxWidgets/UnitTests/CScrollbarHorizontal/Makefile +++ b/NxWidgets/UnitTests/CScrollbarHorizontal/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/UnitTests/CScrollbarHorizontal/Makefile # -# Copyright (C) 2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -142,15 +142,18 @@ else endif $(Q) touch .built -# Standard housekeeping targets +# Register NSH built-in application -.context: ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat +else +context: endif - $(Q) touch $@ -context: .context +# Standard housekeeping targets .depend: Makefile $(SRCS) @$(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep @@ -159,6 +162,7 @@ context: .context depend: .depend clean: + $(call DELFILE, $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat) $(call DELFILE, .built) $(call CLEAN) diff --git a/NxWidgets/UnitTests/CScrollbarVertical/.gitignore b/NxWidgets/UnitTests/CScrollbarVertical/.gitignore index 105259c49..b14460823 100644 --- a/NxWidgets/UnitTests/CScrollbarVertical/.gitignore +++ b/NxWidgets/UnitTests/CScrollbarVertical/.gitignore @@ -1,5 +1,4 @@ /Make.dep -/.context /.depend /.built /*.asm diff --git a/NxWidgets/UnitTests/CScrollbarVertical/Makefile b/NxWidgets/UnitTests/CScrollbarVertical/Makefile index e3367e167..39a5d8528 100644 --- a/NxWidgets/UnitTests/CScrollbarVertical/Makefile +++ b/NxWidgets/UnitTests/CScrollbarVertical/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/UnitTests/CScrollbarVertical/Makefile # -# Copyright (C) 2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -142,15 +142,18 @@ else endif $(Q) touch .built -# Standard housekeeping targets +# Register NSH built-in application -.context: ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat +else +context: endif - $(Q) touch $@ -context: .context +# Standard housekeeping targets .depend: Makefile $(SRCS) $(Q) $(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep @@ -159,6 +162,7 @@ context: .context depend: .depend clean: + $(call DELFILE, $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat) $(call DELFILE, .built) $(call CLEAN) diff --git a/NxWidgets/UnitTests/CSliderHorizonal/.gitignore b/NxWidgets/UnitTests/CSliderHorizonal/.gitignore index 105259c49..b14460823 100644 --- a/NxWidgets/UnitTests/CSliderHorizonal/.gitignore +++ b/NxWidgets/UnitTests/CSliderHorizonal/.gitignore @@ -1,5 +1,4 @@ /Make.dep -/.context /.depend /.built /*.asm diff --git a/NxWidgets/UnitTests/CSliderHorizonal/Makefile b/NxWidgets/UnitTests/CSliderHorizonal/Makefile index c739fef96..d824ffe93 100644 --- a/NxWidgets/UnitTests/CSliderHorizonal/Makefile +++ b/NxWidgets/UnitTests/CSliderHorizonal/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/UnitTests/CSliderHorizontal/Makefile # -# Copyright (C) 2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -142,15 +142,18 @@ else endif $(Q) touch .built -# Standard housekeeping targets +# Register NSH built-in application -.context: ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat +else +context: endif - $(Q) touch $@ -context: .context +# Standard housekeeping targets .depend: Makefile $(SRCS) $(Q) $(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep @@ -159,6 +162,7 @@ context: .context depend: .depend clean: + $(call DELFILE, $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat) $(call DELFILE, .built) $(call CLEAN) diff --git a/NxWidgets/UnitTests/CSliderVertical/.gitignore b/NxWidgets/UnitTests/CSliderVertical/.gitignore index 105259c49..b14460823 100644 --- a/NxWidgets/UnitTests/CSliderVertical/.gitignore +++ b/NxWidgets/UnitTests/CSliderVertical/.gitignore @@ -1,5 +1,4 @@ /Make.dep -/.context /.depend /.built /*.asm diff --git a/NxWidgets/UnitTests/CSliderVertical/Makefile b/NxWidgets/UnitTests/CSliderVertical/Makefile index 82f9c6fc6..a0b33a3ac 100644 --- a/NxWidgets/UnitTests/CSliderVertical/Makefile +++ b/NxWidgets/UnitTests/CSliderVertical/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/UnitTests/CSliderVertical/Makefile # -# Copyright (C) 2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -142,15 +142,18 @@ else endif $(Q) touch .built -# Standard housekeeping targets +# Register NSH built-in application -.context: ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat +else +context: endif - $(Q) touch $@ -context: .context +# Standard housekeeping targets .depend: Makefile $(SRCS) $(Q) $(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep @@ -159,6 +162,7 @@ context: .context depend: .depend clean: + $(call DELFILE, $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat) $(call DELFILE, .built) $(call CLEAN) diff --git a/NxWidgets/UnitTests/CTextBox/.gitignore b/NxWidgets/UnitTests/CTextBox/.gitignore index 105259c49..b14460823 100644 --- a/NxWidgets/UnitTests/CTextBox/.gitignore +++ b/NxWidgets/UnitTests/CTextBox/.gitignore @@ -1,5 +1,4 @@ /Make.dep -/.context /.depend /.built /*.asm diff --git a/NxWidgets/UnitTests/CTextBox/Makefile b/NxWidgets/UnitTests/CTextBox/Makefile index ddd16e95a..94cddcc9f 100644 --- a/NxWidgets/UnitTests/CTextBox/Makefile +++ b/NxWidgets/UnitTests/CTextBox/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/UnitTests/CTextBox/Makefile # -# Copyright (C) 2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -142,15 +142,18 @@ else endif $(Q) touch .built -# Standard housekeeping targets +# Register NSH built-in application -.context: ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat +else +context: endif - $(Q) touch $@ -context: .context +# Standard housekeeping targets .depend: Makefile $(SRCS) $(Q) $(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep @@ -159,6 +162,7 @@ context: .context depend: .depend clean: + $(call DELFILE, $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat) $(call DELFILE, .built) $(call CLEAN) diff --git a/NxWidgets/UnitTests/nxwm/.gitignore b/NxWidgets/UnitTests/nxwm/.gitignore index 105259c49..b14460823 100644 --- a/NxWidgets/UnitTests/nxwm/.gitignore +++ b/NxWidgets/UnitTests/nxwm/.gitignore @@ -1,5 +1,4 @@ /Make.dep -/.context /.depend /.built /*.asm diff --git a/NxWidgets/UnitTests/nxwm/Makefile b/NxWidgets/UnitTests/nxwm/Makefile index 76007da1c..1fa22348e 100644 --- a/NxWidgets/UnitTests/nxwm/Makefile +++ b/NxWidgets/UnitTests/nxwm/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/Unitests/nxwm/Makefile # -# Copyright (C) 2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -172,15 +172,18 @@ else endif $(Q) touch .built -# Standard housekeeping targets +# Register NSH built-in application -.context: ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat +else +context: endif - $(Q) touch $@ -context: .context +# Standard housekeeping targets .depend: Makefile $(SRCS) $(Q) $(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep @@ -189,10 +192,12 @@ context: .context depend: .depend clean: + $(call DELFILE, $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat) $(call DELFILE, .built) $(call CLEAN) distclean: clean + $(call DELFILE, $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat) $(call DELFILE, Make.dep) $(call DELFILE, .depend) |