commit 598800f56a8f09a833afd5a8607eaa7e5bd74e09
author Brian Silverman <brians> Thu May 09 17:08:42 2013 -0700
committer Brian Silverman <brians> Fri May 10 16:51:01 2013 -0700
tree 7e7b25894007fa30efedcd608ae693687559d838
parent c25bc8914936480709e373ddff0ad639c93c5a47

cleaned up LOTS of build-related stuff

There were a lot of things that were relying on transitive #include
and/or gyp dependencies that I fixed.
I also got rid of all references to libaos and a lot of references to
aos/aos_core.h and its build target.
This in preparation for removing libaos completely.

aos/atom_code/camera/HTTPStreamer.cpp

diff --git a/aos/atom_code/camera/HTTPStreamer.cpp b/aos/atom_code/camera/HTTPStreamer.cpp
index ad339a8..a5d42b1 100644
--- a/aos/atom_code/camera/HTTPStreamer.cpp
+++ b/aos/atom_code/camera/HTTPStreamer.cpp
@@ -16,8 +16,9 @@
 #include <vector>
 
 #include "aos/common/Configuration.h"
-#include "aos/aos_core.h"
+#include "aos/atom_code/init.h"
 #include "aos/atom_code/camera/Buffers.h"
+#include "aos/common/logging/logging.h"
 
 namespace aos {
 namespace camera {
@@ -385,4 +386,9 @@
 }  // namespace camera
 }  // namespace aos
 
-AOS_RUN_NRT(aos::camera::HTTPStreamer)
+int main() {
+  ::aos::InitNRT();
+  ::aos::camera::HTTPStreamer streamer;
+  streamer.Run();
+  ::aos::Cleanup();
+}

aos/atom_code/camera/Reader.cpp

diff --git a/aos/atom_code/camera/Reader.cpp b/aos/atom_code/camera/Reader.cpp
index 2c07332..b9dc36d 100644
--- a/aos/atom_code/camera/Reader.cpp
+++ b/aos/atom_code/camera/Reader.cpp
@@ -13,9 +13,10 @@
 #include <string>
 #include <inttypes.h>
 
-#include "aos/aos_core.h"
+#include "aos/atom_code/init.h"
 #include "aos/atom_code/camera/V4L2.h"
 #include "aos/atom_code/camera/Buffers.h"
+#include "aos/common/logging/logging.h"
 
 #define CLEAR(x) memset(&(x), 0, sizeof(x))
 
@@ -407,5 +408,9 @@
 } // namespace camera
 } // namespace aos
 
-AOS_RUN_NRT(aos::camera::Reader)
-
+int main() {
+  ::aos::InitNRT();
+  ::aos::camera::Reader reader;
+  reader.Run();
+  ::aos::Cleanup();
+}

aos/atom_code/camera/camera.gyp

diff --git a/aos/atom_code/camera/camera.gyp b/aos/atom_code/camera/camera.gyp
index b8e8dd3..270fb4f 100644
--- a/aos/atom_code/camera/camera.gyp
+++ b/aos/atom_code/camera/camera.gyp
@@ -7,7 +7,6 @@
         'jni.cpp',
       ],
       'dependencies': [
-        '<(AOS)/build/aos.gyp:aos_shared_lib',
         '<(AOS)/common/network/network.gyp:socket_so',
         '<(AOS)/common/common.gyp:timing_so',
         '<(AOS)/atom_code/messages/messages.gyp:messages_so',
@@ -15,7 +14,6 @@
         '<(EXTERNALS):libjpeg',
       ],
       'export_dependent_settings': [
-        '<(AOS)/build/aos.gyp:aos_shared_lib',
         '<(AOS)/common/network/network.gyp:socket_so',
         '<(AOS)/common/common.gyp:timing_so',
         '<(AOS)/atom_code/messages/messages.gyp:messages_so',
@@ -65,6 +63,7 @@
       'dependencies': [
         'buffers',
         '<(AOS)/atom_code/atom_code.gyp:init',
+        '<(AOS)/build/aos.gyp:logging',
       ],
     },
     {
@@ -76,6 +75,7 @@
       'dependencies': [
         'buffers',
         '<(AOS)/atom_code/atom_code.gyp:init',
+        '<(AOS)/build/aos.gyp:logging',
       ],
     },
   ],