moved targets to the right .gyp file
diff --git a/aos/common/common.gyp b/aos/common/common.gyp
index 702a21f..132c61f 100644
--- a/aos/common/common.gyp
+++ b/aos/common/common.gyp
@@ -155,47 +155,6 @@
],
},
{
- 'target_name': 'control_loop_queues',
- 'type': 'static_library',
- 'sources': [ '<(AOS)/common/controls/control_loops.q' ],
- 'variables': {
- 'header_path': 'aos/common/controls',
- },
- 'dependencies': [
- '<(AOS)/common/common.gyp:queues',
- ],
- 'includes': ['../build/queues.gypi'],
- },
- {
- 'target_name': 'controls',
- 'type': 'static_library',
- 'sources': [
- 'controls/control_loop.cc',
- ],
- 'dependencies': [
- '<(AOS)/common/messages/messages.gyp:robot_state',
- '<(AOS)/build/aos.gyp:logging',
- '<(AOS)/common/util/util.gyp:phased_loop',
- 'time',
- 'control_loop_queues',
- '<(AOS)/common/logging/logging.gyp:queue_logging',
- '<(AOS)/common/util/util.gyp:log_interval',
- '<(AOS)/common/controls/controls.gyp:sensor_generation',
- '<(AOS)/common/controls/controls.gyp:output_check',
- ],
- 'export_dependent_settings': [
- '<(AOS)/common/messages/messages.gyp:robot_state',
- '<(AOS)/build/aos.gyp:logging',
- '<(AOS)/common/util/util.gyp:phased_loop',
- 'time',
- 'control_loop_queues',
- '<(AOS)/common/logging/logging.gyp:queue_logging',
- '<(AOS)/common/util/util.gyp:log_interval',
- '<(AOS)/common/controls/controls.gyp:sensor_generation',
- '<(AOS)/common/controls/controls.gyp:output_check',
- ],
- },
- {
'target_name': 'queue_test',
'type': 'executable',
'sources': [
diff --git a/aos/common/controls/controls.gyp b/aos/common/controls/controls.gyp
index 1f5e76f..36daf56 100644
--- a/aos/common/controls/controls.gyp
+++ b/aos/common/controls/controls.gyp
@@ -37,5 +37,46 @@
},
'includes': ['../../../aos/build/queues.gypi'],
},
+ {
+ 'target_name': 'control_loop_queues',
+ 'type': 'static_library',
+ 'sources': [ '<(AOS)/common/controls/control_loops.q' ],
+ 'variables': {
+ 'header_path': 'aos/common/controls',
+ },
+ 'dependencies': [
+ '<(AOS)/common/common.gyp:queues',
+ ],
+ 'includes': ['../../../aos/build/queues.gypi'],
+ },
+ {
+ 'target_name': 'control_loop',
+ 'type': 'static_library',
+ 'sources': [
+ 'control_loop.cc',
+ ],
+ 'dependencies': [
+ '<(AOS)/common/messages/messages.gyp:robot_state',
+ '<(AOS)/build/aos.gyp:logging',
+ '<(AOS)/common/util/util.gyp:phased_loop',
+ '<(AOS)/common/common.gyp:time',
+ 'control_loop_queues',
+ '<(AOS)/common/logging/logging.gyp:queue_logging',
+ '<(AOS)/common/util/util.gyp:log_interval',
+ 'sensor_generation',
+ 'output_check',
+ ],
+ 'export_dependent_settings': [
+ '<(AOS)/common/messages/messages.gyp:robot_state',
+ '<(AOS)/build/aos.gyp:logging',
+ '<(AOS)/common/util/util.gyp:phased_loop',
+ '<(AOS)/common/common.gyp:time',
+ 'control_loop_queues',
+ '<(AOS)/common/logging/logging.gyp:queue_logging',
+ '<(AOS)/common/util/util.gyp:log_interval',
+ 'sensor_generation',
+ 'output_check',
+ ],
+ },
],
}