Grab the lock before reading uid/gid related structure, this will

[ipfw.git] / ipfw / Makefile

diff --git a/ipfw/Makefile b/ipfw/Makefile
index bcaed9c..2a5e08e 100644 (file)
--- a/ipfw/Makefile
+++ b/ipfw/Makefile
@@ -8,7 +8,7 @@
 $(warning Building userland ipfw for $(VER))
 EXTRA_CFLAGS += -O1
 # comment this on planetlab
-# EXTRA_CFLAGS += -Wall -Werror
+#EXTRA_CFLAGS += -Wall -Werror
 EXTRA_CFLAGS += -include ../glue.h
 EXTRA_CFLAGS += -I ./include
 
@@ -29,6 +29,7 @@ CFLAGS += -I$(USRDIR)/include
 LDFLAGS += -L$(USRDIR)/lib
 
 OBJS = ipfw2.o dummynet.o main.o ipv6.o altq.o qsort_r.o
+OBJS += expand_number.o humanize_number.o
 ifneq ($(HAVE_NAT),)
     OBJS += nat.o
     EXTRA_CFLAGS += -DHAVE_NAT
@@ -41,7 +42,14 @@ all: ipfw
 ipfw: $(OBJS)
        $(CC) $(LDFLAGS) -o $@ $^
 
-$(OBJS) : ipfw2.h ../glue.h
+$(OBJS) : ipfw2.h ../glue.h include/netinet
+
+include/netinet:
+       -@rm -rf include/netinet
+       -@mkdir -p include/netinet
+       -(cd include/netinet; \
+               for i in ip_fw.h ip_dummynet.h tcp.h; do \
+               ln -s ../../../dummynet/include/netinet/$$i; done; )
 
 clean distclean:
        -rm -f $(OBJS) ipfw