diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-01-13 13:54:47 -0800 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-01-13 13:54:47 -0800 |
| commit | 0fdf9623561225940189ce4f419b4347f29e11a1 (patch) | |
| tree | 20a2f8ef9c4bfe7c32199fefb57d2ef04835be3c /apps/mathlib | |
| parent | ff146cc5b19969ae9048f0672a0c98f29aa1666b (diff) | |
| parent | dba244a8d48b8367c8ca14abaf5ff3b46ab7ad08 (diff) | |
| download | px4-firmware-0fdf9623561225940189ce4f419b4347f29e11a1.tar.gz px4-firmware-0fdf9623561225940189ce4f419b4347f29e11a1.tar.bz2 px4-firmware-0fdf9623561225940189ce4f419b4347f29e11a1.zip | |
Merge pull request #150 from PX4/app-auto-deps
Use the compiler to generate app dependencies
Diffstat (limited to 'apps/mathlib')
| -rw-r--r-- | apps/mathlib/Makefile | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/apps/mathlib/Makefile b/apps/mathlib/Makefile index e5fab1e35..7eebd6ae0 100644 --- a/apps/mathlib/Makefile +++ b/apps/mathlib/Makefile @@ -31,8 +31,6 @@ # ############################################################################ -include $(TOPDIR)/.config - # # Math library # @@ -44,27 +42,21 @@ CXXSRCS = math/test/test.cpp \ math/Dcm.cpp \ math/Matrix.cpp -CXXHDRS = math/test/test.hpp \ - math/Vector.hpp \ - math/Vector3.hpp \ - math/EulerAngles.hpp \ - math/Quaternion.hpp \ - math/Dcm.hpp \ - math/Matrix.hpp +# +# In order to include .config we first have to save off the +# current makefile name, since app.mk needs it. +# +APP_MAKEFILE := $(lastword $(MAKEFILE_LIST)) +-include $(TOPDIR)/.config -# XXX this really should be a CONFIG_* test ifeq ($(CONFIG_ARCH_CORTEXM4)$(CONFIG_ARCH_FPU),yy) INCLUDES += math/arm CXXSRCS += math/arm/Vector.cpp \ math/arm/Matrix.cpp -CXXHDRS += math/arm/Vector.hpp \ - math/arm/Matrix.hpp else INCLUDES += math/generic CXXSRCS += math/generic/Vector.cpp \ math/generic/Matrix.cpp -CXXHDRS += math/generic/Vector.hpp \ - math/generic/Matrix.hpp endif include $(APPDIR)/mk/app.mk |