X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ipfw%2FMakefile;h=bcaed9c06e112aa541b4717df11ec28f3600b7d0;hb=ecbf629b486a76fa4817cc73270af411eada5a1a;hp=a8a4f474a1492544f0c17840eeb1363186c37e26;hpb=5f337135c613b2ee3cb24ade7617ecaae0a74681;p=ipfw.git diff --git a/ipfw/Makefile b/ipfw/Makefile index a8a4f47..bcaed9c 100644 --- a/ipfw/Makefile +++ b/ipfw/Makefile @@ -6,12 +6,10 @@ # enable extra debugging information # Do not set with = or := so we can inherit from the caller $(warning Building userland ipfw for $(VER)) -EXTRA_CFLAGS += EXTRA_CFLAGS += -O1 +# comment this on planetlab +# EXTRA_CFLAGS += -Wall -Werror EXTRA_CFLAGS += -include ../glue.h - -LDFLAGS= - EXTRA_CFLAGS += -I ./include ifneq ($(VER),openwrt) @@ -25,8 +23,12 @@ endif endif # !openwrt CFLAGS += $(EXTRA_CFLAGS) +# Location of OS headers and libraries. After our stuff. +USRDIR?= /usr +CFLAGS += -I$(USRDIR)/include +LDFLAGS += -L$(USRDIR)/lib -OBJS = ipfw2.o dummynet.o main.o ipv6.o altq.o +OBJS = ipfw2.o dummynet.o main.o ipv6.o altq.o qsort_r.o ifneq ($(HAVE_NAT),) OBJS += nat.o EXTRA_CFLAGS += -DHAVE_NAT