Work on the radix code, added support to compile on OpenWRT,

[ipfw.git] / dummynet / Makefile

diff --git a/dummynet/Makefile b/dummynet/Makefile
index 71b0b80..cac1958 100644 (file)
--- a/dummynet/Makefile
+++ b/dummynet/Makefile
@@ -37,7 +37,7 @@ VER ?= 2.6
 obj-m := ipfw_mod.o
 
 # generic cflags used on all systems
-#ipfw-cflags += -Dradix
+#ipfw-cflags += -DIPFW_HASHTABLES
 ipfw-cflags += -DIPFIREWALL_DEFAULT_TO_ACCEPT -DTRACE
 # _BSD_SOURCE enables __FAVOR_BSD (udp/tcp bsd structs instead of posix)
 ipfw-cflags += -D_BSD_SOURCE
@@ -52,7 +52,7 @@ $(warning "---- Building dummynet kernel module for Version $(VER)")
 ifeq ($(VER),openwrt)
   M=.
   obj-y := ipfw2_mod.o bsd_compat.o \
-       in_cksum.o ip_dummynet.o ip_fw2.o ip_fw_pfil.o
+       in_cksum.o ip_dummynet.o ip_fw2.o ip_fw_pfil.o radix.o
   O_TARGET := ipfw_mod.o
 
   # xcflags-y is a temporary variable where we store build options
@@ -134,9 +134,9 @@ ipfw_mod-y = $(IPFW_SRCS:%.c=%.o)
 
 # Original ipfw and dummynet sources + FreeBSD stuff,
 IPFW_SRCS = ip_fw2.c ip_dummynet.c ip_fw_pfil.c in_cksum.c
-#IPFW_SRCS += radix.c
+IPFW_SRCS += radix.c 
 # Module glue and functions missing in linux
-IPFW_SRCS += ipfw2_mod.c bsd_compat.c hashtable.c new_glue.c
+IPFW_SRCS += ipfw2_mod.c bsd_compat.c hashtable.c
 
 # additional $(CC) flags
 ccflags-y += $(WARN)
@@ -161,7 +161,7 @@ distclean: clean
 
 EDIRS= altq arpa machine net netinet netinet6 sys
 
-EFILES += opt_inet6.h opt_ipfw.h opt_ipsec.h
+EFILES += opt_inet6.h opt_ipfw.h opt_ipsec.h opt_mpath.h
 EFILES += opt_mbuf_stress_test.h opt_param.h
 
 EFILES += altq/if_altq.h
@@ -172,14 +172,14 @@ EFILES += net/vnet.h
 
 EFILES += netinet/ether.h netinet/icmp6.h netinet/if_ether.h
 EFILES += netinet/in.h netinet/in_pcb.h netinet/in_var.h
-EFILES +=  netinet/ip_carp.h netinet/ip_var.h netinet/pim.h
+EFILES += netinet/ip_carp.h netinet/ip_var.h netinet/pim.h
 EFILES += netinet/sctp.h netinet/tcp_timer.h netinet/tcpip.h
 EFILES += netinet/udp_var.h
 
 EFILES += netinet6/ip6_var.h
 
 EFILES += sys/_lock.h sys/_rwlock.h sys/_mutex.h sys/jail.h
-EFILES += sys/condvar.h sys/eventhandler.h
+EFILES += sys/condvar.h sys/eventhandler.h sys/domain.h
 EFILES += sys/limits.h sys/lock.h sys/mutex.h sys/priv.h
 EFILES += sys/proc.h sys/rwlock.h sys/socket.h sys/socketvar.h
 EFILES += sys/sysctl.h sys/time.h sys/ucred.h
@@ -192,3 +192,6 @@ include_e:
        -@(cd $(M)/include_e; mkdir -p $(EDIRS); touch $(EFILES) )
 
 endif # !openwrt
+
+test_radix: test_radix.o radix.o
+test_radix: CFLAGS=-Wall -Werror -O1