Build all the queueing disciplines (includes atm)

(Logical change 1.25)

diff --git a/tc/Makefile b/tc/Makefile
index 3a78059d221e01a9ca390ccd4f155a2778ae42ed..8454843ca1b522a0c169e897c8de01f20652e215 100644 (file)
--- a/tc/Makefile
+++ b/tc/Makefile
@@ -1,7 +1,5 @@
 TCOBJ=tc.o tc_qdisc.o tc_class.o tc_filter.o tc_util.o m_police.o m_estimator.o
 
-include ../Config
-
 TCMODULES :=
 TCMODULES += q_fifo.o
 TCMODULES += q_sfq.o
@@ -13,22 +11,19 @@ TCMODULES += f_rsvp.o
 TCMODULES += f_u32.o
 TCMODULES += f_route.o
 TCMODULES += f_fw.o
-ifeq ($(TC_CONFIG_DIFFSERV),y)
-  TCMODULES += q_dsmark.o
-  TCMODULES += q_gred.o
-  TCMODULES += f_tcindex.o
-  TCMODULES += q_ingress.o
-endif
-ifeq ($(TC_CONFIG_ATM),y)
-  TCMODULES += q_atm.o
-  LDLIBS += -latm
-endif
+TCMODULES += q_dsmark.o
+TCMODULES += q_gred.o
+TCMODULES += f_tcindex.o
+TCMODULES += q_ingress.o
+TCMODULES += q_atm.o
+LDLIBS += -latm
+
 TCMODULES += q_delay.o
 
-#TCMODULES += q_csz.o
+TCMODULES += q_csz.o
 TCMODULES += q_htb.o
-#TCMODULES += q_hpfq.o
-#TCMODULES += q_hfsc.o
+TCMODULES += q_hpfq.o
+TCMODULES += q_hfsc.o
 
 TCOBJ += $(TCMODULES)