From 85c2cf280c3f4371a509c62bd32934112650aa75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Terje=20Bergstr=C3=B6m?= <terjeb@users.sourceforge.net>
Date: Mon, 12 Mar 2007 06:27:03 +0000
Subject: [PATCH] * Fixed building for Maemo. It was forgetting all CFLAGS
 except the Maemo specific ones. Now it only appends the Maemo flags.

---
 Makefile | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 51513eb41..96de3e29b 100644
--- a/Makefile
+++ b/Makefile
@@ -82,6 +82,9 @@ NOSOUNDFLAG=__SOUND
 
 NOSVGFLAG=__SVG
 
+# Maemo flag
+
+MAEMOFLAG=
 
 # Where to find cursor shape XBMs
 
@@ -116,7 +119,8 @@ DEFS=-DDATA_PREFIX=\"$(DATA_PREFIX)/\" \
 	-D$(NOSOUNDFLAG) -D$(NOSVGFLAG) -DDOC_PREFIX=\"$(DOC_PREFIX)/\" \
 	-DLOCALEDIR=\"$(LOCALE_PREFIX)/\" -DCONFDIR=\"$(CONFDIR)/\" \
 	-DVER_VERSION=\"$(VER_VERSION)\" \
-	-DVER_DATE=\"$(VER_DATE)\"
+	-DVER_DATE=\"$(VER_DATE)\" \
+	-D$(MAEMOFLAG)
 
 DEBUG_FLAGS=
 #DEBUG_FLAGS=-g
@@ -237,8 +241,10 @@ win32:
 
 nokia770:
 	make \
-		DATA_PREFIX=/var/lib/install/usr/share/tuxpaint \
-		CFLAGS="-DNOKIA_770"
+		DATA_PREFIX=/usr/share/tuxpaint \
+		SVG_LIB= SVG_CFLAGS= NOSVGFLAG=NOSVG \
+		MAEMOFLAG=NOKIA_770
+		
 
 # "make install" installs all of the various parts
 # (depending on the *PREFIX variables at the top, you probably need