Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emulab
emulab-devel
Commits
6f31e95b
Commit
6f31e95b
authored
Jun 10, 2003
by
Leigh B. Stoller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor makefile changes for Linux.
parent
3a093261
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
3 deletions
+14
-3
event/GNUmakefile.in
event/GNUmakefile.in
+5
-1
event/program-agent/GNUmakefile.in
event/program-agent/GNUmakefile.in
+5
-1
event/tbgen/GNUmakefile.in
event/tbgen/GNUmakefile.in
+3
-0
event/trafgen/GNUmakefile.in
event/trafgen/GNUmakefile.in
+1
-1
No files found.
event/GNUmakefile.in
View file @
6f31e95b
...
@@ -15,7 +15,7 @@ SYSTEM := $(shell uname -s)
...
@@ -15,7 +15,7 @@ SYSTEM := $(shell uname -s)
SUBDIRS = lib tbgen trafgen program-agent
SUBDIRS = lib tbgen trafgen program-agent
ifeq ($(SYSTEM),FreeBSD)
ifeq ($(SYSTEM),FreeBSD)
SUBDIRS += sched example delay-agent nsetrafgen stated
SUBDIRS += sched example delay-agent nsetrafgen stated
proxy
endif
endif
all: $(SUBDIRS)
all: $(SUBDIRS)
...
@@ -50,6 +50,9 @@ program-agent:
...
@@ -50,6 +50,9 @@ program-agent:
stated:
stated:
@$(MAKE) -C stated all
@$(MAKE) -C stated all
proxy:
@$(MAKE) -C proxy all
install:
install:
@$(MAKE) -C lib install
@$(MAKE) -C lib install
@$(MAKE) -C sched install
@$(MAKE) -C sched install
...
@@ -62,6 +65,7 @@ client-install:
...
@@ -62,6 +65,7 @@ client-install:
@$(MAKE) -C program-agent client-install
@$(MAKE) -C program-agent client-install
@$(MAKE) -C tbgen client-install
@$(MAKE) -C tbgen client-install
@$(MAKE) -C trafgen client-install
@$(MAKE) -C trafgen client-install
@$(MAKE) -C proxy client-install
control-install:
control-install:
@$(MAKE) -C tbgen control-install
@$(MAKE) -C tbgen control-install
...
...
event/program-agent/GNUmakefile.in
View file @
6f31e95b
#
#
# EMULAB-COPYRIGHT
# EMULAB-COPYRIGHT
# Copyright (c) 2000-200
2
University of Utah and the Flux Group.
# Copyright (c) 2000-200
3
University of Utah and the Flux Group.
# All rights reserved.
# All rights reserved.
#
#
...
@@ -9,6 +9,7 @@ TESTBED_SRCDIR = @top_srcdir@
...
@@ -9,6 +9,7 @@ TESTBED_SRCDIR = @top_srcdir@
OBJDIR = ../..
OBJDIR = ../..
SUBDIR = event/program-agent
SUBDIR = event/program-agent
SYSTEM := $(shell uname -s)
PROGRAMS = program-agent
PROGRAMS = program-agent
include $(OBJDIR)/Makeconf
include $(OBJDIR)/Makeconf
...
@@ -25,6 +26,9 @@ CFLAGS += `elvin-config --cflags vin4c`
...
@@ -25,6 +26,9 @@ CFLAGS += `elvin-config --cflags vin4c`
LDFLAGS += -static -L../lib -L${OBJDIR}/lib/libtb
LDFLAGS += -static -L../lib -L${OBJDIR}/lib/libtb
LIBS += -levent -ltb
LIBS += -levent -ltb
LIBS += `elvin-config --libs vin4c`
LIBS += `elvin-config --libs vin4c`
ifeq ($(SYSTEM),Linux)
LIBS += -ldl
endif
program-agent: program-agent.o
program-agent: program-agent.o
$(CC) $(LDFLAGS) -o $@ program-agent.o $(LIBS)
$(CC) $(LDFLAGS) -o $@ program-agent.o $(LIBS)
...
...
event/tbgen/GNUmakefile.in
View file @
6f31e95b
...
@@ -40,6 +40,9 @@ CFLAGS += `elvin-config --cflags vin4c`
...
@@ -40,6 +40,9 @@ CFLAGS += `elvin-config --cflags vin4c`
LDFLAGS += -L$(OBJDIR)/lib -L$(OBJDIR)/lib/libtb -L../lib
LDFLAGS += -L$(OBJDIR)/lib -L$(OBJDIR)/lib/libtb -L../lib
LIBS += -levent
LIBS += -levent
LIBS += `elvin-config --libs vin4c`
LIBS += `elvin-config --libs vin4c`
ifeq ($(SYSTEM),Linux)
LIBS += -ldl
endif
tevc: tevc.o $(LIBTBDIR)/log.o $(LIBTBDIR)/tbdefs.o
tevc: tevc.o $(LIBTBDIR)/log.o $(LIBTBDIR)/tbdefs.o
# Link against some of the object files from libtb, instead of the
# Link against some of the object files from libtb, instead of the
...
...
event/trafgen/GNUmakefile.in
View file @
6f31e95b
...
@@ -60,7 +60,7 @@ ifeq ($(SYSTEM),Linux)
...
@@ -60,7 +60,7 @@ ifeq ($(SYSTEM),Linux)
# Linux
# Linux
CFLAGS += -DLINUX
CFLAGS += -DLINUX
YCFLAGS += -I. -I$(TGSRCDIR) -DUSEEVENTS -DLINUX -t
YCFLAGS += -I. -I$(TGSRCDIR) -DUSEEVENTS -DLINUX -t
LIBS += -ll
LIBS += -ll
-ldl
endif
endif
LEX = flex -l
LEX = flex -l
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment