From 28ec908426208d6e4c38e86d19c3ccddaa9c786d Mon Sep 17 00:00:00 2001
From: ligi <ligi>
Date: Tue, 9 Nov 2010 04:27:38 +0000
Subject: [PATCH] now that "Only write file if modified" issue is solved we can
 depend on uavobjects in makefile and remove the notes regarding that issue

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2099 ebee16cc-31ac-478f-84a7-5cbb03baadba
---
 Makefile | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 5a00a047f..44327a859 100644
--- a/Makefile
+++ b/Makefile
@@ -184,13 +184,8 @@ all_ground: uavobjgenerator openpilotgcs
 .PHONY: gcs
 gcs: openpilotgcs
 
-# Note: openpilotgcs should depend on uavobjects directly since it uses
-#       the generated uavobject files.  This is commented out since the
-#       uavobjgenerator tool always regenerates its output files
-#       triggering unnecessary rebuilds of the elf file.
-
 .PHONY: openpilotgcs
-openpilotgcs:  #uavobjects
+openpilotgcs:  uavobjects
 	mkdir -p $(BUILD_DIR)/$@
 	( cd $(BUILD_DIR)/$@ ; \
 	  $(QMAKE) $(ROOT_DIR)/ground/openpilotgcs.pro -spec $(QT_SPEC) -r CONFIG+=debug ; \
@@ -222,12 +217,7 @@ all_flight: openpilot_elf ahrs_elf
 .PHONY: openpilot
 openpilot: openpilot_elf
 
-# Note: openpilot_* should depend on uavobjects directly since it uses
-#       the generated uavobject files.  This is commented out since the
-#       uavobjgenerator tool always regenerates its output files
-#       triggering unnecessary rebuilds of the elf file.
-
-openpilot_%: #uavobjects
+openpilot_%: uavobjects
 	mkdir -p $(BUILD_DIR)/openpilot
 	$(MAKE) OUTDIR="$(BUILD_DIR)/openpilot" TCHAIN_PREFIX="$(ARM_SDK_PREFIX)" REMOVE_CMD="$(RM)" OOCD_EXE="$(OPENOCD)" -C $(ROOT_DIR)/flight/OpenPilot $*
 
@@ -241,9 +231,7 @@ ahrs_%:
 .PHONY: sim_posix
 sim_posix: sim_posix_elf
 
-# Note: sim_* should depend on uavobjects directly - same reasons as above.
-
-sim_posix_%: #uavobjects
+sim_posix_%: uavobjects
 	mkdir -p $(BUILD_DIR)/simulation
 	$(MAKE) OUTDIR="$(BUILD_DIR)/simulation" -C $(ROOT_DIR)/flight/OpenPilot --file=$(ROOT_DIR)/flight/OpenPilot/Makefile.posix $*