Commit 62e9c8a2 authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Checkpoint event/delay-agent move.

parent 1cf61fa8
...@@ -4836,6 +4836,7 @@ outfiles="Makeconf GNUmakefile \ ...@@ -4836,6 +4836,7 @@ outfiles="Makeconf GNUmakefile \
event/linktest/weblinktest event/linktest/linktest.proxy \ event/linktest/weblinktest event/linktest/linktest.proxy \
event/linktest/linktest_control \ event/linktest/linktest_control \
event/linktest/run_linktest.pl \ event/linktest/run_linktest.pl \
event/delay-agent/GNUmakefile \
tools/GNUmakefile \ tools/GNUmakefile \
tools/pcapper/GNUmakefile \ tools/pcapper/GNUmakefile \
sensors/GNUmakefile \ sensors/GNUmakefile \
......
...@@ -164,6 +164,7 @@ outfiles="Makeconf GNUmakefile \ ...@@ -164,6 +164,7 @@ outfiles="Makeconf GNUmakefile \
event/linktest/weblinktest event/linktest/linktest.proxy \ event/linktest/weblinktest event/linktest/linktest.proxy \
event/linktest/linktest_control \ event/linktest/linktest_control \
event/linktest/run_linktest.pl \ event/linktest/run_linktest.pl \
event/delay-agent/GNUmakefile \
tools/GNUmakefile \ tools/GNUmakefile \
tools/pcapper/GNUmakefile \ tools/pcapper/GNUmakefile \
sensors/GNUmakefile \ sensors/GNUmakefile \
......
...@@ -14,6 +14,13 @@ SUBDIRS = program-agent link-agent tevc proxy linktest ...@@ -14,6 +14,13 @@ SUBDIRS = program-agent link-agent tevc proxy linktest
ifneq ($(SYSTEM),CYGWIN_NT-5.1) ifneq ($(SYSTEM),CYGWIN_NT-5.1)
SUBDIRS += trafgen SUBDIRS += trafgen
endif endif
ifeq ($(WITH_EMULAB),1)
# only in a full build for now.
ifneq ($(FBSDMAJ),8)
# doesn't build right now due to API changes
SUBDIRS += delay-agent
endif
endif
all: trafgen-fetch all-subdirs all: trafgen-fetch all-subdirs
......
...@@ -5621,7 +5621,6 @@ else ...@@ -5621,7 +5621,6 @@ else
event/nsetrafgen/GNUmakefile \ event/nsetrafgen/GNUmakefile \
event/nsetrafgen/nseinput.tcl \ event/nsetrafgen/nseinput.tcl \
event/nsetrafgen/nse-makepatch \ event/nsetrafgen/nse-makepatch \
event/delay-agent/GNUmakefile \
event/stated/waitForState \ event/stated/waitForState \
event/stated/GNUmakefile event/stated/stated" event/stated/GNUmakefile event/stated/stated"
...@@ -7232,6 +7231,7 @@ outfiles="$outfiles clientside/GNUmakefile \ ...@@ -7232,6 +7231,7 @@ outfiles="$outfiles clientside/GNUmakefile \
clientside/event/linktest/linktest.proxy \ clientside/event/linktest/linktest.proxy \
clientside/event/linktest/linktest_control \ clientside/event/linktest/linktest_control \
clientside/event/linktest/run_linktest.pl \ clientside/event/linktest/run_linktest.pl \
clientside/event/delay-agent/GNUmakefile \
clientside/os/dijkstra/GNUmakefile clientside/os/genhostsfile/GNUmakefile" clientside/os/dijkstra/GNUmakefile clientside/os/genhostsfile/GNUmakefile"
# #
......
...@@ -710,7 +710,6 @@ else ...@@ -710,7 +710,6 @@ else
event/nsetrafgen/GNUmakefile \ event/nsetrafgen/GNUmakefile \
event/nsetrafgen/nseinput.tcl \ event/nsetrafgen/nseinput.tcl \
event/nsetrafgen/nse-makepatch \ event/nsetrafgen/nse-makepatch \
event/delay-agent/GNUmakefile \
event/stated/waitForState \ event/stated/waitForState \
event/stated/GNUmakefile event/stated/stated" event/stated/GNUmakefile event/stated/stated"
...@@ -1097,6 +1096,7 @@ outfiles="$outfiles clientside/GNUmakefile \ ...@@ -1097,6 +1096,7 @@ outfiles="$outfiles clientside/GNUmakefile \
clientside/event/linktest/linktest.proxy \ clientside/event/linktest/linktest.proxy \
clientside/event/linktest/linktest_control \ clientside/event/linktest/linktest_control \
clientside/event/linktest/run_linktest.pl \ clientside/event/linktest/run_linktest.pl \
clientside/event/delay-agent/GNUmakefile \
clientside/os/dijkstra/GNUmakefile clientside/os/genhostsfile/GNUmakefile" clientside/os/dijkstra/GNUmakefile clientside/os/genhostsfile/GNUmakefile"
# #
......
...@@ -22,11 +22,6 @@ SUBDIRS += sched stated ...@@ -22,11 +22,6 @@ SUBDIRS += sched stated
ifeq ($(ISMAINSITE),1) ifeq ($(ISMAINSITE),1)
SUBDIRS += new_sched SUBDIRS += new_sched
endif endif
ifneq ($(FBSDMAJ),8)
# doesn't build right now due to API changes
SUBDIRS += delay-agent
endif
endif endif
all: etc-subdir all-subdirs all: etc-subdir all-subdirs
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment