Change some ifdefs for the recent backdrop changes (fixes the yellow builds) and move the backdrop files.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13265 a1c6a512-1295-4272-9138-f99709370657

14 files changed, 33 insertions, 23 deletions

diff --git a/apps/SOURCES b/apps/SOURCES
index 1dabb12d2b..9467914bca 100644
--- a/apps/SOURCES
+++ b/apps/SOURCES
@@ -62,6 +62,10 @@ gui/yesno.c
 gui/wps_debug.c
 gui/wps_parser.c
 
+#if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1))
+gui/backdrop.c
+#endif
+
 #ifdef HAVE_LCD_CHARCELLS
 player/icons.c
 player/keyboard.c
@@ -71,9 +75,6 @@ recorder/bmp.c
 recorder/icons.c
 recorder/keyboard.c
 recorder/peakmeter.c
-#if LCD_DEPTH > 1
-recorder/backdrop.c
-#endif
 #ifdef HAVE_LCD_COLOR
 gui/color_picker.c
 #endif
diff --git a/apps/bookmark.c b/apps/bookmark.c
index cb0dbe718a..a878dedb13 100644
--- a/apps/bookmark.c
+++ b/apps/bookmark.c
@@ -51,7 +51,7 @@
 #include "splash.h"
 #include "yesno.h"
 
-#if LCD_DEPTH > 1
+#if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1))
 #include "backdrop.h"
 #endif
 
diff --git a/apps/filetree.c b/apps/filetree.c
index 4a8e9c1868..7073e59f1b 100644
--- a/apps/filetree.c
+++ b/apps/filetree.c
@@ -50,7 +50,7 @@
 #include "radio.h"
 #endif
 
-#if LCD_DEPTH > 1
+#if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1))
 #include "backdrop.h"
 #endif
 
diff --git a/apps/recorder/backdrop.c b/apps/gui/backdrop.c
index 0d023602be..0d023602be 100644
--- a/apps/recorder/backdrop.c
+++ b/apps/gui/backdrop.c
diff --git a/apps/recorder/backdrop.h b/apps/gui/backdrop.h
index c930a87433..c930a87433 100644
--- a/apps/recorder/backdrop.h
+++ b/apps/gui/backdrop.h
diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c
index 7f84be613b..5043b33ec0 100644
--- a/apps/gui/gwps-common.c
+++ b/apps/gui/gwps-common.c
@@ -49,13 +49,14 @@
 #include "bmp.h"
 #include "atoi.h"
 #endif
-#if LCD_DEPTH > 1
-#include "backdrop.h"
-#endif
 #include "dsp.h"
 #include "action.h"
 #include "cuesheet.h"
 
+#if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1))
+#include "backdrop.h"
+#endif
+
 #define FF_REWIND_MAX_PERCENT 3 /* cap ff/rewind step size at max % of file */ 
                                 /* 3% of 30min file == 54s step size */
 #define MIN_FF_REWIND_STEP 500
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c
index 97f3b4dbbc..d8b2751847 100644
--- a/apps/gui/gwps.c
+++ b/apps/gui/gwps.c
@@ -55,12 +55,13 @@
 #include "playback.h"
 #include "splash.h"
 #include "cuesheet.h"
-#if LCD_DEPTH > 1
-#include "backdrop.h"
-#endif
 #include "ata_idle_notify.h"
 #include "root_menu.h"
 
+#if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1))
+#include "backdrop.h"
+#endif
+
 /* currently only on wps_state is needed */
 struct wps_state wps_state;
 struct gui_wps gui_wps[NB_SCREENS];
diff --git a/apps/gui/wps_parser.c b/apps/gui/wps_parser.c
index 2b5d1bb321..6d8078aab9 100644
--- a/apps/gui/wps_parser.c
+++ b/apps/gui/wps_parser.c
@@ -30,9 +30,10 @@
 
 #ifdef HAVE_LCD_BITMAP
 #include "bmp.h"
-#if LCD_DEPTH > 1
-#include "backdrop.h"
 #endif
+
+#if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1))
+#include "backdrop.h"
 #endif
 
 #define WPS_DEFAULTCFG WPS_DIR "/rockbox_default.wps"
diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c
index 9f6b2be624..18506e7304 100644
--- a/apps/menus/display_menu.c
+++ b/apps/menus/display_menu.c
@@ -29,7 +29,6 @@
 #include "tree.h"
 #include "list.h"
 #ifdef HAVE_LCD_BITMAP
-#include "backdrop.h"
 #include "peakmeter.h"
 #endif
 #include "talk.h"
@@ -37,6 +36,10 @@
 #include "lcd.h"
 #include "lcd-remote.h"
 
+#if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1))
+#include "backdrop.h"
+#endif
+
 
 #ifdef HAVE_BACKLIGHT
 int filterfirstkeypress_callback(int action,const struct menu_item_ex *this_item)
diff --git a/apps/onplay.c b/apps/onplay.c
index 6314bd932c..0bd2b01c1c 100644
--- a/apps/onplay.c
+++ b/apps/onplay.c
@@ -50,9 +50,6 @@
 #include "action.h"
 #include "splash.h"
 #include "yesno.h"
-#if LCD_DEPTH > 1
-#include "backdrop.h"
-#endif
 #ifdef HAVE_LCD_BITMAP
 #include "icons.h"
 #endif
@@ -67,6 +64,10 @@
 #include "tagtree.h"
 #endif
 
+#if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1))
+#include "backdrop.h"
+#endif
+
 static int context;
 static char* selected_file = NULL;
 static int selected_file_attr = 0;
diff --git a/apps/root_menu.c b/apps/root_menu.c
index ebb13ecb92..5f16a0ecb8 100644
--- a/apps/root_menu.c
+++ b/apps/root_menu.c
@@ -32,12 +32,13 @@
 #include "rolo.h"
 #include "powermgmt.h"
 #include "power.h"
+#include "talk.h"
+#include "audio.h"
 
-#if LCD_DEPTH > 1
+#if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1))
 #include "backdrop.h"
 #endif
-#include "talk.h"
-#include "audio.h"
+
 
 /* gui api */
 #include "list.h"
diff --git a/apps/screens.c b/apps/screens.c
index 82ae490d75..a9f84be686 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -72,7 +72,7 @@
 #include "dsp.h"
 #endif
 
-#ifdef HAVE_LCD_COLOR
+#if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1))
 #include "backdrop.h"
 #endif
 
diff --git a/apps/settings.c b/apps/settings.c
index ba4a98c4e2..35a063bf96 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -61,7 +61,8 @@
 #include "splash.h"
 #include "list.h"
 #include "settings_list.h"
-#if LCD_DEPTH > 1
+
+#if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1))
 #include "backdrop.h"
 #endif
 
diff --git a/apps/tree.c b/apps/tree.c
index b847a7f112..03683dbce7 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -81,7 +81,7 @@
 
 #include "root_menu.h"
 
-#if LCD_DEPTH > 1
+#if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1))
 #include "backdrop.h"
 #endif