From 8500c38c3ddf26263fd4dea3296ff3e36f5764da Mon Sep 17 00:00:00 2001
From: LibrePilot Packager <packaging@librepilot.org>
Date: Thu, 16 Jul 2015 21:32:56 +0100
Subject: [PATCH] LP-1: moved openpilotgcs.pri to gcs.pri

Change-Id: I8d3f0a6b7420cef2988cb04b526ca81fc66c5d7c
---
 ground/gcs/copydata.pro                               | 2 +-
 ground/gcs/{openpilotgcs.pri => gcs.pri}              | 0
 ground/gcs/gcs.pro                                    | 2 +-
 ground/gcs/src/app/app.pro                            | 2 +-
 ground/gcs/src/app/main.cpp                           | 2 +-
 ground/gcs/src/openpilotgcslibrary.pri                | 2 +-
 ground/gcs/src/openpilotgcsplugin.pri                 | 2 +-
 ground/gcs/src/plugins/hitl/aerosimrc/src/plugin.pro  | 2 +-
 ground/gcs/src/plugins/hitl/aerosimrc/src/udptest.pro | 2 +-
 ground/gcs/src/share/copydata.pro                     | 2 +-
 ground/gcs/src/share/translations/translations.pro    | 2 +-
 make/tools.mk                                         | 2 +-
 12 files changed, 11 insertions(+), 11 deletions(-)
 rename ground/gcs/{openpilotgcs.pri => gcs.pri} (100%)

diff --git a/ground/gcs/copydata.pro b/ground/gcs/copydata.pro
index eaf91ee08..c294049f9 100644
--- a/ground/gcs/copydata.pro
+++ b/ground/gcs/copydata.pro
@@ -1,4 +1,4 @@
-include(openpilotgcs.pri)
+include(gcs.pri)
 
 TEMPLATE = aux
 
diff --git a/ground/gcs/openpilotgcs.pri b/ground/gcs/gcs.pri
similarity index 100%
rename from ground/gcs/openpilotgcs.pri
rename to ground/gcs/gcs.pri
diff --git a/ground/gcs/gcs.pro b/ground/gcs/gcs.pro
index 4d14b9a4a..e2e29d52d 100644
--- a/ground/gcs/gcs.pro
+++ b/ground/gcs/gcs.pro
@@ -24,7 +24,7 @@ macx {
     QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
 }
 
-include(openpilotgcs.pri)
+include(gcs.pri)
 
 TEMPLATE  = subdirs
 CONFIG   += ordered
diff --git a/ground/gcs/src/app/app.pro b/ground/gcs/src/app/app.pro
index ec5368f36..8a072357f 100644
--- a/ground/gcs/src/app/app.pro
+++ b/ground/gcs/src/app/app.pro
@@ -1,4 +1,4 @@
-include(../../openpilotgcs.pri)
+include(../../gcs.pri)
 include(../shared/qtsingleapplication/qtsingleapplication.pri)
 
 TEMPLATE = app
diff --git a/ground/gcs/src/app/main.cpp b/ground/gcs/src/app/main.cpp
index efc03818c..5368f7eed 100644
--- a/ground/gcs/src/app/main.cpp
+++ b/ground/gcs/src/app/main.cpp
@@ -29,7 +29,7 @@
 
 /*
    The GCS application name is defined in the top level makefile - GCS_BIG_NAME / GCS_SMALL_NAME, and
-   set for the build in ../../openpilotgcs.pri and ./app.pro
+   set for the build in ../../gcs.pri and ./app.pro
 
    The GCS locale is set to the system locale by default unless the "hidden" setting General/Locale has a value.
    The user can not change General/Locale from the Options dialog.
diff --git a/ground/gcs/src/openpilotgcslibrary.pri b/ground/gcs/src/openpilotgcslibrary.pri
index 4c5bc8cfb..3959e9bcb 100644
--- a/ground/gcs/src/openpilotgcslibrary.pri
+++ b/ground/gcs/src/openpilotgcslibrary.pri
@@ -1,4 +1,4 @@
-include(../openpilotgcs.pri)
+include(../gcs.pri)
 
 win32 {
     DLLDESTDIR = $$GCS_APP_PATH
diff --git a/ground/gcs/src/openpilotgcsplugin.pri b/ground/gcs/src/openpilotgcsplugin.pri
index beed30374..6bcf39ade 100644
--- a/ground/gcs/src/openpilotgcsplugin.pri
+++ b/ground/gcs/src/openpilotgcsplugin.pri
@@ -1,4 +1,4 @@
-include(../openpilotgcs.pri)
+include(../gcs.pri)
 
 isEmpty(PROVIDER) {
     PROVIDER = OpenPilot
diff --git a/ground/gcs/src/plugins/hitl/aerosimrc/src/plugin.pro b/ground/gcs/src/plugins/hitl/aerosimrc/src/plugin.pro
index 5f4c57579..d9016bea8 100644
--- a/ground/gcs/src/plugins/hitl/aerosimrc/src/plugin.pro
+++ b/ground/gcs/src/plugins/hitl/aerosimrc/src/plugin.pro
@@ -2,7 +2,7 @@
     error("AeroSimRC plugin is only available for win32 platform")
 }
 
-include(../../../../../openpilotgcs.pri)
+include(../../../../../gcs.pri)
 
 QT += network
 QT -= gui
diff --git a/ground/gcs/src/plugins/hitl/aerosimrc/src/udptest.pro b/ground/gcs/src/plugins/hitl/aerosimrc/src/udptest.pro
index 2412e589d..6bb532455 100644
--- a/ground/gcs/src/plugins/hitl/aerosimrc/src/udptest.pro
+++ b/ground/gcs/src/plugins/hitl/aerosimrc/src/udptest.pro
@@ -1,4 +1,4 @@
-include(../../../../../openpilotgcs.pri)
+include(../../../../../gcs.pri)
 
 QT += core gui network widgets
 
diff --git a/ground/gcs/src/share/copydata.pro b/ground/gcs/src/share/copydata.pro
index 6915503ae..330f95732 100644
--- a/ground/gcs/src/share/copydata.pro
+++ b/ground/gcs/src/share/copydata.pro
@@ -1,4 +1,4 @@
-include(../../openpilotgcs.pri)
+include(../../gcs.pri)
 
 TEMPLATE = aux
 
diff --git a/ground/gcs/src/share/translations/translations.pro b/ground/gcs/src/share/translations/translations.pro
index f4c4b2778..de8de2ae7 100644
--- a/ground/gcs/src/share/translations/translations.pro
+++ b/ground/gcs/src/share/translations/translations.pro
@@ -1,4 +1,4 @@
-include(../../../openpilotgcs.pri)
+include(../../../gcs.pri)
 
 # Commented languages with outdated translations
 # Allow removing the 'C' language in default config files at first start.
diff --git a/make/tools.mk b/make/tools.mk
index cc4cf93fd..aded93fbe 100644
--- a/make/tools.mk
+++ b/make/tools.mk
@@ -119,7 +119,7 @@ else ifeq ($(UNAME), Windows)
     # When changing PYTHON_DIR, you must also update it in ground/gcs/src/python.pri
     PYTHON_DIR   := $(QT_SDK_DIR)/Tools/$(QT_SDK_ARCH)/opt/bin
     NSIS_DIR     := $(TOOLS_DIR)/nsis-2.46-unicode
-    # When changing SDL_DIR or OPENSSL_DIR, you must also update them in ground/gcs/openpilotgcs.pri
+    # When changing SDL_DIR or OPENSSL_DIR, you must also update them in ground/gcs/gcs.pri
     SDL_DIR      := $(TOOLS_DIR)/SDL-1.2.15
     OPENSSL_DIR  := $(TOOLS_DIR)/openssl-1.0.1e-win32
     MESAWIN_DIR  := $(TOOLS_DIR)/mesawin