In all Make.defs files, append CONFIGURED_APPS with the consistent ifeq/ifneq.
This commit is contained in:
parent
75cd1dfd74
commit
403b4a0178
@ -107,7 +107,7 @@ This will select the apps/examples/hello in the following way:
|
||||
- examples/Make.defs will set CONFIGURED_APPS += $(APPDIR)/examples/hello
|
||||
like this:
|
||||
|
||||
ifeq ($(CONFIG_EXAMPLES_HELLO),y)
|
||||
ifneq ($(CONFIG_EXAMPLES_HELLO),)
|
||||
CONFIGURED_APPS += $(APPDIR)/examples/hello
|
||||
endif
|
||||
|
||||
@ -141,7 +141,7 @@ to the project. One must:
|
||||
|
||||
4b. The Make.defs file should include a line like:
|
||||
|
||||
ifeq ($(CONFIG_PROGNAME),y)
|
||||
ifneq ($(CONFIG_PROGNAME),)
|
||||
CONFIGURED_APPS += progname
|
||||
endif
|
||||
|
||||
|
@ -34,6 +34,6 @@
|
||||
#
|
||||
############################################################################
|
||||
|
||||
ifeq ($(CONFIG_EXAMPLES_EMBEDLOG),y)
|
||||
ifneq ($(CONFIG_EXAMPLES_EMBEDLOG),)
|
||||
CONFIGURED_APPS += $(APPDIR)/examples/embedlog
|
||||
endif
|
||||
|
@ -34,6 +34,6 @@
|
||||
#
|
||||
############################################################################
|
||||
|
||||
ifeq ($(CONFIG_EXAMPLES_INA226),y)
|
||||
ifneq ($(CONFIG_EXAMPLES_INA226),)
|
||||
CONFIGURED_APPS += $(APPDIR)/examples/ina226
|
||||
endif
|
||||
|
@ -34,6 +34,6 @@
|
||||
#
|
||||
############################################################################
|
||||
|
||||
ifeq ($(CONFIG_EXAMPLES_INI_DUMPER),y)
|
||||
ifneq ($(CONFIG_EXAMPLES_INI_DUMPER),)
|
||||
CONFIGURED_APPS += $(APPDIR)/examples/ini_dumper
|
||||
endif
|
||||
|
@ -34,6 +34,6 @@
|
||||
#
|
||||
############################################################################
|
||||
|
||||
ifeq ($(CONFIG_EXAMPLES_MODBUSMASTER),y)
|
||||
ifneq ($(CONFIG_EXAMPLES_MODBUSMASTER),)
|
||||
CONFIGURED_APPS += $(APPDIR)/examples/modbusmaster
|
||||
endif
|
||||
|
@ -34,7 +34,7 @@
|
||||
#
|
||||
############################################################################
|
||||
|
||||
ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CBUTTON),y)
|
||||
ifneq ($(CONFIG_NXWIDGETS_UNITTEST_CBUTTON),)
|
||||
CONFIGURED_APPS += $(APPDIR)/graphics/nxwidget/UnitTests/CButton
|
||||
endif
|
||||
|
||||
|
@ -34,7 +34,7 @@
|
||||
#
|
||||
############################################################################
|
||||
|
||||
ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CBUTTONARRAY),y)
|
||||
ifneq ($(CONFIG_NXWIDGETS_UNITTEST_CBUTTONARRAY),)
|
||||
CONFIGURED_APPS += $(APPDIR)/graphics/nxwidget/UnitTests/CButtonArray
|
||||
endif
|
||||
|
||||
|
@ -34,7 +34,7 @@
|
||||
#
|
||||
############################################################################
|
||||
|
||||
ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CCHECKBOX),y)
|
||||
ifneq ($(CONFIG_NXWIDGETS_UNITTEST_CCHECKBOX),)
|
||||
CONFIGURED_APPS += $(APPDIR)/graphics/nxwidget/UnitTests/CCheckBox
|
||||
endif
|
||||
|
||||
|
@ -34,6 +34,6 @@
|
||||
#
|
||||
############################################################################
|
||||
|
||||
ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CGLYPHBUTTON),y)
|
||||
ifneq ($(CONFIG_NXWIDGETS_UNITTEST_CGLYPHBUTTON),)
|
||||
CONFIGURED_APPS += $(APPDIR)/graphics/nxwidget/UnitTests/CGlyphButton
|
||||
endif
|
||||
|
@ -34,7 +34,7 @@
|
||||
#
|
||||
############################################################################
|
||||
|
||||
ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CGLYPHSLIDERHORIZONTAL),y)
|
||||
ifneq ($(CONFIG_NXWIDGETS_UNITTEST_CGLYPHSLIDERHORIZONTAL),)
|
||||
CONFIGURED_APPS += $(APPDIR)/graphics/nxwidget/UnitTests/CGlyphSliderHorizontal
|
||||
endif
|
||||
|
||||
|
@ -34,6 +34,6 @@
|
||||
#
|
||||
############################################################################
|
||||
|
||||
ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CIMAGE),y)
|
||||
ifneq ($(CONFIG_NXWIDGETS_UNITTEST_CIMAGE),)
|
||||
CONFIGURED_APPS += $(APPDIR)/graphics/nxwidget/UnitTests/CImage
|
||||
endif
|
||||
|
@ -34,6 +34,6 @@
|
||||
#
|
||||
############################################################################
|
||||
|
||||
ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CKEYPAD),y)
|
||||
ifneq ($(CONFIG_NXWIDGETS_UNITTEST_CKEYPAD),)
|
||||
CONFIGURED_APPS += $(APPDIR)/graphics/nxwidget/UnitTests/CKeypad
|
||||
endif
|
||||
|
@ -34,6 +34,6 @@
|
||||
#
|
||||
############################################################################
|
||||
|
||||
ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CLABEL),y)
|
||||
ifneq ($(CONFIG_NXWIDGETS_UNITTEST_CLABEL),)
|
||||
CONFIGURED_APPS += $(APPDIR)/graphics/nxwidget/UnitTests/CLabel
|
||||
endif
|
||||
|
@ -34,6 +34,6 @@
|
||||
#
|
||||
############################################################################
|
||||
|
||||
ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CLATCHBUTTON),y)
|
||||
ifneq ($(CONFIG_NXWIDGETS_UNITTEST_CLATCHBUTTON),)
|
||||
CONFIGURED_APPS += $(APPDIR)/graphics/nxwidget/UnitTests/CLatchButton
|
||||
endif
|
||||
|
@ -34,7 +34,7 @@
|
||||
#
|
||||
############################################################################
|
||||
|
||||
ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CLATCHBUTTONARRAY),y)
|
||||
ifneq ($(CONFIG_NXWIDGETS_UNITTEST_CLATCHBUTTONARRAY),)
|
||||
CONFIGURED_APPS += $(APPDIR)/graphics/nxwidget/UnitTests/CLatchButtonArray
|
||||
endif
|
||||
|
||||
|
@ -34,6 +34,6 @@
|
||||
#
|
||||
############################################################################
|
||||
|
||||
ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CLISTBOX),y)
|
||||
ifneq ($(CONFIG_NXWIDGETS_UNITTEST_CLISTBOX),)
|
||||
CONFIGURED_APPS += $(APPDIR)/graphics/nxwidget/UnitTests/CListBox
|
||||
endif
|
||||
|
@ -34,6 +34,6 @@
|
||||
#
|
||||
############################################################################
|
||||
|
||||
ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CPROGRESSBAR),y)
|
||||
ifneq ($(CONFIG_NXWIDGETS_UNITTEST_CPROGRESSBAR),)
|
||||
CONFIGURED_APPS += $(APPDIR)/graphics/nxwidget/UnitTests/CProgressBar
|
||||
endif
|
||||
|
@ -34,6 +34,6 @@
|
||||
#
|
||||
############################################################################
|
||||
|
||||
ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CRADIOBUTTON),y)
|
||||
ifneq ($(CONFIG_NXWIDGETS_UNITTEST_CRADIOBUTTON),)
|
||||
CONFIGURED_APPS += $(APPDIR)/graphics/nxwidget/UnitTests/CRadioButton
|
||||
endif
|
||||
|
@ -34,6 +34,6 @@
|
||||
#
|
||||
############################################################################
|
||||
|
||||
ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CSCROLLBARHORIZONTAL),y)
|
||||
ifneq ($(CONFIG_NXWIDGETS_UNITTEST_CSCROLLBARHORIZONTAL),)
|
||||
CONFIGURED_APPS += $(APPDIR)/graphics/nxwidget/UnitTests/CScrollbarHorizontal
|
||||
endif
|
||||
|
@ -34,7 +34,7 @@
|
||||
#
|
||||
############################################################################
|
||||
|
||||
ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CSCROLLBARVERTICAL),y)
|
||||
ifneq ($(CONFIG_NXWIDGETS_UNITTEST_CSCROLLBARVERTICAL),)
|
||||
CONFIGURED_APPS += $(APPDIR)/graphics/nxwidget/UnitTests/CScrollbarVertical
|
||||
endif
|
||||
|
||||
|
@ -34,6 +34,6 @@
|
||||
#
|
||||
############################################################################
|
||||
|
||||
ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CSLIDERHORIZONAL),y)
|
||||
ifneq ($(CONFIG_NXWIDGETS_UNITTEST_CSLIDERHORIZONAL),)
|
||||
CONFIGURED_APPS += $(APPDIR)/graphics/nxwidget/UnitTests/CSliderHorizonal
|
||||
endif
|
||||
|
@ -34,6 +34,6 @@
|
||||
#
|
||||
############################################################################
|
||||
|
||||
ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CSLIDERVERTICAL),y)
|
||||
ifneq ($(CONFIG_NXWIDGETS_UNITTEST_CSLIDERVERTICAL),)
|
||||
CONFIGURED_APPS += $(APPDIR)/graphics/nxwidget/UnitTests/CSliderVertical
|
||||
endif
|
||||
|
@ -34,6 +34,6 @@
|
||||
#
|
||||
############################################################################
|
||||
|
||||
ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CTEXTBOX),y)
|
||||
ifneq ($(CONFIG_NXWIDGETS_UNITTEST_CTEXTBOX),)
|
||||
CONFIGURED_APPS += $(APPDIR)/graphics/nxwidget/UnitTests/CTextBox
|
||||
endif
|
||||
|
@ -34,7 +34,7 @@
|
||||
#
|
||||
############################################################################
|
||||
|
||||
ifeq ($(CONFIG_NXWM),y)
|
||||
ifneq ($(CONFIG_NXWM),)
|
||||
CONFIGURED_APPS += $(APPDIR)/graphics/nxwm
|
||||
endif
|
||||
|
||||
|
@ -34,7 +34,7 @@
|
||||
#
|
||||
############################################################################
|
||||
|
||||
ifeq ($(CONFIG_GRAPHICS_TWM4NX),y)
|
||||
ifneq ($(CONFIG_GRAPHICS_TWM4NX),)
|
||||
CONFIGURED_APPS += $(APPDIR)/graphics/twm4nx
|
||||
endif
|
||||
|
||||
|
@ -49,7 +49,7 @@ MODULE = $(CONFIG_GRAPHICS_TWM4NX)
|
||||
|
||||
# Twm4Nx
|
||||
|
||||
CXXSRCS = twm4nx_main.cxx
|
||||
MAINSRC = twm4nx_main.cxx
|
||||
CXXSRCS += cbackground.cxx cfonts.cxx ciconmgr.cxx ciconwidget.cxx
|
||||
CXXSRCS += cmenus.cxx cmainmenu.cxx
|
||||
CXXSRCS += cwindow.cxx cwindowevent.cxx cresize.cxx cwindowfactory.cxx
|
||||
@ -71,7 +71,7 @@ ifeq ($(CONFIG_TWM4NX_NXTERM),y)
|
||||
CXXSRCS += cnxterm.cxx
|
||||
endif
|
||||
|
||||
MAINSRC = ctwm4nx.cxx
|
||||
CXXSRCS = ctwm4nx.cxx
|
||||
|
||||
VPATH = src:apps
|
||||
|
||||
|
@ -33,7 +33,7 @@
|
||||
#
|
||||
############################################################################
|
||||
|
||||
ifneq ($(CONFIG_NETUTILS_DISCOVER),)
|
||||
ifeq ($(CONFIG_NETUTILS_DISCOVER),y)
|
||||
CONFIGURED_APPS += $(APPDIR)/netutils/discover
|
||||
endif
|
||||
|
||||
|
@ -34,4 +34,8 @@
|
||||
#
|
||||
############################################################################
|
||||
|
||||
ifeq ($(CONFIG_NETUTILS_PING),y)
|
||||
CONFIGURED_APPS += $(APPDIR)/netutils/ping
|
||||
else ifeq ($(CONFIG_NETUTILS_PING6),y)
|
||||
CONFIGURED_APPS += $(APPDIR)/netutils/ping
|
||||
endif
|
||||
|
@ -33,7 +33,7 @@
|
||||
#
|
||||
############################################################################
|
||||
|
||||
ifneq ($(CONFIG_NETUTILS_THTTPD),)
|
||||
ifeq ($(CONFIG_NETUTILS_THTTPD),y)
|
||||
CONFIGURED_APPS += $(APPDIR)/netutils/thttpd
|
||||
endif
|
||||
|
||||
|
@ -34,6 +34,6 @@
|
||||
#
|
||||
############################################################################
|
||||
|
||||
ifneq ($(CONFIG_NSH_LIBRARY),)
|
||||
ifeq ($(CONFIG_NSH_LIBRARY),y)
|
||||
CONFIGURED_APPS += $(APPDIR)/nshlib
|
||||
endif
|
||||
|
@ -33,6 +33,6 @@
|
||||
#
|
||||
############################################################################
|
||||
|
||||
ifeq ($(CONFIG_SYSTEM_PSMQ),y)
|
||||
ifneq ($(CONFIG_SYSTEM_PSMQ),)
|
||||
CONFIGURED_APPS += $(APPDIR)/system/psmq
|
||||
endif
|
||||
|
@ -33,6 +33,6 @@
|
||||
#
|
||||
############################################################################
|
||||
|
||||
ifneq ($(CONFIG_SYSTEM_TERMCURSES),)
|
||||
ifeq ($(CONFIG_SYSTEM_TERMCURSES),y)
|
||||
CONFIGURED_APPS += $(APPDIR)/system/termcurses
|
||||
endif
|
||||
|
Loading…
Reference in New Issue
Block a user