From 7b3a739ec2859046339e1a3d4be9f575ab1c914c Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sat, 26 May 2018 23:41:15 +0200 Subject: [PATCH] libipfw3: Clean up the Makefiles a bit. --- lib/libipfw3/Makefile.inc | 1 + lib/libipfw3/basic/Makefile | 17 ----------------- lib/libipfw3/dummynet/Makefile | 17 ----------------- lib/libipfw3/layer2/Makefile | 17 ----------------- lib/libipfw3/layer4/Makefile | 17 ----------------- lib/libipfw3/nat/Makefile | 17 ----------------- 6 files changed, 1 insertion(+), 85 deletions(-) create mode 100644 lib/libipfw3/Makefile.inc diff --git a/lib/libipfw3/Makefile.inc b/lib/libipfw3/Makefile.inc new file mode 100644 index 0000000000..3352c34a72 --- /dev/null +++ b/lib/libipfw3/Makefile.inc @@ -0,0 +1 @@ +WARNS?= 2 diff --git a/lib/libipfw3/basic/Makefile b/lib/libipfw3/basic/Makefile index 32a8239252..0c84678b38 100644 --- a/lib/libipfw3/basic/Makefile +++ b/lib/libipfw3/basic/Makefile @@ -1,29 +1,12 @@ -SRCDIR= ${.CURDIR}/ - LIB= ipfw3basic SRCS= ipfw3_basic.c INCS= ipfw3_basic.h - -WARNS?= 2 - -LFLAGS+= -YFLAGS+= -CFLAGS+=-DHAVE_CONFIG_H -I${.CURDIR} -I${.OBJDIR} -CFLAGS+=-D_U_="__attribute__((unused))" -DYYBISON -CFLAGS+=-DHAVE_STRUCT_ETHER_ADDR -DHAVE_NET_PFVAR_H .if !defined(NOINET6) CFLAGS+=-DINET6 .endif SHLIB_MAJOR=3 -# -# Magic to grab sources out of src/contrib -# -LAYER2_DISTDIR?=${SRCDIR} -CFLAGS+=-I${LAYER2_DISTDIR} -.PATH: ${LAYER2_DISTDIR} - .include diff --git a/lib/libipfw3/dummynet/Makefile b/lib/libipfw3/dummynet/Makefile index c5ce2752f7..487438abac 100644 --- a/lib/libipfw3/dummynet/Makefile +++ b/lib/libipfw3/dummynet/Makefile @@ -1,29 +1,12 @@ -SRCDIR= ${.CURDIR}/ - LIB= ipfw3dummynet SRCS= ipfw3_dummynet.c INCS= ipfw3_dummynet.h - -WARNS?= 2 - -LFLAGS+= -YFLAGS+= -CFLAGS+=-DHAVE_CONFIG_H -I${.CURDIR} -I${.OBJDIR} -CFLAGS+=-D_U_="__attribute__((unused))" -DYYBISON -CFLAGS+=-DHAVE_STRUCT_ETHER_ADDR -DHAVE_NET_PFVAR_H .if !defined(NOINET6) CFLAGS+=-DINET6 .endif SHLIB_MAJOR=3 -# -# Magic to grab sources out of src/contrib -# -DUMMYNET_DISTDIR?=${SRCDIR} -CFLAGS+=-I${DUMMYNET_DISTDIR} -.PATH: ${DUMMYNET_DISTDIR} - .include diff --git a/lib/libipfw3/layer2/Makefile b/lib/libipfw3/layer2/Makefile index 2f51fbdb64..fdfb635925 100644 --- a/lib/libipfw3/layer2/Makefile +++ b/lib/libipfw3/layer2/Makefile @@ -1,29 +1,12 @@ -SRCDIR= ${.CURDIR}/ - LIB= ipfw3layer2 SRCS= ipfw3_layer2.c INCS= ipfw3_layer2.h - -WARNS?= 2 - -LFLAGS+= -YFLAGS+= -CFLAGS+=-DHAVE_CONFIG_H -I${.CURDIR} -I${.OBJDIR} -CFLAGS+=-D_U_="__attribute__((unused))" -DYYBISON -CFLAGS+=-DHAVE_STRUCT_ETHER_ADDR -DHAVE_NET_PFVAR_H .if !defined(NOINET6) CFLAGS+=-DINET6 .endif SHLIB_MAJOR=3 -# -# Magic to grab sources out of src/contrib -# -LAYER2_DISTDIR?=${SRCDIR} -CFLAGS+=-I${LAYER2_DISTDIR} -.PATH: ${LAYER2_DISTDIR} - .include diff --git a/lib/libipfw3/layer4/Makefile b/lib/libipfw3/layer4/Makefile index ff9ade7a0b..d8369eee4f 100644 --- a/lib/libipfw3/layer4/Makefile +++ b/lib/libipfw3/layer4/Makefile @@ -1,18 +1,8 @@ -SRCDIR= ${.CURDIR}/ - LIB= ipfw3layer4 SRCS= ipfw3_layer4.c INCS= ipfw3_layer4.h - -WARNS?= 2 - -LFLAGS+= -YFLAGS+= -CFLAGS+=-DHAVE_CONFIG_H -I${.CURDIR} -I${.OBJDIR} -CFLAGS+=-D_U_="__attribute__((unused))" -DYYBISON -CFLAGS+=-DHAVE_STRUCT_ETHER_ADDR -DHAVE_NET_PFVAR_H .if !defined(NOINET6) CFLAGS+=-DINET6 .endif @@ -21,11 +11,4 @@ LDADD=-lpcap DPADD=${LIBPCAP} SHLIB_MAJOR=3 -# -# Magic to grab sources out of src/contrib -# -LAYER4_DISTDIR?=${SRCDIR} -CFLAGS+=-I${LAYER4_DISTDIR} -.PATH: ${LAYER4_DISTDIR} - .include diff --git a/lib/libipfw3/nat/Makefile b/lib/libipfw3/nat/Makefile index 74feaec4ed..3a72781fa8 100644 --- a/lib/libipfw3/nat/Makefile +++ b/lib/libipfw3/nat/Makefile @@ -1,29 +1,12 @@ -SRCDIR= ${.CURDIR}/ - LIB= ipfw3nat SRCS= ipfw3_nat.c INCS= ipfw3_nat.h - -WARNS?= 2 - -LFLAGS+= -YFLAGS+= -CFLAGS+=-DHAVE_CONFIG_H -I${.CURDIR} -I${.OBJDIR} -CFLAGS+=-D_U_="__attribute__((unused))" -DYYBISON -CFLAGS+=-DHAVE_STRUCT_ETHER_ADDR -DHAVE_NET_PFVAR_H .if !defined(NOINET6) CFLAGS+=-DINET6 .endif SHLIB_MAJOR=3 -# -# Magic to grab sources out of src/contrib -# -NAT_DISTDIR?=${SRCDIR} -CFLAGS+=-I${NAT_DISTDIR} -.PATH: ${NAT_DISTDIR} - .include -- 2.41.0