X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=ipfw%2FMakefile;h=4800b4a86ffae7beadee49ec387e74abf895e3b7;hb=HEAD;hp=387c9871097f86dec23d76a9d70f83e70ae2bfee;hpb=40445faa1db58b90083115bc315d095e7eb2fe51;p=ipfw.git

diff --git a/ipfw/Makefile b/ipfw/Makefile
index 387c987..4800b4a 100644
--- a/ipfw/Makefile
+++ b/ipfw/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $Id: Makefile 11277 2012-06-10 17:44:15Z marta $
 #
 # GNUMakefile to build the userland part of ipfw on Linux and Windows
 #
@@ -7,6 +7,12 @@
 # Do not set with = or := so we can inherit from the caller
 XOSARCH := $(shell uname)
 OSARCH ?= $(XOSARCH)
+OSARCH := $(shell uname)
+OSARCH := $(findstring $(OSARCH),FreeBSD Linux Darwin)
+ifeq ($(OSARCH),)
+    OSARCH := Windows
+endif
+
 $(warning Building userland ipfw for $(VER) $(OSARCH))
 
 #TCC=c:/tesi/tcc
@@ -22,7 +28,19 @@ ifneq ($(VER),openwrt)
 ifeq ($(OSARCH),Linux)
     EXTRA_CFLAGS += -D__BSD_VISIBLE
     EXTRA_CFLAGS += -Werror
-else # must be Cygwin ?
+    # Required by GCC 4.6
+    EXTRA_CFLAGS += -Wno-unused-but-set-variable
+endif
+ifeq ($(OSARCH),FreeBSD)
+    EXTRA_CFLAGS += -D__BSD_VISIBLE
+    EXTRA_CFLAGS += -Werror
+endif
+ifeq ($(OSARCH),Darwin)
+    EXTRA_CFLAGS += -D__BSD_VISIBLE
+    EXTRA_CFLAGS += -Werror
+endif
+# must be Cygwin ?
+ifeq ($(OSARCH),Windows)
 ifeq ($(TCC),)
     EXTRA_CFLAGS += -I/cygdrive/c/WinDDK/7600.16385.0/inc/ddk
     EXTRA_CFLAGS += -I .
@@ -42,6 +60,7 @@ else
     EFILES += netinet/ip_icmp.h
     EFILES += sys/cdefs.h sys/wait.h
     EFILES += sys/ioctl.h sys/socket.h
+
 endif
     # EXTRA_CFLAGS += -D_WIN32 # see who defines it
     EXTRA_CFLAGS += -Dsetsockopt=wnd_setsockopt
@@ -62,7 +81,7 @@ ifeq ($(TCC),)
     CFLAGS += -I$(USRDIR)/include
     LDFLAGS += -L$(USRDIR)/lib
 else
-    LDFLAGS += -L. -lws2_32
+    LDFLAGS += -L. -L$(TCC)/lib -lws2_32
 endif
 
 OBJS = ipfw2.o dummynet.o main.o ipv6.o qsort_r.o