[dasher] Compile maemo-only source files conditionally on --with-maemo.

[Patrick Welche <pwelche src gnome org>]

commit ab8353596c741ee171e054abdc78f810603579a0
Author: Patrick Welche <prlw1 cam ac uk>
Date:   Wed Mar 30 19:17:15 2011 +0100

    Compile maemo-only source files conditionally on --with-maemo.

 Src/Gtk2/Makefile.am                      |   12 ++++++++----
 Src/Gtk2/dasher_action_keyboard_maemo.cpp |    5 +----
 2 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/Src/Gtk2/Makefile.am b/Src/Gtk2/Makefile.am
index 5e91924..f3bcec3 100644
--- a/Src/Gtk2/Makefile.am
+++ b/Src/Gtk2/Makefile.am
@@ -62,8 +62,6 @@ libdashergtk_la_SOURCES = \
 		dasher_action.h \
 		dasher_action_keyboard.cpp \
 		dasher_action_keyboard.h \
-		dasher_action_keyboard_maemo.cpp \
-		dasher_action_keyboard_maemo.h \
 		dasher_action_script.cpp \
 		dasher_action_script.h \
 		dasher_editor.cpp \
@@ -74,13 +72,19 @@ libdashergtk_la_SOURCES = \
 		dasher_editor_internal.h \
 		dasher_lock_dialogue.cpp \
 		dasher_lock_dialogue.h \
-		dasher_maemo_helper.cpp \
-		dasher_maemo_helper.h \
 		dasher_main.cpp \
 		dasher_main.h \
 		module_settings_window.cpp \
 		module_settings_window.h
 
+if WITH_MAEMO
+libdashergtk_la_SOURCES += \
+		dasher_action_keyboard_maemo.cpp \
+		dasher_action_keyboard_maemo.h \
+		dasher_maemo_helper.cpp \
+		dasher_maemo_helper.h
+endif
+
 libdashergtk_la_LIBADD = @SPEECH_SOURCES@
 libdashergtk_la_DEPENDENCIES = @SPEECH_SOURCES@
 
diff --git a/Src/Gtk2/dasher_action_keyboard_maemo.cpp b/Src/Gtk2/dasher_action_keyboard_maemo.cpp
index b133bc2..0c13175 100644
--- a/Src/Gtk2/dasher_action_keyboard_maemo.cpp
+++ b/Src/Gtk2/dasher_action_keyboard_maemo.cpp
@@ -1,8 +1,7 @@
-// TODO: Make inclusion of this file in build conditional
+// Inclusion of this file in build conditional on WITH_MAEMO
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#ifdef WITH_MAEMO
 
 #include "dasher.h"
 #include "dasher_maemo_helper.h"
@@ -95,5 +94,3 @@ static gboolean dasher_action_keyboard_maemo_execute(DasherAction *pSelf, Dasher
 static const gchar *dasher_action_keyboard_maemo_get_name(DasherAction *pSelf) {
   return _("Enter Text");
 }
-
-#endif