Only build sysctl, vmstat, and related libraries on FreeBSD.

pkelsey · Sep 25, 2014 · 3e18a0e · 3e18a0e
1 parent 0fb47d6
commit 3e18a0e
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/bin/Makefile b/bin/Makefile
@@ -1,5 +1,10 @@
+TOPDIR?=${CURDIR}/..
+include ${TOPDIR}/cflags.mk
 
-SUBDIRS=echo echo++ passive sysctl tproxy vmstat
+SUBDIRS=echo echo++ passive tproxy
+ifeq (${HOST_OS},FreeBSD)
+SUBDIRS+=sysctl vmstat 
+endif
 
 config:
 	for d in $(SUBDIRS); do ( cd $$d; $(MAKE) config ) ; done

diff --git a/bin/passive/Makefile b/bin/passive/Makefile
@@ -5,9 +5,16 @@ PROG=passive
 
 SRCS=passive.c
 
-UINET_LIBS=uinet uinetnv
+UINET_LIBS=uinet
+ifeq (${HOST_OS},FreeBSD)
+UINET_LIBES+=uinetnv
+endif
+
 
-CFLAGS= -I${TOPDIR}/lib/libev -I${TOPDIR}/lib/libnv
+CFLAGS= -I${TOPDIR}/lib/libev
+ifeq (${HOST_OS},FreeBSD)
+CFLAGS+= -I${TOPDIR}/lib/libnv
+endif
 LDADD= -L${UINET_DESTDIR}/lib/ ${TOPDIR}/lib/libev/.libs/libev.a -lm -lpcap
 
 ifndef NO_EXTRACT

diff --git a/cflags.mk b/cflags.mk
@@ -1,3 +1,5 @@
+HOST_OS:=$(shell uname -s)
+
 DEBUG_FLAGS	?= -O -gdwarf-2
 
 UINET_DESTDIR	?= /usr/local/

diff --git a/lib/Makefile b/lib/Makefile
@@ -1,9 +1,11 @@
-
-SUBDIRS=libuinet libev libuinetnv libuinet_memstat libhttp_parser
-
 TOPDIR?=${CURDIR}/..
 include ${TOPDIR}/cflags.mk
 
+SUBDIRS=libuinet libev libhttp_parser
+ifeq (${HOST_OS},FreeBSD)
+SUBDIRS+=libuinetnv libuinet_memstat 
+endif
+
 default: all
 
 config:

diff --git a/mk/kern.pre.mk b/mk/kern.pre.mk
@@ -5,7 +5,6 @@
 include ${TOPDIR}/mk/compiler.mk
 
 MACHINE_CPUARCH:= $(shell uname -m)
-HOST_OS:=$(shell uname -s)
 
 # Convert Mac OS X name to FreeBSD one.
 ifeq (${MACHINE_CPUARCH},x86_64)