Permalink
Browse files

Updated files

  • Loading branch information...
1 parent 1e3f35a commit d9b758e26768ac7a3c92145a65791ce9e5ecdc03 Marcio Nobrega committed Nov 14, 2012
View
18 .oppbuildspec
@@ -2,15 +2,15 @@
<dir makemake-options="--nolink -O out --meta:recurse --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/power" type="makemake"/>
<dir makemake-options="-o Mac80211 -O out -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples/Mac80211" type="makemake"/>
<dir makemake-options="-o ieee80211p -O out -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples/ieee80211p" type="makemake"/>
-<dir makemake-options="-o multiConnectionManager -O out -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples/multiConnectionManager" type="makemake"/>
<dir makemake-options="-o deviceTestAll -O out -u CMDENV -lpowerTestUtils -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/power/deviceTestAll" type="makemake"/>
-<dir makemake-options="--deep -o annotations -O out --meta:recurse --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples/annotations" type="makemake"/>
+<dir makemake-options="-o multiConnectionManager -O out -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples/multiConnectionManager" type="makemake"/>
<dir makemake-options="-o channelInfo -O out -u CMDENV -lmiximbase -lmiximmodules -lmiximtestUtils --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/channelInfo" type="makemake"/>
+<dir makemake-options="--deep -o annotations -O out --meta:recurse --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples/annotations" type="makemake"/>
<dir makemake-options="-o CSMAMac -O out -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples/CSMAMac" type="makemake"/>
<dir makemake-options="-o decider -O out -u CMDENV -lmiximbase -lmiximmodules -lmiximtestUtils --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/decider" type="makemake"/>
-<dir makemake-options="-o coord -O out -u CMDENV -lmiximbase -lmiximmodules -lmiximtestUtils --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/coord" type="makemake"/>
-<dir makemake-options="-o bmac -O out -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples/bmac" type="makemake"/>
<dir makemake-options="-o blackboard -O out -u CMDENV -lmiximbase -lmiximmodules -lmiximtestUtils --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/blackboard" type="makemake"/>
+<dir makemake-options="-o bmac -O out -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples/bmac" type="makemake"/>
+<dir makemake-options="-o coord -O out -u CMDENV -lmiximbase -lmiximmodules -lmiximtestUtils --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/coord" type="makemake"/>
<dir makemake-options="-o basePhyLayer -O out -u CMDENV -lmiximbase -lmiximmodules -lmiximtestUtils --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/basePhyLayer" type="makemake"/>
<dir makemake-options="--make-so -o powerTestUtils -O out -lmiximbase -lmiximmodules --meta:auto-include-path --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/power/utils" type="makemake"/>
<dir makemake-options="-o radioState -O out -u CMDENV -lmiximbase -lmiximmodules -lmiximtestUtils --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/radioState" type="makemake"/>
@@ -22,23 +22,23 @@
<dir makemake-options="-o deviceTestMulti -O out -lpowerTestUtils -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/power/deviceTestMulti" type="makemake"/>
<dir makemake-options="-o veins -O out -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples/veins" type="makemake"/>
<dir makemake-options="-o ieee802154a -O out -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples/ieee802154a" type="makemake"/>
+<dir makemake-options="-o traci_launchd -O out -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples/traci_launchd" type="makemake"/>
<dir makemake-options="-o Nic80211Test -O out -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/power/Nic80211Test" type="makemake"/>
<dir makemake-options="--make-so -o miximtestUtils -O out --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/testUtils" type="makemake"/>
-<dir makemake-options="-o traci_launchd -O out -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples/traci_launchd" type="makemake"/>
<dir makemake-options="-o baseNetwork -O out -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples/baseNetwork" type="makemake"/>
<dir makemake-options="--nolink -O out --meta:recurse --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="." type="makemake"/>
<dir makemake-options="-o WSNRouting -O out -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples/WSNRouting" type="makemake"/>
-<dir makemake-options="--deep --make-so -o miximbase -O out --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="src/base" type="makemake"/>
<dir makemake-options="-o ieee802154Narrow -O out -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples/ieee802154Narrow" type="makemake"/>
+<dir makemake-options="--deep --make-so -o miximbase -O out --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="src/base" type="makemake"/>
<dir makemake-options="--deep --make-so -o miximmodules -O out -lmiximbase --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="src/modules" type="makemake"/>
<dir makemake-options="--nolink -O out --meta:recurse --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples" type="makemake"/>
<dir makemake-options="--deep -o EMoS -O out --meta:recurse --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples/EMoS" type="makemake"/>
-<dir makemake-options="-o traci -O out -u CMDENV -lmiximbase -lmiximmodules -lmiximtestUtils --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/traci" type="makemake"/>
<dir makemake-options="-o twoRayInterference -O out -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples/twoRayInterference" type="makemake"/>
+<dir makemake-options="-o traci -O out -u CMDENV -lmiximbase -lmiximmodules -lmiximtestUtils --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/traci" type="makemake"/>
<dir makemake-options="--nolink -O out --meta:recurse --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests" type="makemake"/>
-<dir makemake-options="-o baseMobility -O out -u CMDENV -lmiximbase -lmiximmodules -lmiximtestUtils --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/baseMobility" type="makemake"/>
<dir makemake-options="-o nicTest -O out -u CMDENV -lmiximbase -lmiximmodules -lmiximtestUtils --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/nicTest" type="makemake"/>
+<dir makemake-options="-o baseMobility -O out -u CMDENV -lmiximbase -lmiximmodules -lmiximtestUtils --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/baseMobility" type="makemake"/>
<dir makemake-options="-o mapping -O out -u CMDENV -lmiximbase -lmiximmodules -lmiximtestUtils --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/mapping" type="makemake"/>
-<dir makemake-options="-o deviceTestAccts -O out -u CMDENV -lpowerTestUtils -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/power/deviceTestAccts" type="makemake"/>
<dir makemake-options="-o analogueModels -O out -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples/analogueModels" type="makemake"/>
+<dir makemake-options="-o deviceTestAccts -O out -u CMDENV -lpowerTestUtils -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/power/deviceTestAccts" type="makemake"/>
</buildspec>
View
2 examples/analogueModels/Makefile
@@ -43,7 +43,7 @@ PROJECTRELATIVE_PATH = examples/analogueModels
O = $(PROJECT_OUTPUT_DIR)/$(CONFIGNAME)/$(PROJECTRELATIVE_PATH)
# Object files for local .cc and .msg files
-OBJS = $O/SamplePhyLayer.o $O/RandomFreqTimeModel.o $O/SimpleMacLayer.o $O/RandomFrequencyOnlyModel.o
+OBJS = $O/RandomFrequencyOnlyModel.o $O/SamplePhyLayer.o $O/RandomFreqTimeModel.o $O/SimpleMacLayer.o
# Message files
MSGFILES =
View
48 src/base/Makefile
@@ -34,56 +34,56 @@ O = $(PROJECT_OUTPUT_DIR)/$(CONFIGNAME)/$(PROJECTRELATIVE_PATH)
# Object files for local .cc and .msg files
OBJS = \
+ $O/connectionManager/NicEntryDirect.o \
$O/connectionManager/ChannelAccess.o \
$O/connectionManager/NicEntryDebug.o \
- $O/connectionManager/ConnectionManager.o \
$O/connectionManager/BaseConnectionManager.o \
- $O/connectionManager/NicEntryDirect.o \
+ $O/connectionManager/ConnectionManager.o \
+ $O/modules/BaseNetwLayer.o \
+ $O/modules/TestApplLayer.o \
$O/modules/BaseArp.o \
+ $O/modules/BaseBattery.o \
$O/modules/BaseWorldUtility.o \
$O/modules/BaseApplLayer.o \
- $O/modules/TestApplLayer.o \
+ $O/modules/BatteryAccess.o \
+ $O/modules/BaseMobility.o \
+ $O/modules/BaseMacLayer.o \
$O/modules/BaseLayer.o \
$O/modules/BaseModule.o \
- $O/modules/BaseMacLayer.o \
- $O/modules/BaseBattery.o \
- $O/modules/BaseMobility.o \
- $O/modules/BaseNetwLayer.o \
- $O/modules/BatteryAccess.o \
- $O/phyLayer/MappingBase.o \
+ $O/phyLayer/BaseDecider.o \
+ $O/phyLayer/ChannelInfo.o \
$O/phyLayer/ChannelState.o \
$O/phyLayer/Signal.o \
- $O/phyLayer/ChannelInfo.o \
$O/phyLayer/BasePhyLayer.o \
+ $O/phyLayer/MappingBase.o \
+ $O/phyLayer/Decider.o \
$O/phyLayer/PhyUtils.o \
- $O/phyLayer/BaseDecider.o \
$O/phyLayer/MappingUtils.o \
- $O/phyLayer/Decider.o \
- $O/timers/FrameTimer.o \
- $O/timers/RepeatTimer.o \
- $O/timers/Timer.o \
- $O/timers/FrameTimerGenerator.o \
+ $O/timers/GlobalTime.o \
$O/timers/TimerCore.o \
$O/timers/RepeatTimerCore.o \
- $O/timers/GlobalTime.o \
+ $O/timers/FrameTimerGenerator.o \
+ $O/timers/FrameTimer.o \
+ $O/timers/Timer.o \
+ $O/timers/RepeatTimer.o \
$O/utils/winsupport.o \
$O/utils/NetwToMacControlInfo.o \
- $O/utils/SimpleAddress.o \
$O/utils/Coord.o \
- $O/messages/AirFrame_m.o \
- $O/messages/MacPkt_m.o \
+ $O/utils/SimpleAddress.o \
$O/messages/ChannelSenseRequest_m.o \
- $O/messages/NetwPkt_m.o \
$O/messages/ApplPkt_m.o \
+ $O/messages/NetwPkt_m.o \
+ $O/messages/MacPkt_m.o \
+ $O/messages/AirFrame_m.o \
$O/messages/BorderMsg_m.o
# Message files
MSGFILES = \
- messages/AirFrame.msg \
- messages/MacPkt.msg \
messages/ChannelSenseRequest.msg \
- messages/NetwPkt.msg \
messages/ApplPkt.msg \
+ messages/NetwPkt.msg \
+ messages/MacPkt.msg \
+ messages/AirFrame.msg \
messages/BorderMsg.msg
#------------------------------------------------------------------------------
View
112 src/modules/Makefile
@@ -58,119 +58,119 @@ O = $(PROJECT_OUTPUT_DIR)/$(CONFIGNAME)/$(PROJECTRELATIVE_PATH)
# Object files for local .cc and .msg files
OBJS = \
- $O/analogueModel/PERModel.o \
$O/analogueModel/LogNormalShadowing.o \
$O/analogueModel/TwoRayInterferenceModel.o \
- $O/analogueModel/SimplePathlossModel.o \
$O/analogueModel/UWBIRStochasticPathlossModel.o \
$O/analogueModel/UWBIRIEEE802154APathlossModel.o \
- $O/analogueModel/SimpleObstacleShadowing.o \
+ $O/analogueModel/PERModel.o \
$O/analogueModel/JakesFading.o \
+ $O/analogueModel/SimplePathlossModel.o \
$O/analogueModel/BreakpointPathlossModel.o \
+ $O/analogueModel/SimpleObstacleShadowing.o \
$O/application/SensorApplLayer.o \
$O/application/BurstApplLayer.o \
$O/application/TestApplication.o \
$O/application/TrafficGen.o \
$O/application/BurstApplLayerBattery.o \
+ $O/application/EMoS/BaseStationAppLayerEMoS.o \
$O/application/EMoS/MobileNodeAppLayerEMoS.o \
$O/application/EMoS/StaticNodeAppLayerEMoS.o \
- $O/application/EMoS/BaseStationAppLayerEMoS.o \
$O/application/ieee80211p/BaseWaveApplLayer.o \
$O/application/ieee80211p/TestWaveApplLayer.o \
- $O/application/traci/TraCIDemo11p.o \
$O/application/traci/TraCIDemo.o \
+ $O/application/traci/TraCIDemo11p.o \
$O/connectionManager/UnitDisk.o \
- $O/mac/CSMAMacLayer.o \
- $O/mac/BMacLayer.o \
- $O/mac/Mac80211MultiChannel.o \
- $O/mac/LMacLayer.o \
- $O/mac/Mac80211.o \
+ $O/mac/CSMA802154.o \
$O/mac/UWBIRMac.o \
+ $O/mac/Mac80211MultiChannel.o \
$O/mac/csma.o \
$O/mac/AlohaMacLayer.o \
- $O/mac/CSMA802154.o \
+ $O/mac/CSMAMacLayer.o \
+ $O/mac/LMacLayer.o \
+ $O/mac/Mac80211.o \
+ $O/mac/BMacLayer.o \
$O/mac/ieee80211p/Mac1609_4.o \
- $O/messages/UWBIRMacPkt.o \
$O/messages/AggrPkt.o \
- $O/mobility/BonnMotionFileCache.o \
- $O/mobility/PostureTransition.o \
- $O/mobility/ANSimMobility.o \
- $O/mobility/MassMobility.o \
- $O/mobility/ConstSpeedMobility.o \
- $O/mobility/Posture.o \
- $O/mobility/CircleMobility.o \
- $O/mobility/TractorMobility.o \
- $O/mobility/TurtleMobility.o \
- $O/mobility/LinearMobility.o \
- $O/mobility/MoBANCoordinator.o \
+ $O/messages/UWBIRMacPkt.o \
$O/mobility/LineSegmentsMobilityBase.o \
- $O/mobility/BonnMotionMobility.o \
$O/mobility/RectangleMobility.o \
+ $O/mobility/BonnMotionMobility.o \
+ $O/mobility/LinearMobility.o \
+ $O/mobility/CircleMobility.o \
+ $O/mobility/TurtleMobility.o \
+ $O/mobility/ANSimMobility.o \
$O/mobility/MoBANLocal.o \
+ $O/mobility/BonnMotionFileCache.o \
+ $O/mobility/Posture.o \
+ $O/mobility/MassMobility.o \
+ $O/mobility/MoBANCoordinator.o \
+ $O/mobility/TractorMobility.o \
+ $O/mobility/ConstSpeedMobility.o \
+ $O/mobility/PostureTransition.o \
$O/mobility/traci/TraCIScenarioManagerLaunchd.o \
- $O/mobility/traci/TraCIScenarioManager.o \
$O/mobility/traci/TraCIMobility.o \
- $O/netw/ProbabilisticBroadcast.o \
- $O/netw/Flood.o \
- $O/netw/ArpHost.o \
- $O/netw/DummyRoute.o \
+ $O/mobility/traci/TraCIScenarioManager.o \
$O/netw/WiseRoute.o \
+ $O/netw/ArpHost.o \
$O/netw/AdaptiveProbabilisticBroadcast.o \
+ $O/netw/Flood.o \
+ $O/netw/ProbabilisticBroadcast.o \
+ $O/netw/DummyRoute.o \
$O/netw/EMoS/AODVRoute.o \
$O/obstacle/ObstacleControl.o \
$O/obstacle/Obstacle.o \
- $O/phy/PhyLayerBattery.o \
- $O/phy/DeciderUWBIREDSyncOnAddress.o \
- $O/phy/PhyLayer80211p.o \
- $O/phy/PhyLayerUWBIR.o \
- $O/phy/SNRThresholdDecider.o \
- $O/phy/PhyLayer.o \
- $O/phy/DeciderUWBIRED.o \
- $O/phy/Decider80211p.o \
- $O/phy/Decider80211.o \
$O/phy/DeciderUWBIREDSync.o \
$O/phy/Decider802154Narrow.o \
$O/phy/Decider80211MultiChannel.o \
$O/phy/Decider80211Battery.o \
+ $O/phy/SNRThresholdDecider.o \
+ $O/phy/Decider80211p.o \
+ $O/phy/DeciderUWBIRED.o \
+ $O/phy/Decider80211.o \
+ $O/phy/PhyLayerUWBIR.o \
+ $O/phy/PhyLayer.o \
+ $O/phy/PhyLayer80211p.o \
+ $O/phy/DeciderUWBIREDSyncOnAddress.o \
+ $O/phy/PhyLayerBattery.o \
$O/power/battery/BatteryStats.o \
$O/power/battery/SimpleBattery.o \
$O/transport/Aggregation.o \
- $O/utility/phyPER.o \
$O/utility/SimTracer.o \
$O/utility/IEEE802154A.o \
- $O/world/annotations/AnnotationManager.o \
+ $O/utility/phyPER.o \
$O/world/annotations/AnnotationDummy.o \
- $O/messages/WaveShortMessage_m.o \
+ $O/world/annotations/AnnotationManager.o \
$O/messages/WiseRoutePkt_m.o \
- $O/messages/AggrPkt_m.o \
- $O/messages/LMacPkt_m.o \
- $O/messages/DummyRoutePkt_m.o \
$O/messages/Mac80211Pkt_m.o \
+ $O/messages/ProbabilisticBroadcastPkt_m.o \
$O/messages/AirFrameUWBIR_m.o \
$O/messages/UWBIRMacPkt_m.o \
- $O/messages/ProbabilisticBroadcastPkt_m.o \
- $O/messages/EMoS/AODVRouteResponse_m.o \
+ $O/messages/LMacPkt_m.o \
+ $O/messages/DummyRoutePkt_m.o \
+ $O/messages/AggrPkt_m.o \
+ $O/messages/WaveShortMessage_m.o \
$O/messages/EMoS/AODVData_m.o \
+ $O/messages/EMoS/AODVRouteError_m.o \
$O/messages/EMoS/AODVRouteRequest_m.o \
- $O/messages/EMoS/EMoSApplPkt_m.o \
- $O/messages/EMoS/AODVRouteError_m.o
+ $O/messages/EMoS/AODVRouteResponse_m.o \
+ $O/messages/EMoS/EMoSApplPkt_m.o
# Message files
MSGFILES = \
- messages/WaveShortMessage.msg \
messages/WiseRoutePkt.msg \
- messages/AggrPkt.msg \
- messages/LMacPkt.msg \
- messages/DummyRoutePkt.msg \
messages/Mac80211Pkt.msg \
+ messages/ProbabilisticBroadcastPkt.msg \
messages/AirFrameUWBIR.msg \
messages/UWBIRMacPkt.msg \
- messages/ProbabilisticBroadcastPkt.msg \
- messages/EMoS/AODVRouteResponse.msg \
+ messages/LMacPkt.msg \
+ messages/DummyRoutePkt.msg \
+ messages/AggrPkt.msg \
+ messages/WaveShortMessage.msg \
messages/EMoS/AODVData.msg \
+ messages/EMoS/AODVRouteError.msg \
messages/EMoS/AODVRouteRequest.msg \
- messages/EMoS/EMoSApplPkt.msg \
- messages/EMoS/AODVRouteError.msg
+ messages/EMoS/AODVRouteResponse.msg \
+ messages/EMoS/EMoSApplPkt.msg
#------------------------------------------------------------------------------
View
34 tests/Makefile
@@ -2,7 +2,7 @@
# OMNeT++/OMNEST Makefile for mixim
#
# This file was generated with the command:
-# opp_makemake -f --nolink -O out -d power -d channelInfo -d decider -d blackboard -d coord -d basePhyLayer -d radioState -d connectionManager -d testUtils -d traci -d nicTest -d baseMobility -d mapping -I/usr/include/libxml2 -L../out/$(CONFIGNAME)/tests/power/utils -L../out/$(CONFIGNAME)/tests/testUtils -L../out/$(CONFIGNAME)/src/base -L../out/$(CONFIGNAME)/src/modules
+# opp_makemake -f --nolink -O out -d power -d channelInfo -d decider -d coord -d blackboard -d basePhyLayer -d radioState -d connectionManager -d testUtils -d traci -d baseMobility -d nicTest -d mapping -I/usr/include/libxml2 -L../out/$(CONFIGNAME)/tests/power/utils -L../out/$(CONFIGNAME)/tests/testUtils -L../out/$(CONFIGNAME)/src/base -L../out/$(CONFIGNAME)/src/modules
#
# C++ include paths (with -I)
@@ -75,21 +75,21 @@ baseMobility_dir basePhyLayer_dir blackboard_dir channelInfo_dir connectionManag
all: $(OBJS) submakedirs Makefile
@# Do nothing
-submakedirs: power_dir channelInfo_dir decider_dir blackboard_dir coord_dir basePhyLayer_dir radioState_dir connectionManager_dir testUtils_dir traci_dir nicTest_dir baseMobility_dir mapping_dir
+submakedirs: power_dir channelInfo_dir decider_dir coord_dir blackboard_dir basePhyLayer_dir radioState_dir connectionManager_dir testUtils_dir traci_dir baseMobility_dir nicTest_dir mapping_dir
-.PHONY: all clean cleanall depend msgheaders power channelInfo decider blackboard coord basePhyLayer radioState connectionManager testUtils traci nicTest baseMobility mapping
+.PHONY: all clean cleanall depend msgheaders power channelInfo decider coord blackboard basePhyLayer radioState connectionManager testUtils traci baseMobility nicTest mapping
power: power_dir
channelInfo: channelInfo_dir
decider: decider_dir
-blackboard: blackboard_dir
coord: coord_dir
+blackboard: blackboard_dir
basePhyLayer: basePhyLayer_dir
radioState: radioState_dir
connectionManager: connectionManager_dir
testUtils: testUtils_dir
traci: traci_dir
-nicTest: nicTest_dir
baseMobility: baseMobility_dir
+nicTest: nicTest_dir
mapping: mapping_dir
power_dir:
@@ -101,12 +101,12 @@ channelInfo_dir:
decider_dir:
cd decider && $(MAKE) all
-blackboard_dir:
- cd blackboard && $(MAKE) all
-
coord_dir:
cd coord && $(MAKE) all
+blackboard_dir:
+ cd blackboard && $(MAKE) all
+
basePhyLayer_dir:
cd basePhyLayer && $(MAKE) all
@@ -122,12 +122,12 @@ testUtils_dir:
traci_dir:
cd traci && $(MAKE) all
-nicTest_dir:
- cd nicTest && $(MAKE) all
-
baseMobility_dir:
cd baseMobility && $(MAKE) all
+nicTest_dir:
+ cd nicTest && $(MAKE) all
+
mapping_dir:
cd mapping && $(MAKE) all
@@ -144,15 +144,15 @@ msgheaders: $(MSGFILES:.msg=_m.h)
cd power && $(MAKE) msgheaders
cd channelInfo && $(MAKE) msgheaders
cd decider && $(MAKE) msgheaders
- cd blackboard && $(MAKE) msgheaders
cd coord && $(MAKE) msgheaders
+ cd blackboard && $(MAKE) msgheaders
cd basePhyLayer && $(MAKE) msgheaders
cd radioState && $(MAKE) msgheaders
cd connectionManager && $(MAKE) msgheaders
cd testUtils && $(MAKE) msgheaders
cd traci && $(MAKE) msgheaders
- cd nicTest && $(MAKE) msgheaders
cd baseMobility && $(MAKE) msgheaders
+ cd nicTest && $(MAKE) msgheaders
cd mapping && $(MAKE) msgheaders
clean:
@@ -163,15 +163,15 @@ clean:
-cd power && $(MAKE) clean
-cd channelInfo && $(MAKE) clean
-cd decider && $(MAKE) clean
- -cd blackboard && $(MAKE) clean
-cd coord && $(MAKE) clean
+ -cd blackboard && $(MAKE) clean
-cd basePhyLayer && $(MAKE) clean
-cd radioState && $(MAKE) clean
-cd connectionManager && $(MAKE) clean
-cd testUtils && $(MAKE) clean
-cd traci && $(MAKE) clean
- -cd nicTest && $(MAKE) clean
-cd baseMobility && $(MAKE) clean
+ -cd nicTest && $(MAKE) clean
-cd mapping && $(MAKE) clean
cleanall: clean
@@ -182,15 +182,15 @@ depend:
-cd power && if [ -f Makefile ]; then $(MAKE) depend; fi
-cd channelInfo && if [ -f Makefile ]; then $(MAKE) depend; fi
-cd decider && if [ -f Makefile ]; then $(MAKE) depend; fi
- -cd blackboard && if [ -f Makefile ]; then $(MAKE) depend; fi
-cd coord && if [ -f Makefile ]; then $(MAKE) depend; fi
+ -cd blackboard && if [ -f Makefile ]; then $(MAKE) depend; fi
-cd basePhyLayer && if [ -f Makefile ]; then $(MAKE) depend; fi
-cd radioState && if [ -f Makefile ]; then $(MAKE) depend; fi
-cd connectionManager && if [ -f Makefile ]; then $(MAKE) depend; fi
-cd testUtils && if [ -f Makefile ]; then $(MAKE) depend; fi
-cd traci && if [ -f Makefile ]; then $(MAKE) depend; fi
- -cd nicTest && if [ -f Makefile ]; then $(MAKE) depend; fi
-cd baseMobility && if [ -f Makefile ]; then $(MAKE) depend; fi
+ -cd nicTest && if [ -f Makefile ]; then $(MAKE) depend; fi
-cd mapping && if [ -f Makefile ]; then $(MAKE) depend; fi
# DO NOT DELETE THIS LINE -- make depend depends on it.
View
2 tests/blackboard/Makefile
@@ -36,7 +36,7 @@ PROJECTRELATIVE_PATH = tests/blackboard
O = $(PROJECT_OUTPUT_DIR)/$(CONFIGNAME)/$(PROJECTRELATIVE_PATH)
# Object files for local .cc and .msg files
-OBJS = $O/TestStateSub.o $O/StateView.o $O/StateChanger.o $O/StateVisualize.o
+OBJS = $O/TestStateSub.o $O/StateView.o $O/StateVisualize.o $O/StateChanger.o
# Message files
MSGFILES =
View
6 tests/connectionManager/Makefile
@@ -39,11 +39,11 @@ O = $(PROJECT_OUTPUT_DIR)/$(CONFIGNAME)/$(PROJECTRELATIVE_PATH)
# Object files for local .cc and .msg files
OBJS = \
$O/ConnectedBCNodePhyLayer.o \
+ $O/CMPhyLayer.o \
$O/TestCM.o \
- $O/NotConnectedBCNodePhyLayer.o \
+ $O/ConnectedRNodePhyLayer.o \
$O/NotConnectedRNodePhyLayer.o \
- $O/CMPhyLayer.o \
- $O/ConnectedRNodePhyLayer.o
+ $O/NotConnectedBCNodePhyLayer.o
# Message files
MSGFILES =
View
2 tests/testUtils/Makefile
@@ -24,7 +24,7 @@ PROJECTRELATIVE_PATH = tests/testUtils
O = $(PROJECT_OUTPUT_DIR)/$(CONFIGNAME)/$(PROJECTRELATIVE_PATH)
# Object files for local .cc and .msg files
-OBJS = $O/Testmanager.o $O/OmnetTestBase.o $O/TestModule.o $O/asserts.o
+OBJS = $O/asserts.o $O/OmnetTestBase.o $O/TestModule.o $O/Testmanager.o
# Message files
MSGFILES =

0 comments on commit d9b758e

Please sign in to comment.