From fa6e1379d0cc8c904c60251eee55d58dabf60784 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@netsurf-browser.org>
Date: Thu, 13 Dec 2012 17:36:38 +0000
Subject: move the cut n pasted -Wuninitialized from Makefile.config alongside
 all the other warning flags in the standard location

---
 Makefile          |  2 +-
 Makefile.defaults | 25 +++++++++++++------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 91f3aac08..a1c6e5dbc 100644
--- a/Makefile
+++ b/Makefile
@@ -400,7 +400,7 @@ endef
 WARNFLAGS = -W -Wall -Wundef -Wpointer-arith \
 	-Wcast-align -Wwrite-strings -Wstrict-prototypes \
 	-Wmissing-prototypes -Wmissing-declarations -Wredundant-decls \
-	-Wnested-externs
+	-Wnested-externs -Wuninitialized
 ifneq ($(GCCVER),2)
   WARNFLAGS += -Wno-unused-parameter 
 endif
diff --git a/Makefile.defaults b/Makefile.defaults
index 5633dd2a2..7e97c6e56 100644
--- a/Makefile.defaults
+++ b/Makefile.defaults
@@ -128,7 +128,7 @@ ifeq ($(TARGET),riscos)
   NETSURF_USE_DRAW_EXPORT := YES
 
   # Optimisation levels
-  CFLAGS += -O2 -Wuninitialized
+  CFLAGS += -O2
 
 endif
 
@@ -166,7 +166,7 @@ ifeq ($(TARGET),gtk)
   NETSURF_GTK_MAJOR := 2
 
   # Optimisation levels
-  CFLAGS += -O2 -Wuninitialized
+  CFLAGS += -O2
 
 endif
 
@@ -182,7 +182,7 @@ ifeq ($(TARGET),monkey)
   NETSURF_USE_ROSPRITE := NO
   NETSURF_USE_HARU_PDF := NO
   NETSURF_USE_LIBICONV_PLUG := NO
-  CFLAGS += -O2 -Wuninitialized
+  CFLAGS += -O2
 endif
 
 # ----------------------------------------------------------------------------
@@ -216,7 +216,7 @@ ifeq ($(TARGET),beos)
   NETSURF_USE_LIBICONV_PLUG := NO
 
   # Optimisation levels
-  CFLAGS += -O2 -Wuninitialized
+  CFLAGS += -O2
 
 endif
 
@@ -260,7 +260,7 @@ ifeq ($(TARGET),amiga)
   NETSURF_USE_AMIGA_CAIRO := AUTO
 
   # Optimisation levels
-  CFLAGS += -O2 -Wuninitialized -gstabs
+  CFLAGS += -O2 -gstabs
 
 endif
 
@@ -269,7 +269,7 @@ endif
 # ----------------------------------------------------------------------------
 ifeq ($(TARGET),framebuffer)
   # Optimisation levels
-  CFLAGS += -O2 -Wuninitialized
+  CFLAGS += -O2
 
   # Framebuffer default surface provider.
   # Valid values are: x, sdl, linux, vnc, able, 
@@ -338,7 +338,7 @@ ifeq ($(TARGET),windows)
   NETSURF_USE_HARU_PDF := NO
 
   # Optimisation levels
-  CFLAGS += -O2 -Wuninitialized
+  CFLAGS += -O2
 
 endif
 
@@ -366,7 +366,7 @@ ifeq ($(TARGET),atari)
   # Enable NetSurf's use of libsvgtiny for displaying SVGs
   # Valid options: YES, NO, AUTO
   NETSURF_USE_NSSVG := AUTO
-  
+
   NETSURF_USE_MNG := NO
 
   # enable true type fonts via freetype2
@@ -387,12 +387,13 @@ ifeq ($(TARGET),atari)
 
   # enable optimizations
   # -O2 is currently broken with m68000 / m68020-60 builds 
-  CFLAGS += -O1 -Wuninitialized
+  CFLAGS += -O1
 
+  # override warning flags removing -Wall
   WARNFLAGS = -W -Wundef -Wpointer-arith \
 		-Wcast-align -Wwrite-strings -Wstrict-prototypes \
 		-Wmissing-prototypes -Wmissing-declarations -Wredundant-decls \
-		-Wnested-externs -Wl,-t
+		-Wnested-externs -Wuninitialized -Wl,-t
 
 endif
 
@@ -420,7 +421,7 @@ ifeq ($(TARGET),cocoa)
   # Enable NetSurf's use of libsvgtiny for displaying SVGs
   # Valid options: YES, NO, AUTO
   NETSURF_USE_NSSVG := AUTO
-  
+
   NETSURF_USE_MNG := NO
   NETSURF_USE_BMP := NO
   NETSURF_USE_GIF := NO
@@ -433,7 +434,7 @@ ifeq ($(TARGET),cocoa)
   SDK_VERSION := $(MACOSX_VERSION)
 
   # Optimisation levels
-  CFLAGS += -O2 -Wuninitialized 
+  CFLAGS += -O2
 
 endif
 
-- 
cgit v1.2.3