build: Upgrade build scripts
Change-Id: I363a686458d96a3cfe8d23f6d5fedfc668e0d8fd
diff --git a/src/tray-menu.cpp b/src/tray-menu.cpp
index 28b6d36..d4d2637 100644
--- a/src/tray-menu.cpp
+++ b/src/tray-menu.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2013-2017, Regents of the University of California.
+ * Copyright (c) 2013-2017, Regents of the University of California,
*
* This file is part of NFD Control Center. See AUTHORS.md for complete list of NFD
* authors and contributors.
@@ -17,13 +17,12 @@
* Control Center, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "config.hpp"
#include "tray-menu.hpp"
+#include "tray-menu.moc"
#include <ndn-cxx/face.hpp>
#include <ndn-cxx/interest.hpp>
-
#ifdef OSX_BUILD
#define CONNECT_ICON ":/res/icon-connected-black.png"
#define DISCONNECT_ICON ":/res/icon-disconnected-black.png"
@@ -35,10 +34,6 @@
#define DISCONNECT_ICON ":/res/icon-disconnected-white.png"
#endif // OSX_BUILD
-#ifdef WAF
-#include "tray-menu.moc"
-#endif
-
namespace ndn {
TrayMenu::TrayMenu(QQmlContext* context, Face& face)