Allow parallel make of netem directory.

Use HOSTCC when building local tools

diff --git a/ChangeLog b/ChangeLog
index 88d66dbf4db83926a24d65f5e5d65c02bf02a0e6..fec24979fc34e98da42d7160eb613f7c4adefa72 100644 (file)
--- 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 881ed9f5d6e51379dadd4ff2ff02a8a18fc24553..6af5cf18f49dee43653d34574e6549ca83e6998d 100644 (file)
--- 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
-
-