tc_codel: Controlled Delay AQM

[lisovros/iproute2_canprio.git] / tc / Makefile

diff --git a/tc/Makefile b/tc/Makefile
index f3dd2b76e7a9b8f3055c823f32bdd139096c1c91..8a7cc8da272e225a57542e5ea25d918f9b2c441d 100644 (file)
--- a/tc/Makefile
+++ b/tc/Makefile
@@ -15,6 +15,8 @@ TCMODULES += q_cbq.o
 TCMODULES += q_rr.o
 TCMODULES += q_multiq.o
 TCMODULES += q_netem.o
+TCMODULES += q_choke.o
+TCMODULES += q_sfb.o
 TCMODULES += f_rsvp.o
 TCMODULES += f_u32.o
 TCMODULES += f_route.o
@@ -29,11 +31,13 @@ TCMODULES += q_ingress.o
 TCMODULES += q_hfsc.o
 TCMODULES += q_htb.o
 TCMODULES += q_drr.o
+TCMODULES += q_qfq.o
 TCMODULES += m_gact.o
 TCMODULES += m_mirred.o
 TCMODULES += m_nat.o
 TCMODULES += m_pedit.o
 TCMODULES += m_skbedit.o
+TCMODULES += m_csum.o
 TCMODULES += p_ip.o
 TCMODULES += p_icmp.o
 TCMODULES += p_tcp.o
@@ -42,20 +46,23 @@ TCMODULES += em_nbyte.o
 TCMODULES += em_cmp.o
 TCMODULES += em_u32.o
 TCMODULES += em_meta.o
+TCMODULES += q_mqprio.o
+TCMODULES += q_codel.o
 
+TCSO :=
+ifeq ($(TC_CONFIG_ATM),y)
+  TCSO += q_atm.so
+endif
 
 ifeq ($(TC_CONFIG_XT),y)
-  TCMODULES += m_xt.o
-  LDLIBS += -lxtables
+  TCSO += m_xt.so
 else
   ifeq ($(TC_CONFIG_XT_OLD),y)
-    TCMODULES += m_xt_old.o
-    LDLIBS += -lxtables
+    TCSO += m_xt_old.so
   else
     ifeq ($(TC_CONFIG_XT_OLD_H),y)
        CFLAGS += -DTC_CONFIG_XT_H
-       TCMODULES += m_xt_old.o
-       LDLIBS += -lxtables
+       TCSO += m_xt_old.so
     else
       TCMODULES += m_ipt.o
     endif
@@ -77,46 +84,65 @@ TCLIB += tc_estimator.o
 TCLIB += tc_stab.o
 
 CFLAGS += -DCONFIG_GACT -DCONFIG_GACT_PROB
-
-TCSO :=
-ifeq ($(TC_CONFIG_ATM),y)
-  TCSO += q_atm.so
+ifneq ($(IPT_LIB_DIR),)
+       CFLAGS += -DIPT_LIB_DIR=\"$(IPT_LIB_DIR)\"
 endif
 
 YACC := bison
 LEX := flex
+CFLAGS += -DYY_NO_INPUT
+
+MODDESTDIR := $(DESTDIR)$(LIBDIR)/tc
 
 %.so: %.c
-       $(CC) $(CFLAGS) -shared -fpic $< -o $@
+       $(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic $< -o $@
 
 
 all: libtc.a tc $(TCSO)
 
-tc: $(TCOBJ) $(LIBNETLINK) $(LIBUTIL) $(TCLIB)
+tc: $(TCOBJ) $(TCLIB)
 
 libtc.a: $(TCLIB)
        $(AR) rcs $@ $(TCLIB)
 
 install: all
-       mkdir -p $(DESTDIR)$(LIBDIR)/tc
+       mkdir -p $(MODDESTDIR)
        install -m 0755 tc $(DESTDIR)$(SBINDIR)
        for i in $(TCSO); \
-       do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \
+       do install -m 755 $$i $(MODDESTDIR); \
        done
+       if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \
+       if [ -f $(MODDESTDIR)/m_xt.so ]; \
+               then ln -s m_xt.so $(MODDESTDIR)/m_ipt.so ; \
+       elif [ -f $(MODDESTDIR)/m_xt_old.so ]; \
+               then ln -s m_xt_old.so $(MODDESTDIR)/m_ipt.so ; \
+       fi; \
+       fi
 
 clean:
        rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.so emp_ematch.yacc.h; \
-       rm -f emp_ematch.yacc.output
+       rm -f emp_ematch.yacc.*
 
 q_atm.so: q_atm.c
        $(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic -o q_atm.so q_atm.c -latm
 
+m_xt.so: m_xt.c
+       $(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic -o m_xt.so m_xt.c $$(pkg-config xtables --cflags --libs)
+
+m_xt_old.so: m_xt_old.c
+       $(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic -o m_xt_old.so m_xt_old.c $$(pkg-config xtables --cflags --libs)
+
 %.yacc.c: %.y
        $(YACC) $(YACCFLAGS) -o $@ $<
 
 %.lex.c: %.l
        $(LEX) $(LEXFLAGS) -o$@ $<
 
+# our lexer includes the header from yacc, so make sure
+# we don't attempt to compile it before the header has
+# been generated as part of the yacc step.
+emp_ematch.lex.o: emp_ematch.yacc.c
+
 ifneq ($(SHARED_LIBS),y)
 
 tc: static-syms.o