build: Upgrade build scripts

Change-Id: I363a686458d96a3cfe8d23f6d5fedfc668e0d8fd
diff --git a/src/key-tree-model.cpp b/src/key-tree-model.cpp
index 56c4ec1..44bf362 100644
--- a/src/key-tree-model.cpp
+++ b/src/key-tree-model.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2013-2014, 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.
@@ -18,6 +18,7 @@
  */
 
 #include "key-tree-model.hpp"
+#include "key-tree-model.moc"
 #include "key-tree-item.hpp"
 
 #include <QStringList>
@@ -25,11 +26,6 @@
 #include <QBrush>
 #include <iostream>
 
-
-#ifdef WAF
-#include "key-tree-model.moc"
-#endif
-
 namespace ndn {
 namespace ncc {
 
@@ -234,5 +230,5 @@
   // }
 // }
 
-} // namespace ndn
 } // namespace ncc
+} // namespace ndn