From 6f31e95bffce5c0131288b2ee41c611b7905f47e Mon Sep 17 00:00:00 2001
From: "Leigh B. Stoller" <stoller@flux.utah.edu>
Date: Tue, 10 Jun 2003 13:23:20 +0000
Subject: [PATCH] Minor makefile changes for Linux.

---
 event/GNUmakefile.in               | 6 +++++-
 event/program-agent/GNUmakefile.in | 6 +++++-
 event/tbgen/GNUmakefile.in         | 3 +++
 event/trafgen/GNUmakefile.in       | 2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/event/GNUmakefile.in b/event/GNUmakefile.in
index b3e5d1b7c..5f6876009 100644
--- a/event/GNUmakefile.in
+++ b/event/GNUmakefile.in
@@ -15,7 +15,7 @@ SYSTEM	       := $(shell uname -s)
 
 SUBDIRS		= lib tbgen trafgen program-agent
 ifeq ($(SYSTEM),FreeBSD)
-SUBDIRS	       += sched example delay-agent nsetrafgen stated
+SUBDIRS	       += sched example delay-agent nsetrafgen stated proxy
 endif
 
 all:	$(SUBDIRS)
@@ -50,6 +50,9 @@ program-agent:
 stated:
 	@$(MAKE) -C stated all
 
+proxy:
+	@$(MAKE) -C proxy all
+
 install: 
 	@$(MAKE) -C lib install
 	@$(MAKE) -C sched install
@@ -62,6 +65,7 @@ client-install:
 	@$(MAKE) -C program-agent client-install
 	@$(MAKE) -C tbgen client-install
 	@$(MAKE) -C trafgen client-install
+	@$(MAKE) -C proxy client-install
 
 control-install: 
 	@$(MAKE) -C tbgen control-install
diff --git a/event/program-agent/GNUmakefile.in b/event/program-agent/GNUmakefile.in
index 06a0b2459..e3c7391e0 100644
--- a/event/program-agent/GNUmakefile.in
+++ b/event/program-agent/GNUmakefile.in
@@ -1,6 +1,6 @@
 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2002 University of Utah and the Flux Group.
+# Copyright (c) 2000-2003 University of Utah and the Flux Group.
 # All rights reserved.
 #
 
@@ -9,6 +9,7 @@ TESTBED_SRCDIR	= @top_srcdir@
 OBJDIR		= ../..
 SUBDIR		= event/program-agent
 
+SYSTEM	       := $(shell uname -s)
 PROGRAMS	= program-agent
 
 include $(OBJDIR)/Makeconf
@@ -25,6 +26,9 @@ CFLAGS   += `elvin-config --cflags vin4c`
 LDFLAGS  += -static -L../lib -L${OBJDIR}/lib/libtb
 LIBS     += -levent -ltb
 LIBS     += `elvin-config --libs vin4c`
+ifeq ($(SYSTEM),Linux)
+LIBS     += -ldl
+endif
 
 program-agent:		program-agent.o
 	$(CC) $(LDFLAGS) -o $@ program-agent.o $(LIBS)
diff --git a/event/tbgen/GNUmakefile.in b/event/tbgen/GNUmakefile.in
index cc7816172..79f424f0a 100644
--- a/event/tbgen/GNUmakefile.in
+++ b/event/tbgen/GNUmakefile.in
@@ -40,6 +40,9 @@ CFLAGS   += `elvin-config --cflags vin4c`
 LDFLAGS  += -L$(OBJDIR)/lib -L$(OBJDIR)/lib/libtb -L../lib
 LIBS     += -levent
 LIBS     += `elvin-config --libs vin4c`
+ifeq ($(SYSTEM),Linux)
+LIBS     += -ldl
+endif
 
 tevc:	tevc.o $(LIBTBDIR)/log.o $(LIBTBDIR)/tbdefs.o
 	# Link against some of the object files from libtb, instead of the
diff --git a/event/trafgen/GNUmakefile.in b/event/trafgen/GNUmakefile.in
index 2adc76273..1332e1cca 100644
--- a/event/trafgen/GNUmakefile.in
+++ b/event/trafgen/GNUmakefile.in
@@ -60,7 +60,7 @@ ifeq ($(SYSTEM),Linux)
 # Linux
 CFLAGS	 += -DLINUX
 YCFLAGS	 += -I. -I$(TGSRCDIR) -DUSEEVENTS -DLINUX -t
-LIBS	 += -ll
+LIBS	 += -ll -ldl
 endif
 
 LEX	 = flex -l
-- 
GitLab