Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emulab
emulab-devel
Commits
0b9f692f
Commit
0b9f692f
authored
Dec 27, 2005
by
Timothy Stack
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor tweaks to get the client side build working for the garcias
again.
parent
e8c5ba2d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
3 deletions
+22
-3
capture/GNUmakefile.in
capture/GNUmakefile.in
+0
-1
event/linktest/iperf/GNUmakefile.in
event/linktest/iperf/GNUmakefile.in
+11
-1
os/GNUmakefile.in
os/GNUmakefile.in
+1
-0
tools/GNUmakefile.in
tools/GNUmakefile.in
+10
-1
No files found.
capture/GNUmakefile.in
View file @
0b9f692f
...
...
@@ -30,7 +30,6 @@ CFLAGS += -g -O2 -DLOG_DROPS -I${OBJDIR} -DLOG_TESTBED=$(LOG_TESTBED)
ifeq ($(SYSTEM),Linux)
ifeq ($(host_cpu),arm)
LDFLAGS += -static
else
CFLAGS += -I/usr/kerberos/include
LDFLAGS += -L/usr/kerberos/lib -lkrb5 -lk5crypto -lcom_err
...
...
event/linktest/iperf/GNUmakefile.in
View file @
0b9f692f
...
...
@@ -19,7 +19,13 @@ ifeq ($(SYSTEM),CYGWIN)
CONFIG_ARGS = --disable-threads
endif
all: src/emulab-iperf
ifeq ($(host_cpu),arm)
TARGETS =
else
TARGETS = src/emulab-iperf
endif
all: $(TARGETS)
include $(TESTBED_SRCDIR)/GNUmakerules
...
...
@@ -37,8 +43,12 @@ build-iperf: Makefile
client: all
ifeq ($(host_cpu),arm)
client-install:
else
client-install: Makefile
$(MAKE) -f Makefile install
endif
# Note: GNU make wants to pass options in MAKEFLAGS (w) that are compatible
# with BSD make. So we just force configure to assume/use gmake for BSD.
...
...
os/GNUmakefile.in
View file @
0b9f692f
...
...
@@ -44,6 +44,7 @@ endif
client-install: client
$(INSTALL) -m 755 -o root -g wheel -d $(LBINDIR)
$(INSTALL_PROGRAM) $(SRCDIR)/install-tarfile $(LBINDIR)/install-tarfile
-mkdir -p $(DESTDIR)$(CLIENT_MANDIR)/man1
$(INSTALL) -m 644 $(SRCDIR)/install-tarfile.1 $(DESTDIR)$(CLIENT_MANDIR)/man1/install-tarfile.1
$(INSTALL_PROGRAM) $(SRCDIR)/install-rpm $(LBINDIR)/install-rpm
ifeq ($(SYSTEM),FreeBSD)
...
...
tools/GNUmakefile.in
View file @
0b9f692f
...
...
@@ -11,17 +11,26 @@ SUBDIR = tools
include $(OBJDIR)/Makeconf
SUBDIRS = pcapper teachswitch webcamapplet whol
SUBDIRS = teachswitch webcamapplet whol
ifneq ($(host_cpu),arm)
SUBDIRS += pcapper
endif
all: all-subdirs
include $(TESTBED_SRCDIR)/GNUmakerules
ifeq ($(host_cpu),arm)
client:
client-install:
else
client:
$(MAKE) -C pcapper client
client-install: client
$(MAKE) -C pcapper client-install
endif
post-install:
@$(MAKE) -C whol post-install
...
...
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