Auto merged

2004/08/10 10:49:47-07:00 osdl.net!shemminger
change name of dist files.

2004/08/09 16:46:47-07:00 osdl.net!shemminger
Add distribution table loading (undebugged as yet).

(Logical change 1.71)

diff --git a/tc/Makefile b/tc/Makefile
index f9c3d8eed736f075613ff84e0482ce18fec1bb60..5a34becbfab2e2b98ab0450a1cca5fc9f8751b50 100644 (file)
--- a/tc/Makefile
+++ b/tc/Makefile
@@ -34,13 +34,20 @@ ifeq ($(TC_CONFIG_ATM),y)
   TCSO += q_atm.so
 endif
 
+NETEM_DIST := normal.dist pareto.dist paretonormal.dist
+
 LDLIBS += -L. -ltc -lm -ldl
 LDFLAGS += -Wl,-export-dynamic
 
 %.so: %.c
        $(CC) $(CFLAGS) -shared -fpic $< -o $@
 
-all: libtc.a tc $(TCSO)
+%.dist: %.c
+       $(CC) $(CFLAGS) -o $* $< -lm
+       ./$* >$@
+       rm $*
+
+all: libtc.a tc $(TCSO) $(NETEM_DIST)
 
 tc: $(TCOBJ) $(LIBNETLINK) $(LIBUTIL) $(TCLIB)
 
@@ -50,10 +57,12 @@ libtc.a: $(TCLIB)
 install: all
        mkdir -p $(DESTDIR)/usr/lib/tc
        install -m 0755 -s tc $(DESTDIR)$(SBINDIR)
-       for i in $(TCSO); do install -m 755 -s $$i $(DESTDIR)/usr/lib/tc; done
+       for i in $(TCSO) $(NETEM_DIST; \
+       do install -m 755 -s $$i $(DESTDIR)/usr/lib/tc; \
+       done
 
 clean:
-       rm -f $(TCOBJ) $(TCLIB) libtc.a tc
+       rm -f $(TCOBJ) $(TCLIB) $(NETEM_DIST) libtc.a tc
 
 q_atm.so: q_atm.c
        $(CC) $(CFLAGS) -shared -fpic -o q_atm.so q_atm.c -latm