Commit 7e70f590 authored by Mike Hibler's avatar Mike Hibler

Add the NOSTATIC hack to link agents dynamically.

This will probably shortly become the default.
parent 0eee55b7
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -13,6 +13,13 @@ SYSTEM := $(shell uname -s)
include $(OBJDIR)/Makeconf
ifeq ($(NOSTATIC),)
# for now we link everything static
LDSTATIC = -static
else
LDSTATIC =
endif
all: boss-all tipserv-all
boss-all: capserver
tipserv-all: capture capture-tty capquery
......@@ -38,7 +45,7 @@ ifeq ($(NEEDKERB),0)
endif
endif
else
LDFLAGS += -static
LDFLAGS += $(LDSTATIC)
endif
capture: capture.c capdecls.h
......
......@@ -11,6 +11,13 @@ SUBDIR = event/delay-agent
include $(OBJDIR)/Makeconf
ifeq ($(NOSTATIC),)
# for now we link everything static
LDSTATIC = -static
else
LDSTATIC =
endif
all: delay-agent
include $(TESTBED_SRCDIR)/GNUmakerules
......@@ -20,7 +27,7 @@ CFLAGS += -O -g -Wall
CFLAGS += -I. -I${OBJDIR} -I$(SRCDIR)/../lib -I$(TESTBED_SRCDIR)/lib/libtb
CFLAGS += -I/usr/local/include
LDFLAGS += -static
LDFLAGS += $(LDSTATIC)
LDFLAGS += -L../lib -L${OBJDIR}/lib/libtb
LIBS += -levent -ltb -lcrypto
LIBS += -L/usr/local/lib -lpubsub -lm
......
......@@ -14,6 +14,13 @@ PROGRAMS = link-agent
include $(OBJDIR)/Makeconf
ifeq ($(NOSTATIC),)
# for now we link everything static
LDSTATIC = -static
else
LDSTATIC =
endif
all: $(PROGRAMS)
include $(TESTBED_SRCDIR)/GNUmakerules
......@@ -29,9 +36,13 @@ LIBS += -L/usr/local/lib -lpubsub -lm
ifeq ($(host_cpu),arm)
else
LDFLAGS += -static
LDFLAGS += $(LDSTATIC)
ifeq ($(SYSTEM),Linux)
ifeq ($(NOSTATIC),)
NEEDKERB := $(shell nm /usr/lib/libssl.a | grep -q krb; echo $$?)
else
NEEDKERB := 1
endif
ifeq ($(NEEDKERB),0)
CFLAGS += `/usr/kerberos/bin/krb5-config --cflags`
LIBS += `/usr/kerberos/bin/krb5-config --libs krb5`
......
......@@ -30,6 +30,13 @@ SYSTEM := $(patsubst CYGWIN%,CYGWIN,$(shell uname -s))
include $(OBJDIR)/Makeconf
ifeq ($(NOSTATIC),)
# for now we link everything static
LDSTATIC = -static
else
LDSTATIC =
endif
all: binaries $(SCRIPT) $(SCRIPT_RUN) $(SCRIPT_PROXY) \
weblinktest linktest_control
......@@ -46,9 +53,13 @@ LIBS += -L/usr/local/lib -lpubsub -lm
ifeq ($(host_cpu),arm)
else
LDFLAGS += -static
LDFLAGS += $(LDSTATIC)
ifeq ($(SYSTEM),Linux)
ifeq ($(NOSTATIC),)
NEEDKERB := $(shell nm /usr/lib/libssl.a | grep -q krb; echo $$?)
else
NEEDKERB := 1
endif
ifeq ($(NEEDKERB),0)
CFLAGS += `/usr/kerberos/bin/krb5-config --cflags`
LIBS += `/usr/kerberos/bin/krb5-config --libs krb5`
......
......@@ -14,6 +14,13 @@ PROGRAMS = tevc
include $(OBJDIR)/Makeconf
ifeq ($(NOSTATIC),)
# for now we link everything static
LDSTATIC = -static
else
LDSTATIC =
endif
all: $(PROGRAMS)
include $(TESTBED_SRCDIR)/GNUmakerules
......@@ -40,9 +47,13 @@ LIBS += -lm -L/usr/local/lib -lpubsub
ifeq ($(host_cpu),arm)
else
LDFLAGS += -static
LDFLAGS += $(LDSTATIC)
ifeq ($(SYSTEM),Linux)
ifeq ($(NOSTATIC),)
NEEDKERB := $(shell nm /usr/lib/libssl.a | grep -q krb; echo $$?)
else
NEEDKERB := 1
endif
ifeq ($(NEEDKERB),0)
CFLAGS += `/usr/kerberos/bin/krb5-config --cflags`
LIBS += `/usr/kerberos/bin/krb5-config --libs krb5`
......
......@@ -32,6 +32,13 @@ OBJS = \
include $(OBJDIR)/Makeconf
ifeq ($(NOSTATIC),)
# for now we link everything static
LDSTATIC = -static
else
LDSTATIC =
endif
all: tg2.0 $(PROGRAMS)
include $(TESTBED_SRCDIR)/GNUmakerules
......@@ -51,7 +58,7 @@ LIBS += -L/usr/local/lib -lpubsub -lm
SYSTEM := $(shell uname -s)
ifneq ($(host_cpu),arm)
LDFLAGS += -static
LDFLAGS += $(LDSTATIC)
endif
ifeq ($(SYSTEM),FreeBSD)
......
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -11,7 +11,15 @@ SUBDIR = os/dijkstra
include $(OBJDIR)/Makeconf
ifeq ($(NOSTATIC),)
# for now we link everything static
LDSTATIC = -static
else
LDSTATIC =
endif
CXXFLAGS = -Wall -O2 -I/usr/local/include -ftemplate-depth-40 -g
CXXFLAGS += $(LDSTATIC)
all: dijkstra
......@@ -25,7 +33,7 @@ dijkstra-debug: Compressor.o TreeCompressor.o dijkstra.o \
IpTree.h SingleSource.h dijkstra.h \
NoneCompressor.h TreeCompressor.h lib.h
$(CXX) $(CXXFLAGS) -static Compressor.o TreeCompressor.o dijkstra.o \
$(CXX) $(CXXFLAGS) Compressor.o TreeCompressor.o dijkstra.o \
NoneCompressor.o VoteIpTree.o SingleSource.o \
OptimalIpTree.o bitmath.o $(LIBS) -o $@
......
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005 University of Utah and the Flux Group.
# Copyright (c) 2000-2005, 2007 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -11,7 +11,14 @@ SUBDIR = os/genhostsfile
include $(OBJDIR)/Makeconf
CFLAGS = -Wall -O2 -g -static -I${OBJDIR} -I${TESTBED_SRCDIR}/lib/libtb
ifeq ($(NOSTATIC),)
# for now we link everything static
LDSTATIC = -static
else
LDSTATIC =
endif
CFLAGS = -Wall -O2 -g $(LDSTATIC) -I${OBJDIR} -I${TESTBED_SRCDIR}/lib/libtb
LIBS = ${OBJDIR}/lib/libtb/libtb.a
all: genhostsfile genfromdb genfromtopo
......
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