Build more client stuff on the noelvin branch.

event/GNUmakefile.in

@@ -13,10 +13,12 @@ include $(OBJDIR)/Makeconf
 
 SYSTEM	       := $(shell uname -s)
 
-#SUBDIRS	= lib tbgen program-agent proxy example linktest link-agent
-SUBDIRS		= lib tbgen program-agent
+SUBDIRS		= lib tbgen program-agent proxy example linktest link-agent
+ifneq ($(SYSTEM),CYGWIN_NT-5.1)
+SUBDIRS	       += trafgen
+endif
 ifeq ($(SYSTEM),FreeBSD)
-SUBDIRS	       += sched stated
+SUBDIRS	       += sched delay-agent nsetrafgen stated
 endif
 
 all:	etc-subdir trafgen-fetch all-subdirs
@@ -36,8 +38,8 @@ install:
 	@$(MAKE) -C lib install
 	@$(MAKE) -C sched install
 	@$(MAKE) -C tbgen install
-	@$(MAKE) -C program-agent install
 	@$(MAKE) -C stated install
+	@$(MAKE) -C linktest install
 
 client:		trafgen-fetch client-subdirs
 client-install: client client-install-subdirs

event/example/GNUmakefile.in

 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2002-2006 University of Utah and the Flux Group.
+# Copyright (c) 2002-2007 University of Utah and the Flux Group.
 # All rights reserved.
 #
 
@@ -10,7 +10,7 @@ OBJDIR		= ../..
 SUBDIR		= event/example
 
 SYSTEM	       := $(shell uname -s)
-PROGRAMS	= tbrecv tbsend tbrecv.py tbsend.py eventdebug.pl dumpevsubs
+PROGRAMS	= tbrecv tbsend tbrecv.py tbsend.py eventdebug.pl
 
 include $(OBJDIR)/Makeconf
 
@@ -21,11 +21,11 @@ include $(TESTBED_SRCDIR)/GNUmakerules
 CFLAGS   += -DDEBUG
 CFLAGS	 += -O -g -static -Wall
 CFLAGS   += -I. -I${OBJDIR} -I$(SRCDIR)/../lib -I$(TESTBED_SRCDIR)/lib/libtb
-CFLAGS   += `elvin-config --cflags vin4c`
+CFLAGS   += -I/usr/local/include
 
 LDFLAGS  += -static -L../lib -L${OBJDIR}/lib/libtb
 LIBS     += -levent -ltb -lcrypto
-LIBS     += `elvin-config --libs vin4c`
+LIBS     +=  -L/usr/local/lib -lpubsub -lm
 ifeq ($(SYSTEM),Linux)
 LIBS     += -ldl
 endif