Commit 6f31e95b authored by Leigh B. Stoller's avatar Leigh B. Stoller

Minor makefile changes for Linux.

parent 3a093261
......@@ -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
......
#
# 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)
......
......@@ -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
......
......@@ -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
......
Markdown is supported
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