summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshemminger <shemminger>2005-09-01 22:38:19 +0000
committershemminger <shemminger>2005-09-01 22:38:19 +0000
commitce715cd94cd5272ab4bd106c964ebe215a4e1791 (patch)
tree58f43cb422bc46da973de48121f7487579d5b5e1
parent3d418dc38a62bb1d07ee3eb81a8dfa243764fb8e (diff)
Allow parallel make of netem directory.ss-050901
Use HOSTCC when building local tools
-rw-r--r--ChangeLog7
-rw-r--r--netem/Makefile20
2 files changed, 15 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 88d66dbf..fec24979 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,15 @@
-2005-09-01 Stephen Hemminger <shemminger@dxpl.pdx.osdl.net>
+2005-09-01 Mike Frysinger <vapier@gentoo.org>
+
+ * Fix build issues with netem tables (parallel make and HOSTCC)
+
+2005-09-01 Stephen Hemminger <shemminger@osdl.org>
* Integrate support for DCCP into 'ss' (from acme)
* Add -batch option to ip.
* Update to 2.6.14 headers
2005-09-01 Eric Dumazet <dada1@cosmosbay.com>
+
* Fix lnstat : First column should not be summed
2005-08-16 Stephen Hemminger <shemminger@osdl.org>
diff --git a/netem/Makefile b/netem/Makefile
index 881ed9f5..6af5cf18 100644
--- a/netem/Makefile
+++ b/netem/Makefile
@@ -1,16 +1,19 @@
DISTGEN = maketable normal pareto paretonormal
DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist
+HOSTCC ?= $(CC)
LDLIBS += -lm
-%.dist: %.c
- $(HOSTCC) $(CFLAGS) -o $* $< -lm
- ./$* >$@
+all: $(DISTGEN) $(DISTDATA)
-%.dist: %.dat
- ./maketable $< >$@
+$(DISTGEN):
+ $(HOSTCC) -Wall -O1 -I../include -o $@ $@.c -lm
-all: $(DISTGEN) $(DISTDATA)
+%.dist: %
+ ./$* > $@
+
+experimental.dist: maketable experimental.dat
+ ./maketable experimental.dat > experimental.dist
install: all
mkdir -p $(DESTDIR)/usr/lib/tc
@@ -20,8 +23,3 @@ install: all
clean:
rm -f $(DISTDATA) $(DISTGEN)
-
-maketable: maketable.c
- $(HOSTCC) $(CFLAGS) -o $@ $< -lm
-
-