Clean up settings of CFLAGS in Makefile's

This commit is contained in:
Thomas Bernard 2012-05-01 11:34:41 +02:00
parent 19d728d9d8
commit a0f540b1f4
3 changed files with 16 additions and 6 deletions

View File

@ -1,6 +1,7 @@
$Id: Changelog.txt,v 1.278 2012/04/30 21:21:32 nanard Exp $ $Id: Changelog.txt,v 1.278 2012/04/30 21:21:32 nanard Exp $
2012/04/30: 2012/04/30:
Clean up settings of CFLAGS in Makefile's
Fix error handling in upnpevents.c (was causing segfault on Solaris !) Fix error handling in upnpevents.c (was causing segfault on Solaris !)
2012/04/26: 2012/04/26:

View File

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.63 2012/04/20 13:50:24 nanard Exp $ # $Id: Makefile,v 1.64 2012/04/30 13:58:31 nanard Exp $
# MiniUPnP project # MiniUPnP project
# http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/ # http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
# Author: Thomas Bernard # Author: Thomas Bernard
@ -15,8 +15,11 @@
# $ CONFIG_OPTIONS="--ipv6 --igd2" make # $ CONFIG_OPTIONS="--ipv6 --igd2" make
# #
CFLAGS = -pipe -Wall -Os -ansi CFLAGS ?= -pipe -Os
#CFLAGS = -pipe -Wall -O -g -DDEBUG -ansi #CFLAGS = -pipe -O -g -DDEBUG
CFLAGS += -ansi
CFLAGS += -Wall
CFLAGS += -W
CC ?= gcc CC ?= gcc
RM = rm -f RM = rm -f
MV = mv MV = mv

View File

@ -1,4 +1,4 @@
# $Id: Makefile.linux,v 1.65 2012/04/24 22:41:52 nanard Exp $ # $Id: Makefile.linux,v 1.67 2012/04/30 21:06:28 nanard Exp $
# MiniUPnP project # MiniUPnP project
# (c) 2006-2012 Thomas Bernard # (c) 2006-2012 Thomas Bernard
# http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/ # http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
@ -20,8 +20,14 @@
# ./configure them and build them then miniupnpd will build using : # ./configure them and build them then miniupnpd will build using :
# $ IPTABLESPATH=/path/to/iptables-1.4.1 make -f Makefile.linux # $ IPTABLESPATH=/path/to/iptables-1.4.1 make -f Makefile.linux
# #
#CFLAGS = -Wall -O -D_GNU_SOURCE -g -DDEBUG -fno-strict-aliasing -Wstrict-prototypes -Wdeclaration-after-statement -ansi #CFLAGS = -O -g -DDEBUG
CFLAGS ?= -Wall -Os -D_GNU_SOURCE -fno-strict-aliasing -Wstrict-prototypes -Wdeclaration-after-statement -ansi CFLAGS ?= -Os
CFLAGS += -fno-strict-aliasing
CFLAGS += -fno-common
CFLAGS += -D_GNU_SOURCE
CFLAGS += -Wall
CFLAGS += -Wextra -Wstrict-prototypes -Wdeclaration-after-statement
CFLAGS += -ansi
CC ?= gcc CC ?= gcc
RM = rm -f RM = rm -f
INSTALL = install INSTALL = install