Index: doc/models/Makefile |
=================================================================== |
--- a/doc/models/Makefile |
+++ b/doc/models/Makefile |
@@ -34,8 +34,10 @@ |
$(SRC)/csma/doc/csma.rst \ |
$(SRC)/dsdv/doc/dsdv.rst \ |
$(SRC)/dsr/doc/dsr.rst \ |
+ $(SRC)/emu/doc/emu.rst \ |
$(SRC)/mpi/doc/distributed.rst \ |
$(SRC)/energy/doc/energy.rst \ |
+ $(SRC)/epidemic/doc/epidemic.rst \ |
$(SRC)/fd-net-device/doc/fd-net-device.rst \ |
$(SRC)/tap-bridge/doc/tap.rst \ |
$(SRC)/mesh/doc/mesh.rst \ |
@@ -66,9 +68,19 @@ |
$(SRC)/uan/doc/uan.rst \ |
$(SRC)/topology-read/doc/topology.rst \ |
$(SRC)/spectrum/doc/spectrum.rst \ |
+ $(SRC)/stats/doc/adaptor.rst \ |
+ $(SRC)/stats/doc/aggregator.rst \ |
+ $(SRC)/stats/doc/collector.rst \ |
+ $(SRC)/stats/doc/data-collection-helpers.rst \ |
+ $(SRC)/stats/doc/data-collection-overview.rst \ |
+ $(SRC)/stats/doc/data-collection.rst \ |
+ $(SRC)/stats/doc/probe.rst \ |
+ $(SRC)/stats/doc/scope-and-limitations.rst \ |
$(SRC)/stats/doc/statistics.rst \ |
$(SRC)/netanim/doc/animation.rst \ |
$(SRC)/flow-monitor/doc/flow-monitor.rst \ |
+ $(SRC)/wave/doc/wave.rst \ |
+ $(SRC)/sixlowpan/doc/sixlowpan.rst \ |
# list all model library figure files that need to be copied to |
# $SOURCETEMP/figures. For each figure to be included in all |
@@ -106,12 +118,20 @@ |
$(SRC)/lte/doc/source/figures/lte-arch-ue-ctrl.dia \ |
$(SRC)/lte/doc/source/figures/lte-enb-phy.dia \ |
$(SRC)/lte/doc/source/figures/lte-ue-phy.dia \ |
+ $(SRC)/lte/doc/source/figures/lte-epc-x2-handover-seq-diagram.dia \ |
$(SRC)/lte/doc/source/figures/lte-epc-e2e-data-protocol-stack.dia \ |
$(SRC)/lte/doc/source/figures/lte-interference-test-scenario.dia \ |
$(SRC)/lte/doc/source/figures/lte-subframe-structure.dia \ |
$(SRC)/lte/doc/source/figures/lte-epc-x2-interface.dia \ |
$(SRC)/lte/doc/source/figures/lte-harq-architecture.dia \ |
$(SRC)/lte/doc/source/figures/lte-harq-processes-scheme.dia \ |
+ $(SRC)/lte/doc/source/figures/ue-meas-consumer.dia \ |
+ $(SRC)/lte/doc/source/figures/ue-meas-piecewise-motion.dia \ |
+ $(SRC)/lte/doc/source/figures/ue-meas-piecewise-a1.dia \ |
+ $(SRC)/lte/doc/source/figures/ue-meas-piecewise-a1-hys.dia \ |
+ $(SRC)/lte/doc/source/figures/lte-cell-selection-timeline.dia \ |
+ $(SRC)/lte/doc/source/figures/lte-cell-selection-scenario.dia \ |
+ $(SRC)/lte/doc/source/figures/lte-handover-target-scenario.dia \ |
$(SRC)/lte/doc/source/figures/lena-dual-stripe.eps \ |
$(SRC)/lte/doc/source/figures/lte-mcs-index.eps \ |
$(SRC)/lte/doc/source/figures/lenaThrTestCase1.eps \ |
@@ -128,8 +148,8 @@ |
$(SRC)/lte/doc/source/figures/lte-rlc-data-retx-dl.eps \ |
$(SRC)/lte/doc/source/figures/lte-rlc-data-txon-ul.eps \ |
$(SRC)/lte/doc/source/figures/lte-rlc-data-retx-ul.eps \ |
- $(SRC)/lte/doc/source/figures/lte-epc-x2-handover-seq-diagram.eps \ |
$(SRC)/lte/doc/source/figures/lte-epc-x2-entity-saps.eps \ |
+ $(SRC)/lte/doc/source/figures/lte-strongest-cell-handover-algorithm.eps \ |
$(SRC)/lte/doc/source/figures/lte-phy-interference.pdf \ |
$(SRC)/lte/doc/source/figures/lte-phy-interference.png \ |
$(SRC)/lte/doc/source/figures/helpers.pdf \ |
@@ -150,8 +170,6 @@ |
$(SRC)/lte/doc/source/figures/lte-enb-rrc-states.png \ |
$(SRC)/lte/doc/source/figures/lte-ue-rrc-states.pdf \ |
$(SRC)/lte/doc/source/figures/lte-ue-rrc-states.png \ |
- $(SRC)/lte/doc/source/figures/lte-handover-algorithm.pdf \ |
- $(SRC)/lte/doc/source/figures/lte-handover-algorithm.png \ |
$(SRC)/lte/doc/source/figures/fading_pedestrian.pdf \ |
$(SRC)/lte/doc/source/figures/fading_pedestrian.png \ |
$(SRC)/lte/doc/source/figures/fading_vehicular.pdf \ |
@@ -182,9 +200,20 @@ |
$(SRC)/lte/doc/source/figures/MCS_16_test.pdf \ |
$(SRC)/lte/doc/source/figures/miesm_scheme.pdf \ |
$(SRC)/lte/doc/source/figures/miesm_scheme.png \ |
+ $(SRC)/lte/doc/source/figures/lte-handover-campaign-rem.pdf \ |
+ $(SRC)/lte/doc/source/figures/lte-handover-campaign-rem.png \ |
+ $(SRC)/lte/doc/source/figures/lte-legacy-handover-algorithm.pdf \ |
+ $(SRC)/lte/doc/source/figures/lte-legacy-handover-algorithm.png \ |
$(SRC)/uan/doc/auvmobility-classes.dia \ |
$(SRC)/stats/doc/Stat-framework-arch.png \ |
$(SRC)/stats/doc/Wifi-default.png \ |
+ $(SRC)/stats/doc/dcf-overview.dia \ |
+ $(SRC)/stats/doc/dcf-overview-with-aggregation.dia \ |
+ $(SRC)/stats/doc/file-example.png \ |
+ $(SRC)/stats/doc/gnuplot-aggregator.png \ |
+ $(SRC)/stats/doc/gnuplot-example.png \ |
+ $(SRC)/stats/doc/gnuplot-helper-example.png \ |
+ $(SRC)/stats/doc/seventh-packet-byte-count.png \ |
$(SRC)/netanim/doc/figures/Dumbbell.png \ |
$(SRC)/netanim/doc/figures/Dumbbell.pdf \ |
$(SRC)/netanim/doc/figures/PacketStatistics.png \ |
@@ -207,6 +236,9 @@ |
$(SRC)/netanim/doc/figures/WithoutPrecision.pdf \ |
$(SRC)/netanim/doc/figures/WithPrecision.png \ |
$(SRC)/netanim/doc/figures/WithPrecision.pdf \ |
+ $(SRC)/spectrum/doc/spectrum-channel-phy-interface.png \ |
+ $(SRC)/spectrum/doc/spectrum-channel-phy-interface.pdf \ |
+ $(SRC)/spectrum/doc/spectrum-analyzer-example.eps |
# specify figures from which .png and .pdf figures need to be |
# generated (all dia and eps figures) |
@@ -225,6 +257,8 @@ |
$(FIGURES)/WifiArchitecture.eps \ |
$(FIGURES)/snir.eps \ |
$(FIGURES)/WimaxArchitecture.eps \ |
+ $(FIGURES)/dcf-overview.eps \ |
+ $(FIGURES)/dcf-overview-with-aggregation.eps \ |
$(FIGURES)/epc-ctrl-arch.eps \ |
$(FIGURES)/epc-data-flow-dl.eps \ |
$(FIGURES)/epc-data-flow-ul.eps \ |
@@ -246,6 +280,13 @@ |
$(FIGURES)/lte-epc-x2-interface.eps \ |
$(FIGURES)/lte-harq-architecture.eps \ |
$(FIGURES)/lte-harq-processes-scheme.eps \ |
+ $(FIGURES)/ue-meas-consumer.eps \ |
+ $(FIGURES)/ue-meas-piecewise-motion.eps \ |
+ $(FIGURES)/ue-meas-piecewise-a1.eps \ |
+ $(FIGURES)/ue-meas-piecewise-a1-hys.eps \ |
+ $(FIGURES)/lte-cell-selection-timeline.eps \ |
+ $(FIGURES)/lte-cell-selection-scenario.eps \ |
+ $(FIGURES)/lte-handover-target-scenario.eps \ |
$(FIGURES)/lena-dual-stripe.eps \ |
$(FIGURES)/lte-mcs-index.eps \ |
$(FIGURES)/lenaThrTestCase1.eps \ |
@@ -264,7 +305,9 @@ |
$(FIGURES)/lte-rlc-data-retx-ul.eps \ |
$(FIGURES)/lte-epc-x2-handover-seq-diagram.eps \ |
$(FIGURES)/lte-epc-x2-entity-saps.eps \ |
+ $(FIGURES)/lte-strongest-cell-handover-algorithm.eps \ |
$(FIGURES)/auvmobility-classes.eps \ |
+ $(FIGURES)/spectrum-analyzer-example.eps |
# rescale pdf figures as necessary |
$(FIGURES)/testbed.pdf_width = 5in |
@@ -299,10 +342,9 @@ |
$(FIGURES)/lte-subframe-structure.pdf_width = 2in |
$(FIGURES)/mac-random-access-contention.pdf_width = 10cm |
$(FIGURES)/mac-random-access-noncontention.pdf_width = 15cm |
-$(FIGURES)/lte-ue-rrc-states.pdf_width = 7cm |
-$(FIGURES)/lte-handover-algorithm.pdf_width = 10cm |
$(FIGURES)/helpers.pdf_width = 8cm |
$(FIGURES)/auvmobility-classes.pdf_width = 10cm |
+$(FIGURES)/spectrum-analyzer-example.pdf_width = 15cm |
IMAGES_PNG = ${IMAGES_EPS:.eps=.png} |
IMAGES_PDF = ${IMAGES_EPS:.eps=.pdf} |
@@ -353,11 +395,10 @@ |
@echo " doctest to run all doctests embedded in the documentation (if enabled)" |
copy-sources: $(SOURCES) |
- @rm -rf $(SOURCETEMP) |
@mkdir -p $(SOURCETEMP) |
@mkdir -p $(FIGURES) |
- @cp -r $(SOURCES) $(SOURCETEMP) |
- @cp -r $(SOURCEFIGS) $(FIGURES) |
+ @cp -r -p $(SOURCES) $(SOURCETEMP) |
+ @cp -r -p $(SOURCEFIGS) $(FIGURES) |
clean: |
-rm -rf $(BUILDDIR)/* |