From bd21a62089e1fbcd80ac7888ce2b712caf5cf0ca Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Fri, 5 Sep 2008 11:17:23 +0000 Subject: Tidy up CFLAGS/LDFLAGS svn path=/trunk/libparserutils/; revision=5249 --- Makefile | 4 ++-- Makefile-riscos | 4 ++-- build/Makefile.config | 2 +- src/Makefile | 2 +- src/charset/Makefile | 2 +- src/utils/Makefile | 2 +- test/Makefile | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index e4de9b9..680b2f3 100644 --- a/Makefile +++ b/Makefile @@ -20,11 +20,11 @@ GENHTML := genhtml 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 diff --git a/Makefile-riscos b/Makefile-riscos index dbbe809..dff3dd3 100644 --- a/Makefile-riscos +++ b/Makefile-riscos @@ -23,12 +23,12 @@ GENHTML := echo 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 diff --git a/build/Makefile.config b/build/Makefile.config index f7d1272..5cdc730 100644 --- a/build/Makefile.config +++ b/build/Makefile.config @@ -1,5 +1,5 @@ # Configuration Makefile fragment # Use iconv directly in the input filter -# override CFLAGS += -DWITH_ICONV_FILTER +# CFLAGS += -DWITH_ICONV_FILTER diff --git a/src/Makefile b/src/Makefile index bb6c585..8d037e6 100644 --- a/src/Makefile +++ b/src/Makefile @@ -32,7 +32,7 @@ dirstack_$(sp) := $(d) d := $(DIR) # Manipulate include paths -override CFLAGS := $(CFLAGS) -I$(d) +CFLAGS := $(CFLAGS) -I$(d) # Sources SRCS_$(d) := parserutils.c diff --git a/src/charset/Makefile b/src/charset/Makefile index fc34d7c..1312d19 100644 --- a/src/charset/Makefile +++ b/src/charset/Makefile @@ -32,7 +32,7 @@ dirstack_$(sp) := $(d) d := $(DIR) # Manipulate include paths -override CFLAGS := $(CFLAGS) -I$(d) +CFLAGS := $(CFLAGS) -I$(d) # Sources SRCS_$(d) := aliases.c charset.c codec.c diff --git a/src/utils/Makefile b/src/utils/Makefile index 93a8db5..c786a09 100644 --- a/src/utils/Makefile +++ b/src/utils/Makefile @@ -32,7 +32,7 @@ dirstack_$(sp) := $(d) 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 diff --git a/test/Makefile b/test/Makefile index a8177be..73b7659 100644 --- a/test/Makefile +++ b/test/Makefile @@ -32,7 +32,7 @@ dirstack_$(sp) := $(d) 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 \ -- cgit v1.2.3