Checkpoint event/trafgen move.

clientside/configure

@@ -4829,6 +4829,7 @@ outfiles="Makeconf GNUmakefile \
 	  event/link-agent/GNUmakefile \
 	  event/proxy/GNUmakefile \
 	  event/tevc/GNUmakefile \
+	  event/trafgen/GNUmakefile \
 	  tools/GNUmakefile \
 	  tools/pcapper/GNUmakefile \
 	  sensors/GNUmakefile \

clientside/configure.in

@@ -157,6 +157,7 @@ outfiles="Makeconf GNUmakefile \
 	  event/link-agent/GNUmakefile \
 	  event/proxy/GNUmakefile \
 	  event/tevc/GNUmakefile \
+	  event/trafgen/GNUmakefile \
 	  tools/GNUmakefile \
 	  tools/pcapper/GNUmakefile \
 	  sensors/GNUmakefile \

clientside/event/GNUmakefile.in

@@ -11,13 +11,22 @@ SUBDIR		= $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
 include $(OBJDIR)/Makeconf
 
 SUBDIRS		= program-agent link-agent tevc proxy
+ifneq ($(SYSTEM),CYGWIN_NT-5.1)
+SUBDIRS	       += trafgen
+endif
 
-all:	all-subdirs
+all:	trafgen-fetch all-subdirs
 
 include $(TESTBED_SRCDIR)/GNUmakerules
 
+# XXX Yeah, this doesn't belong here but I can't make the trafgen
+# makefile work if it unpacks the tarball itself
+#
+trafgen-fetch:
+	$(SRCDIR)/trafgen/tg-install $(SRCDIR)/trafgen
+
 boss-install:   boss-install-subdirs
-client:		client-subdirs
+client:		trafgen-fetch client-subdirs
 client-install: client client-install-subdirs
 control-install: control-install-subdirs
 subboss:
@@ -36,4 +45,4 @@ frisbee-mfs-install:
 	@$(MAKE) -C $(dir $@) $(basename $(notdir $@))
 %-subdirs: $(addsuffix /%.MAKE,$(SUBDIRS)) ;
 
-.PHONY:	$(SUBDIRS)
+.PHONY:	$(SUBDIRS) trafgen-fetch

clientside/event/trafgen/GNUmakefile.in

@@ -3,11 +3,10 @@
 # Copyright (c) 2000-2011 University of Utah and the Flux Group.
 # All rights reserved.
 #
-
 SRCDIR		= @srcdir@
 TESTBED_SRCDIR	= @top_srcdir@
-OBJDIR		= ../..
-SUBDIR		= event/trafgen
+OBJDIR		= @top_builddir@
+SUBDIR		= $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
 TGSRCDIR	= $(SRCDIR)/tg2.0/src/tg
 PROGRAMS	= trafgen
 
@@ -111,6 +110,7 @@ trafgen-debug:	$(OBJS)
 $(PROGRAMS):	${OBJDIR}/lib/event/libevent.a ../../lib/event/event.h
 
 install:
+boss-install:
 
 client: $(PROGRAMS)
 client-install: client

configure

@@ -5617,7 +5617,6 @@ else
 		    event/example/tbrecv.pl event/example/tbsend-short.pl \
                     event/example/tbsend.py event/example/tbrecv.py \
 		    event/example/eventdebug.pl \
-		    event/trafgen/GNUmakefile \
 		    event/proxy/GNUmakefile \
 		    event/nsetrafgen/GNUmakefile \
 		    event/nsetrafgen/nseinput.tcl \
@@ -7231,6 +7230,7 @@ outfiles="$outfiles clientside/GNUmakefile \
  clientside/event/link-agent/GNUmakefile \
  clientside/event/proxy/GNUmakefile \
  clientside/event/tevc/GNUmakefile \
+ clientside/event/trafgen/GNUmakefile \
  clientside/os/dijkstra/GNUmakefile clientside/os/genhostsfile/GNUmakefile"
 
 #

configure.in

@@ -706,7 +706,6 @@ else
 		    event/example/tbrecv.pl event/example/tbsend-short.pl \
                     event/example/tbsend.py event/example/tbrecv.py \
 		    event/example/eventdebug.pl \
-		    event/trafgen/GNUmakefile \
 		    event/proxy/GNUmakefile \
 		    event/nsetrafgen/GNUmakefile \
 		    event/nsetrafgen/nseinput.tcl \
@@ -1096,6 +1095,7 @@ outfiles="$outfiles clientside/GNUmakefile \
  clientside/event/link-agent/GNUmakefile \
  clientside/event/proxy/GNUmakefile \
  clientside/event/tevc/GNUmakefile \
+ clientside/event/trafgen/GNUmakefile \
  clientside/os/dijkstra/GNUmakefile clientside/os/genhostsfile/GNUmakefile"
 
 #

event/GNUmakefile.in

@@ -29,16 +29,10 @@ endif
 
 endif
 
-all:	etc-subdir trafgen-fetch all-subdirs
+all:	etc-subdir all-subdirs
 
 include $(TESTBED_SRCDIR)/GNUmakerules
 
-# XXX Yeah, this doesn't belong here but I can't make the trafgen
-# makefile work if it unpacks the tarball itself
-#
-trafgen-fetch:
-	$(SRCDIR)/trafgen/tg-install $(SRCDIR)/trafgen "@OUTERBOSS_NODENAME@"
-
 etc-subdir:
 	@$(MAKE) -C etc all
 
@@ -51,7 +45,7 @@ endif
 	@$(MAKE) -C linktest install
 	@$(MAKE) -C proxy install
 
-client:		trafgen-fetch client-subdirs
+client:		client-subdirs
 client-install: client client-install-subdirs
 
 control-install: 
@@ -74,4 +68,4 @@ distclean:	distclean-subdirs
 	@$(MAKE) -C $(dir $@) $(basename $(notdir $@))
 %-subdirs: $(addsuffix /%.MAKE,$(SUBDIRS)) ;
 
-.PHONY:	$(SUBDIRS) trafgen-fetch
+.PHONY:	$(SUBDIRS)