diff options
| author | px4dev <px4@purgatory.org> | 2013-01-12 12:46:46 -0800 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-01-12 12:46:46 -0800 |
| commit | dba244a8d48b8367c8ca14abaf5ff3b46ab7ad08 (patch) | |
| tree | f729b163b5daa6fca226408366d890cf1e85fc6d /apps | |
| parent | 1c63eda98bb89d0d206efb88195020f5822d7df8 (diff) | |
| download | px4-firmware-dba244a8d48b8367c8ca14abaf5ff3b46ab7ad08.tar.gz px4-firmware-dba244a8d48b8367c8ca14abaf5ff3b46ab7ad08.tar.bz2 px4-firmware-dba244a8d48b8367c8ca14abaf5ff3b46ab7ad08.zip | |
Fix a build breaker, remove C*HDRS as they aren't used.
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/controllib/Makefile | 7 | ||||
| -rw-r--r-- | apps/mathlib/Makefile | 12 | ||||
| -rw-r--r-- | apps/mk/app.mk | 4 |
3 files changed, 4 insertions, 19 deletions
diff --git a/apps/controllib/Makefile b/apps/controllib/Makefile index 99cf91069..6749b805f 100644 --- a/apps/controllib/Makefile +++ b/apps/controllib/Makefile @@ -43,11 +43,4 @@ CXXSRCS = block/Block.cpp \ blocks.cpp \ fixedwing.cpp -CXXHDRS = block/Block.hpp \ - block/BlockParam.hpp \ - block/UOrbPublication.hpp \ - block/UOrbSubscription.hpp \ - blocks.hpp \ - fixedwing.hpp - include $(APPDIR)/mk/app.mk diff --git a/apps/mathlib/Makefile b/apps/mathlib/Makefile index e3aa9275e..7eebd6ae0 100644 --- a/apps/mathlib/Makefile +++ b/apps/mathlib/Makefile @@ -42,14 +42,6 @@ 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. @@ -61,14 +53,10 @@ 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 diff --git a/apps/mk/app.mk b/apps/mk/app.mk index 7cbdc3e62..fa4a12cab 100644 --- a/apps/mk/app.mk +++ b/apps/mk/app.mk @@ -167,9 +167,13 @@ else PRELINKOBJ = $(LIBNAME).pre.o endif +# The archive the prelinked object will be linked into # XXX does WINTOOL ever get set? ifeq ($(WINTOOL),y) INCDIROPT = -w + BIN = "$(shell cygpath -w $(APPDIR)/libapps$(LIBEXT))" +else + BIN = "$(APPDIR)/libapps$(LIBEXT)" endif ############################################################################ |