aboutsummaryrefslogtreecommitdiff
path: root/makefiles/module.mk
diff options
context:
space:
mode:
authorpx4dev <px4@purgatory.org>2013-05-20 00:26:41 +0200
committerpx4dev <px4@purgatory.org>2013-05-20 00:26:41 +0200
commit3a1c9f14f68054537657851eacb60d930c3d4221 (patch)
treea557706dca066e99935d52d2cc84ed8fa6fe4187 /makefiles/module.mk
parent504b6d12561d68874ded4c1f747c21926a065045 (diff)
downloadpx4-firmware-3a1c9f14f68054537657851eacb60d930c3d4221.tar.gz
px4-firmware-3a1c9f14f68054537657851eacb60d930c3d4221.tar.bz2
px4-firmware-3a1c9f14f68054537657851eacb60d930c3d4221.zip
Teach the PX4 build system how to handle pre-built libraries.
Diffstat (limited to 'makefiles/module.mk')
-rw-r--r--makefiles/module.mk24
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