Let the build system manage compilation flags

Do not hardcode warning and optimisation flags, otherwise the
main options (i.e. DBG, CPPFLAGS) will not work as expected.

You can still provide specific default by using DBG?=<value>.

Doing so leaves the opportunity to override the setting from the
commandline, while the default value from the build system is
then ignored for that particular package.

When crosscompiling, and using build.sh, adding -V DBG=<value> has
this same effect as make DBG=<value>.

Change-Id: Ic610e4d33b945acad64571e1431f1814291e2d84

diff --git a/lib/libgpio/Makefile b/lib/libgpio/Makefile
index b12822084a6a6039852a783581e327773cc38a80..8c5cb2be3bdc3d1da7d9d6f6af80290897c89174 100644 (file)
--- a/lib/libgpio/Makefile
+++ b/lib/libgpio/Makefile
@@ -1,10 +1,12 @@
-# Makefile for libmthread
+# Makefile for libgpio
 
-CPPFLAGS+= -O1 -Wall -Werror -D_SYSTEM
+CPPFLAGS+= -D_SYSTEM
 
 LIB=   gpio
 
 SRCS=  \
        gpio_omap.c  clkconf.c
 
+WARNS?=        5
+
 .include <bsd.lib.mk>

diff --git a/lib/libmthread/Makefile b/lib/libmthread/Makefile
index c30afa63f2d326cc921cde06e2b6ba278862650e..95d1876d0b533c3c419cde399deddfb1584a4ee6 100644 (file)
--- a/lib/libmthread/Makefile
+++ b/lib/libmthread/Makefile
@@ -1,7 +1,5 @@
 # Makefile for libmthread
 
-CPPFLAGS+= -O1 -Wall -Werror
-
 LIB=   mthread
 
 SRCS=  \
@@ -16,4 +14,6 @@ SRCS= \
        scheduler.c \
        key.c
 
+WARNS?=        5
+
 .include <bsd.lib.mk>

diff --git a/lib/libpadconf/Makefile b/lib/libpadconf/Makefile
index c6d1e92b735b2d647af70a187db4fc461554cbed..1b9d5cb43d8be0fb8a7de2135fce27ed8c770b81 100644 (file)
--- a/lib/libpadconf/Makefile
+++ b/lib/libpadconf/Makefile
@@ -1,10 +1,12 @@
 # Makefile for libpadconf
 
-CPPFLAGS+= -O1 -Wall -Werror -D_SYSTEM
+CPPFLAGS+= -D_SYSTEM
 
 LIB=   padconf
 
 SRCS=  \
        padconf.c 
 
+WARNS?=        5
+
 .include <bsd.lib.mk>

diff --git a/lib/librefuse/Makefile b/lib/librefuse/Makefile
index de640d25987c5efc1afd8fd344ce37a2ae40461d..2b7fd10dca0b47611b096b5e0023ce72bd314ceb 100644 (file)
--- a/lib/librefuse/Makefile
+++ b/lib/librefuse/Makefile
@@ -6,7 +6,7 @@ LIB=            refuse
 LIBDPLIBS+=    puffs   ${.CURDIR}/../libpuffs
 
 .ifdef DEBUG
-FUSE_OPT_DEBUG_FLAGS=  -g -DFUSE_OPT_DEBUG
+FUSE_OPT_DEBUG_FLAGS= -DFUSE_OPT_DEBUG
 .endif
 
 CFLAGS+=       ${FUSE_OPT_DEBUG_FLAGS}
@@ -16,4 +16,6 @@ WARNS=                4
 INCS=           fuse.h fuse_opt.h
 INCSDIR=        /usr/include
 
+WARNS?=        5
+
 .include <bsd.lib.mk>

diff --git a/servers/inet/Makefile b/servers/inet/Makefile
index 6445e03987fc6bb495bf0e168f2e268e7af6dbdb..936b372fb678ab11f158fd7749af21ac98dde4a4 100644 (file)
--- a/servers/inet/Makefile
+++ b/servers/inet/Makefile
@@ -21,6 +21,8 @@ MAN=
 
 BINDIR?= /usr/sbin
 
-CPPFLAGS+=  -I${.CURDIR} -D'ARGS(a)=a' -Wall -Werror
+CPPFLAGS+=  -I${.CURDIR} -D'ARGS(a)=a'
+
+WARNS?=        5
 
 .include <minix.service.mk>

diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index 6bb19769e82e464b33eec3fe5162e0cf9c5b2a72..88a9ec20dcf76e89b3df09a2746a2ee135771a0c 100644 (file)
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -6,13 +6,12 @@ __MINIX=      yes
 
 .if defined(__MINIX)
 .if ${MKSMALL:U} == "yes"
+CPPFLAGS+= -DNDEBUG
 DBG=   -Os
-CFLAGS+= -DNDEBUG
 .endif
 
 unix?=         We run MINIX.
 
-DBG?=  -O
 CPP?=  /usr/lib/cpp
 .endif # defined(__MINIX)
 unix?=         We run NetBSD.