diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-05-22 23:19:28 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-05-22 23:19:28 +0200 |
| commit | c6b6b7ffcdd037965f13d82628cdad53072fcb23 (patch) | |
| tree | 8855c140b35cb468d43b4dd5f8f4d5fb9c1efd1e /makefiles/module.mk | |
| parent | 58084685b2b2f8e31598320318a7c34dd0a96955 (diff) | |
| parent | 6b9d7815a38f505ead8eb665ae1e6b44e59c8c34 (diff) | |
| download | px4-firmware-c6b6b7ffcdd037965f13d82628cdad53072fcb23.tar.gz px4-firmware-c6b6b7ffcdd037965f13d82628cdad53072fcb23.tar.bz2 px4-firmware-c6b6b7ffcdd037965f13d82628cdad53072fcb23.zip | |
Merge branch 'master' of github.com:PX4/Firmware
Diffstat (limited to 'makefiles/module.mk')
| -rw-r--r-- | makefiles/module.mk | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/makefiles/module.mk b/makefiles/module.mk index db6f4e15e..074cd159a 100644 --- a/makefiles/module.mk +++ b/makefiles/module.mk @@ -35,7 +35,7 @@ # This makefile is invoked by firmware.mk to build each of the modules # that will subsequently be linked into the firmware image. # -# Applications are built as prelinked objects with a limited set of exported +# Modules are built as prelinked objects with a limited set of exported # symbols, as the global namespace is shared between all modules. Normally an # module will just export one or more <command>_main functions. # @@ -184,29 +184,9 @@ CXXFLAGS += -fvisibility=$(DEFAULT_VISIBILITY) -include $(PX4_INCLUDE_DIR)visibi module: $(MODULE_OBJ) $(MODULE_COMMAND_FILES) ## -## Locate sources (allows relative source paths in module.mk) -## -#define SRC_SEARCH -# $(abspath $(firstword $(wildcard $1) $(wildcard $(MODULE_SRC)/$1) MISSING_$1)) -#endef -# -#ABS_SRCS ?= $(foreach src,$(SRCS),$(call SRC_SEARCH,$(src))) -#MISSING_SRCS := $(subst MISSING_,,$(filter MISSING_%,$(ABS_SRCS))) -#ifneq ($(MISSING_SRCS),) -#$(error $(MODULE_MK): missing in SRCS: $(MISSING_SRCS)) -#endif -#ifeq ($(ABS_SRCS),) -#$(error $(MODULE_MK): nothing to compile in SRCS) -#endif -# -## ## Object files we will generate from sources ## -#OBJS := $(foreach src,$(ABS_SRCS),$(MODULE_WORK_DIR)$(src).o) - -OBJS = $(addsuffix .o,$(SRCS)) -$(info SRCS $(SRCS)) -$(info OBJS $(OBJS)) +OBJS = $(addsuffix .o,$(SRCS)) # # SRCS -> OBJS rules |