r5249 jmb - in /trunk/libparserutils: Makefile Makefile-riscos build/Makefile.config src/Makefile src/charset/Makefile src/utils/Makefile test/Makefile

netsurf at semichrome.net netsurf at semichrome.net
Fri Sep 5 12:17:23 BST 2008


Author: jmb
Date: Fri Sep  5 06:17:23 2008
New Revision: 5249

URL: http://source.netsurf-browser.org?rev=5249&view=rev
Log:
Tidy up CFLAGS/LDFLAGS

Modified:
    trunk/libparserutils/Makefile
    trunk/libparserutils/Makefile-riscos
    trunk/libparserutils/build/Makefile.config
    trunk/libparserutils/src/Makefile
    trunk/libparserutils/src/charset/Makefile
    trunk/libparserutils/src/utils/Makefile
    trunk/libparserutils/test/Makefile

Modified: trunk/libparserutils/Makefile
URL: http://source.netsurf-browser.org/trunk/libparserutils/Makefile?rev=5249&r1=5248&r2=5249&view=diff
==============================================================================
--- trunk/libparserutils/Makefile (original)
+++ trunk/libparserutils/Makefile Fri Sep  5 06:17:23 2008
@@ -20,11 +20,11 @@
 WARNFLAGS := -Wall -Wextra -Wundef -Wpointer-arith -Wcast-align \
 	-Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
 	-Wmissing-declarations -Wnested-externs -Werror -pedantic
-override CFLAGS += -std=c99 -D_BSD_SOURCE -I$(TOP)/include/ $(WARNFLAGS)
+CFLAGS = -std=c99 -D_BSD_SOURCE -I$(TOP)/include/ $(WARNFLAGS)
 RELEASECFLAGS = $(CFLAGS) -DNDEBUG -O2
 DEBUGCFLAGS = $(CFLAGS) -O0 -g
 ARFLAGS := -cru
-override LDFLAGS += -L$(TOP)/
+LDFLAGS = -L$(TOP)/
 
 CPFLAGS :=
 RMFLAGS := -f

Modified: trunk/libparserutils/Makefile-riscos
URL: http://source.netsurf-browser.org/trunk/libparserutils/Makefile-riscos?rev=5249&r1=5248&r2=5249&view=diff
==============================================================================
--- trunk/libparserutils/Makefile-riscos (original)
+++ trunk/libparserutils/Makefile-riscos Fri Sep  5 06:17:23 2008
@@ -23,12 +23,12 @@
 WARNFLAGS := -Wall -Wextra -Wundef -Wpointer-arith -Wcast-align \
 	-Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
 	-Wmissing-declarations -Wnested-externs -Werror -pedantic
-override CFLAGS += -std=c99 -D_BSD_SOURCE -I$(TOP)/include/ $(WARNFLAGS) \
+CFLAGS = -std=c99 -D_BSD_SOURCE -I$(TOP)/include/ $(WARNFLAGS) \
 	-mpoke-function-name
 RELEASECFLAGS = $(CFLAGS) -DNDEBUG -O2
 DEBUGCFLAGS = $(CFLAGS) -O0 -g
 ARFLAGS := -cru
-override LDFLAGS = -L$(TOP)/
+LDFLAGS = -L$(TOP)/
 
 CPFLAGS :=
 RMFLAGS := -f

Modified: trunk/libparserutils/build/Makefile.config
URL: http://source.netsurf-browser.org/trunk/libparserutils/build/Makefile.config?rev=5249&r1=5248&r2=5249&view=diff
==============================================================================
--- trunk/libparserutils/build/Makefile.config (original)
+++ trunk/libparserutils/build/Makefile.config Fri Sep  5 06:17:23 2008
@@ -1,5 +1,5 @@
 # Configuration Makefile fragment
 
 # Use iconv directly in the input filter
-# override CFLAGS += -DWITH_ICONV_FILTER
+# CFLAGS += -DWITH_ICONV_FILTER
 

Modified: trunk/libparserutils/src/Makefile
URL: http://source.netsurf-browser.org/trunk/libparserutils/src/Makefile?rev=5249&r1=5248&r2=5249&view=diff
==============================================================================
--- trunk/libparserutils/src/Makefile (original)
+++ trunk/libparserutils/src/Makefile Fri Sep  5 06:17:23 2008
@@ -32,7 +32,7 @@
 d              := $(DIR)
 
 # Manipulate include paths
-override CFLAGS := $(CFLAGS) -I$(d)
+CFLAGS := $(CFLAGS) -I$(d)
 
 # Sources
 SRCS_$(d) := parserutils.c

Modified: trunk/libparserutils/src/charset/Makefile
URL: http://source.netsurf-browser.org/trunk/libparserutils/src/charset/Makefile?rev=5249&r1=5248&r2=5249&view=diff
==============================================================================
--- trunk/libparserutils/src/charset/Makefile (original)
+++ trunk/libparserutils/src/charset/Makefile Fri Sep  5 06:17:23 2008
@@ -32,7 +32,7 @@
 d              := $(DIR)
 
 # Manipulate include paths
-override CFLAGS := $(CFLAGS) -I$(d)
+CFLAGS := $(CFLAGS) -I$(d)
 
 # Sources
 SRCS_$(d) := aliases.c charset.c codec.c

Modified: trunk/libparserutils/src/utils/Makefile
URL: http://source.netsurf-browser.org/trunk/libparserutils/src/utils/Makefile?rev=5249&r1=5248&r2=5249&view=diff
==============================================================================
--- trunk/libparserutils/src/utils/Makefile (original)
+++ trunk/libparserutils/src/utils/Makefile Fri Sep  5 06:17:23 2008
@@ -32,7 +32,7 @@
 d              := $(DIR)
 
 # Manipulate include paths
-override CFLAGS := $(CFLAGS) -I$(d)
+CFLAGS := $(CFLAGS) -I$(d)
 
 # Sources
 SRCS_$(d) := buffer.c dict.c errors.c rbtree.c stack.c vector.c

Modified: trunk/libparserutils/test/Makefile
URL: http://source.netsurf-browser.org/trunk/libparserutils/test/Makefile?rev=5249&r1=5248&r2=5249&view=diff
==============================================================================
--- trunk/libparserutils/test/Makefile (original)
+++ trunk/libparserutils/test/Makefile Fri Sep  5 06:17:23 2008
@@ -32,7 +32,7 @@
 d              := $(DIR)
 
 # Extend toolchain settings
-override CFLAGS := $(CFLAGS) -I$(TOP)/src/ -I$(d)
+CFLAGS := $(CFLAGS) -I$(TOP)/src/ -I$(d)
 
 # Tests
 TESTS_$(d) := aliases cscodec-8859 cscodec-ext8 cscodec-utf8 cscodec-utf16 \




More information about the netsurf-commits mailing list