From 6f2e45d414fbf51ece2e0f767f512866b3e59ea1 Mon Sep 17 00:00:00 2001 From: corvus Date: Fri, 28 Jan 2011 20:19:53 +0000 Subject: [PATCH] BigMess: OpenPilot/Makefile: do not have an explicit list of UAVObjects in Makefile, include by wildcard uavobjects/*.c git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2612 ebee16cc-31ac-478f-84a7-5cbb03baadba --- flight/OpenPilot/Makefile | 45 +-------------------------------- flight/OpenPilot/Makefile.posix | 45 +-------------------------------- 2 files changed, 2 insertions(+), 88 deletions(-) diff --git a/flight/OpenPilot/Makefile b/flight/OpenPilot/Makefile index e406a79af..26af9ff01 100644 --- a/flight/OpenPilot/Makefile +++ b/flight/OpenPilot/Makefile @@ -169,50 +169,7 @@ endif ## UAVOBJECTS ifndef TESTAPP -SRC += $(OPUAVSYNTHDIR)/objectpersistence.c -SRC += $(OPUAVSYNTHDIR)/positionactual.c -SRC += $(OPUAVSYNTHDIR)/gpsposition.c -SRC += $(OPUAVSYNTHDIR)/gpstime.c -SRC += $(OPUAVSYNTHDIR)/gpssatellites.c -SRC += $(OPUAVSYNTHDIR)/gcstelemetrystats.c -SRC += $(OPUAVSYNTHDIR)/flighttelemetrystats.c -SRC += $(OPUAVSYNTHDIR)/systemstats.c -SRC += $(OPUAVSYNTHDIR)/systemalarms.c -SRC += $(OPUAVSYNTHDIR)/systemsettings.c -SRC += $(OPUAVSYNTHDIR)/telemetrysettings.c -SRC += $(OPUAVSYNTHDIR)/actuatorcommand.c -SRC += $(OPUAVSYNTHDIR)/actuatordesired.c -SRC += $(OPUAVSYNTHDIR)/actuatorsettings.c -SRC += $(OPUAVSYNTHDIR)/manualcontrolcommand.c -SRC += $(OPUAVSYNTHDIR)/manualcontrolsettings.c -SRC += $(OPUAVSYNTHDIR)/attitudedesired.c -SRC += $(OPUAVSYNTHDIR)/stabilizationsettings.c -SRC += $(OPUAVSYNTHDIR)/ahrsstatus.c -SRC += $(OPUAVSYNTHDIR)/i2cstats.c -SRC += $(OPUAVSYNTHDIR)/baroaltitude.c -SRC += $(OPUAVSYNTHDIR)/ahrscalibration.c -SRC += $(OPUAVSYNTHDIR)/attitudeactual.c -SRC += $(OPUAVSYNTHDIR)/ahrssettings.c -SRC += $(OPUAVSYNTHDIR)/flightbatterystate.c -SRC += $(OPUAVSYNTHDIR)/attituderaw.c -SRC += $(OPUAVSYNTHDIR)/homelocation.c -SRC += $(OPUAVSYNTHDIR)/mixersettings.c -SRC += $(OPUAVSYNTHDIR)/mixerstatus.c -SRC += $(OPUAVSYNTHDIR)/positiondesired.c -SRC += $(OPUAVSYNTHDIR)/velocitydesired.c -SRC += $(OPUAVSYNTHDIR)/velocityactual.c -SRC += $(OPUAVSYNTHDIR)/guidancesettings.c -SRC += $(OPUAVSYNTHDIR)/firmwareiapobj.c -SRC += $(OPUAVSYNTHDIR)/ratedesired.c -SRC += $(OPUAVSYNTHDIR)/batterysettings.c -SRC += $(OPUAVSYNTHDIR)/flightplancontrol.c -SRC += $(OPUAVSYNTHDIR)/flightplanstatus.c -SRC += $(OPUAVSYNTHDIR)/flightplansettings.c -SRC += $(OPUAVSYNTHDIR)/taskinfo.c -SRC += $(OPUAVSYNTHDIR)/watchdogstatus.c -SRC += $(OPUAVSYNTHDIR)/nedaccel.c -SRC += $(OPUAVSYNTHDIR)/sonaraltitude.c -SRC += $(OPUAVSYNTHDIR)/uavobjectsinit.c +SRC += $(wildcard $(OPUAVSYNTHDIR)/*.c ) endif ## PIOS Hardware (STM32F10x) diff --git a/flight/OpenPilot/Makefile.posix b/flight/OpenPilot/Makefile.posix index a731ce357..5e9e9fa3f 100644 --- a/flight/OpenPilot/Makefile.posix +++ b/flight/OpenPilot/Makefile.posix @@ -153,50 +153,7 @@ endif ## UAVOBJECTS ifndef TESTAPP -SRC += $(OPUAVSYNTHDIR)/objectpersistence.c -SRC += $(OPUAVSYNTHDIR)/positionactual.c -SRC += $(OPUAVSYNTHDIR)/gpsposition.c -SRC += $(OPUAVSYNTHDIR)/gpstime.c -SRC += $(OPUAVSYNTHDIR)/gpssatellites.c -SRC += $(OPUAVSYNTHDIR)/gcstelemetrystats.c -SRC += $(OPUAVSYNTHDIR)/flighttelemetrystats.c -SRC += $(OPUAVSYNTHDIR)/systemstats.c -SRC += $(OPUAVSYNTHDIR)/systemalarms.c -SRC += $(OPUAVSYNTHDIR)/systemsettings.c -SRC += $(OPUAVSYNTHDIR)/telemetrysettings.c -SRC += $(OPUAVSYNTHDIR)/actuatorcommand.c -SRC += $(OPUAVSYNTHDIR)/actuatordesired.c -SRC += $(OPUAVSYNTHDIR)/actuatorsettings.c -SRC += $(OPUAVSYNTHDIR)/manualcontrolcommand.c -SRC += $(OPUAVSYNTHDIR)/manualcontrolsettings.c -SRC += $(OPUAVSYNTHDIR)/attitudedesired.c -SRC += $(OPUAVSYNTHDIR)/stabilizationsettings.c -SRC += $(OPUAVSYNTHDIR)/ahrsstatus.c -SRC += $(OPUAVSYNTHDIR)/i2cstats.c -SRC += $(OPUAVSYNTHDIR)/baroaltitude.c -SRC += $(OPUAVSYNTHDIR)/ahrscalibration.c -SRC += $(OPUAVSYNTHDIR)/attitudeactual.c -SRC += $(OPUAVSYNTHDIR)/ahrssettings.c -SRC += $(OPUAVSYNTHDIR)/flightbatterystate.c -SRC += $(OPUAVSYNTHDIR)/attituderaw.c -SRC += $(OPUAVSYNTHDIR)/homelocation.c -SRC += $(OPUAVSYNTHDIR)/mixersettings.c -SRC += $(OPUAVSYNTHDIR)/mixerstatus.c -SRC += $(OPUAVSYNTHDIR)/positiondesired.c -SRC += $(OPUAVSYNTHDIR)/velocitydesired.c -SRC += $(OPUAVSYNTHDIR)/velocityactual.c -SRC += $(OPUAVSYNTHDIR)/guidancesettings.c -SRC += $(OPUAVSYNTHDIR)/firmwareiapobj.c -SRC += $(OPUAVSYNTHDIR)/ratedesired.c -SRC += $(OPUAVSYNTHDIR)/batterysettings.c -SRC += $(OPUAVSYNTHDIR)/flightplancontrol.c -SRC += $(OPUAVSYNTHDIR)/flightplanstatus.c -SRC += $(OPUAVSYNTHDIR)/flightplansettings.c -SRC += $(OPUAVSYNTHDIR)/taskinfo.c -SRC += $(OPUAVSYNTHDIR)/watchdogstatus.c -SRC += $(OPUAVSYNTHDIR)/nedaccel.c -SRC += $(OPUAVSYNTHDIR)/sonaraltitude.c -SRC += $(OPUAVSYNTHDIR)/uavobjectsinit.c +SRC += $(wildcard $(OPUAVSYNTHDIR)/*.c) endif ## PIOS Hardware (posix)