OP-1853 Ground build tidy: removed now unneeded uavobject-synthetics.pro

ground/ground.pro

@@ -19,13 +19,6 @@
 #       Release builds may fail because it seems that qt-creator does not
 #       define QTMINGW variable used to copy MinGW DLLs in release builds.
 #
-# There is a minor problem with dependencies. qmake needs synthetic
-# files when it generates GCS Makefiles. But we do not have
-# uavobjgenerator built yet. So we use the following trick: at make
-# stage in uavobject-synthetics we rerun qmake for openpilotgcs.pro
-# and regenerate GCS Makefiles using just built synthetic files.
-# It takes some extra time but solves the dependency problem.
-#
 # Please note that this meta-project is only intended to be used by
 # qt-creator users. Top level Makefile handles all dependencies itself
 # and does not use ground.pro.
@@ -38,16 +31,11 @@ TEMPLATE  = subdirs
 
 SUBDIRS = \
         sub_openpilotgcs \
-        sub_uavobject-synthetics \
         sub_uavobjgenerator
 
 # uavobjgenerator
 sub_uavobjgenerator.subdir = uavobjgenerator
 
-# uavobject-synthetics
-sub_uavobject-synthetics.subdir = uavobject-synthetics
-sub_uavobject-synthetics.depends = sub_uavobjgenerator
-
 # openpilotgcs
 sub_openpilotgcs.subdir  = openpilotgcs
-sub_openpilotgcs.depends = sub_uavobject-synthetics
+sub_openpilotgcs.depends = sub_uavobjgenerator

ground/uavobject-synthetics/uavobject-synthetics.pro

@@ -1,64 +0,0 @@
-#
-# Qmake project for UAVObjects generation.
-# Copyright (c) 2009-2013, The OpenPilot Team, http://www.openpilot.org
-#
-
-TEMPLATE = aux
-
-defineReplace(addNewline) {
-    return($$escape_expand(\\n\\t))
-}
-
-# QMAKESPEC should be defined by qmake but sometimes it is not
-isEmpty(QMAKESPEC) {
-    win32:SPEC = win32-g++
-    macx-g++:SPEC = macx-g++
-    linux-g++:SPEC = linux-g++
-    linux-g++-32:SPEC = linux-g++
-    linux-g++-64:SPEC = linux-g++-64
-} else {
-    SPEC = $$QMAKESPEC
-}
-
-# Some platform-dependent options
-win32|unix {
-    CONFIG(release, debug|release) {
-        BUILD_CONFIG = release
-    } else {
-        BUILD_CONFIG = debug
-    }
-}
-
-win32 {
-    # Windows sometimes remembers working directory changed from Makefile, sometimes not.
-    # That's why pushd/popd is used here - to make sure that we know current directory.
-
-    uavobjects.commands += -$(MKDIR) ../uavobject-synthetics $$addNewline()
-    uavobjects.commands += pushd ../uavobject-synthetics &&
-    uavobjects.commands += ../uavobjgenerator/$${BUILD_CONFIG}/uavobjgenerator
-    uavobjects.commands += ../../shared/uavobjectdefinition
-    uavobjects.commands += ../.. &&
-    uavobjects.commands += popd $$addNewline()
-
-    uavobjects.commands += -$(MKDIR) ../openpilotgcs $$addNewline()
-    uavobjects.commands += pushd ../openpilotgcs &&
-    uavobjects.commands += $(QMAKE) -spec $$SPEC CONFIG+=$${BUILD_CONFIG} -r
-    uavobjects.commands += ../../ground/openpilotgcs/openpilotgcs.pro &&
-    uavobjects.commands += popd $$addNewline()
-}
-
-!win32 {
-    uavobjects.commands += $(MKDIR) -p ../uavobject-synthetics $$addNewline()
-    uavobjects.commands += cd ../uavobject-synthetics &&
-    uavobjects.commands += ../uavobjgenerator/uavobjgenerator
-    uavobjects.commands +=   ../../shared/uavobjectdefinition ../.. &&
-
-    uavobjects.commands += $(MKDIR) -p ../openpilotgcs $$addNewline()
-    uavobjects.commands += cd ../openpilotgcs &&
-    uavobjects.commands += $(QMAKE) ../../ground/openpilotgcs/openpilotgcs.pro
-    uavobjects.commands +=   -spec $$SPEC CONFIG+=$${BUILD_CONFIG} -r $$addNewline()
-}
-
-uavobjects.depends = FORCE
-QMAKE_EXTRA_TARGETS += uavobjects
-PRE_TARGETDEPS += uavobjects