diff --git a/Makefile b/Makefile
index 940e6a1de..921abe833 100644
--- a/Makefile
+++ b/Makefile
@@ -170,7 +170,9 @@ UAVOBJGENERATOR_DIR := $(BUILD_DIR)/uavobjgenerator
 DIRS += $(UAVOBJGENERATOR_DIR)
 
 .PHONY: uavobjgenerator
-uavobjgenerator $(UAVOBJGENERATOR): | $(UAVOBJGENERATOR_DIR)
+uavobjgenerator: $(UAVOBJGENERATOR)
+
+$(UAVOBJGENERATOR): | $(UAVOBJGENERATOR_DIR)
 	$(V1) cd $(UAVOBJGENERATOR_DIR) && \
 	    ( [ -f Makefile ] || $(QMAKE) $(ROOT_DIR)/ground/uavobjgenerator/uavobjgenerator.pro \
 	    -spec $(QT_SPEC) CONFIG+=$(GCS_BUILD_CONF) CONFIG+=$(GCS_SILENT) ) && \
@@ -184,13 +186,13 @@ uavobjects:  $(addprefix uavobjects_, $(UAVOBJ_TARGETS))
 UAVOBJ_XML_DIR := $(ROOT_DIR)/shared/uavobjectdefinition
 UAVOBJ_OUT_DIR := $(BUILD_DIR)/uavobject-synthetics
 
-uavobjects_%:  uavobjgenerator
+uavobjects_%: $(UAVOBJGENERATOR)
 	@$(MKDIR) -p $(UAVOBJ_OUT_DIR)/$*
 	$(V1) ( cd $(UAVOBJ_OUT_DIR)/$* && \
 	    $(UAVOBJGENERATOR) -$* $(UAVOBJ_XML_DIR) $(ROOT_DIR) ; \
 	)
 
-uavobjects_test:  uavobjgenerator
+uavobjects_test: $(UAVOBJGENERATOR)
 	$(V1) $(UAVOBJGENERATOR) -v $(UAVOBJ_XML_DIR) $(ROOT_DIR)
 
 uavobjects_clean:
@@ -256,7 +258,7 @@ gcs_qmake $(GCS_MAKEFILE): | $(GCS_DIR)
 	    $(GCS_QMAKE_OPTS)
 
 .PHONY: gcs
-gcs: uavobjgenerator $(GCS_MAKEFILE)
+gcs: $(UAVOBJGENERATOR) $(GCS_MAKEFILE)
 	$(V1) $(MAKE) -w -C $(GCS_DIR)/$(MAKE_DIR);
 
 .PHONY: gcs_clean