plugins: reorder SOURCES conditions to be more readable

change a lot of conditions to be more understandable
add some spacing
remove ifp conditions as disabling plugins can be done in configure
SUBDIRS: concatenate some conditions and add comments

No changes expected (no plugins added / removed) for working targets

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

2 files changed, 123 insertions, 91 deletions

diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES
index 9ea3db051a..8f06522bc3 100644
--- a/apps/plugins/SOURCES
+++ b/apps/plugins/SOURCES
@@ -23,43 +23,118 @@ stopwatch.c
 theme_remove.c
 vbrfix.c
 viewer.c
+md5sum.c
+dice.c
+disktidy.c
+flipit.c
+
+
+
+#ifdef USB_ENABLE_HID
+remote_control.c
+#endif
+
+
+
 #ifdef HAVE_BACKLIGHT
 lamp.c
 #endif /* HAVE_BACKLIGHT */
-#ifndef SIMULATOR
-battery_bench.c
-firmware_flash.c
-#endif /* SIMULATOR */
+
+
+
+#if CONFIG_CODEC == SWCODEC
+#if defined(HAVE_RECORDING) && (defined(HAVE_LINE_IN) || defined(HAVE_MIC_IN))
+pitch_detector.c
+#endif
+
+mp3_encoder.c
+wav2wv.c
+#endif /* CONFIG_CODEC */
+
+
+#if CONFIG_RTC
+alarmclock.c
+#endif /* CONFIG_RTC */
+
+
+
+/* Platform-specific */
+#if defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES)
+iriverify.c
+#endif
+
+
+
+#ifndef SIMULATOR /* those plugins only run on hardware */
+
+/* Overlay loaders */
+
+#if (MEMORYSIZE <= 8)
+chessbox.c
+#if CONFIG_KEYPAD == RECORDER_PAD
+rockboy.c
+#endif
+zxbox.c
+#endif
+
+/* overlay loader for Goban */
+#if (PLUGIN_BUFFER_SIZE < 0x10000)
+lua.c
+goban.c
+pictureflow.c
+#endif
+
+
+#if CONFIG_CODEC != SWCODEC
+
+#if defined(HAVE_LCD_BITMAP)
+splitedit.c
+#endif
+
+#if CONFIG_LCD == LCD_SSD1815
+video.c
+#endif
+
+#endif /* HWCODEC */
+
+
+#if defined(ARCHOS_PLAYER) || defined(ARCHOS_RECORDER) || \
+    defined(ARCHOS_FMRECORDER) || defined(ARCHOS_RECORDERV2)
+alpine_cdc.c
+#endif
+
+#if defined(IRIVER_H100_SERIES)
+iriver_flash.c
+#endif
+
 #if (CONFIG_CPU == SH7034)
 rockbox_flash.c
 #endif /* CONFIG_CPU */
 
-#if defined(IPOD_NANO2G) && !defined(SIMULATOR)
-crypt_firmware.c
-#endif
+battery_bench.c
+firmware_flash.c
 
-#if (CONFIG_CODEC == SWCODEC) && defined(HAVE_RECORDING) && \
-    (defined(HAVE_LINE_IN) || defined(HAVE_MIC_IN))
-pitch_detector.c
+#if defined(IPOD_NANO2G)
+crypt_firmware.c
 #endif
 
-#if (CONFIG_CODEC == SWCODEC) || !defined(SIMULATOR)
+#if (CONFIG_CODEC == SWCODEC)
 metronome.c
 #endif
 
-#if ((CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)) && !defined(SIMULATOR)
+#if ((CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F))
 wavplay.c
 #endif
-#if (CONFIG_CODEC == MAS3587F) && !defined(SIMULATOR)
+#if (CONFIG_CODEC == MAS3587F)
 wavrecord.c
 #endif
 
-#ifndef IRIVER_IFP7XX_SERIES       /* Temporarily disable plugins for iFP7xx */
-dice.c
-disktidy.c
-flipit.c
+#endif /* SIMULATOR */
+
+
+
+#ifdef HAVE_LCD_BITMAP             /* Not for the Archos Player */
 
-#ifdef HAVE_LCD_BITMAP             /* Not for the Player */
 boomshine.lua
 rockblox1d.c
 brickmania.c
@@ -69,12 +144,8 @@ mazezam.c
 text_editor.c
 wavview.c
 robotfindskitten.c
-
-#ifdef HAVE_LCD_COLOR
-clix.c
-ppmviewer.c
-codebuster.c
-#endif
+xobox.c
+spacerocks.c
 
 /* Plugins needing the grayscale lib on low-depth LCDs */
 fire.c
@@ -99,87 +170,46 @@ solitaire.c
 sokoban.c
 star.c
 starfield.c
-#if (CONFIG_LCD == LCD_SSD1815) && (CONFIG_CODEC != SWCODEC) && \
-    !defined(SIMULATOR)
-video.c
-#endif
 vu_meter.c
 wormlet.c
 
-#if CONFIG_RTC
-alarmclock.c
-#endif /* CONFIG_RTC */
-
-#if (MEMORYSIZE <= 8) && !defined(SIMULATOR) /* loaders, only needed for Archos */
-chessbox.c
-#if CONFIG_KEYPAD == RECORDER_PAD
-rockboy.c
-#endif
-zxbox.c
-#endif
-
-/* overlay loader for Goban */
-#if (PLUGIN_BUFFER_SIZE < 0x10000) && !defined(SIMULATOR)
-lua.c
-goban.c
-pictureflow.c
+#ifdef HAVE_LCD_COLOR
+clix.c
+ppmviewer.c
+codebuster.c
 #endif
 
-/* not support recorder models for now */
 #if (LCD_WIDTH > 112) && (LCD_HEIGHT > 64)
 fireworks.c
 #endif
-xobox.c
-spacerocks.c
+
 #if LCD_DEPTH >= 16
 rockpaint.c
 #endif
 
 rocklife.c
+
 #endif /* HAVE_LCD_BITMAP */
 
-#ifdef HAVE_LCD_CHARCELLS          /* Player model only */
+#ifdef HAVE_LCD_CHARCELLS          /* Archos Player model only */
 euroconverter.c
 nim.c
 #endif /* HAVE_LCD_CHARCELLS */
 
-#if CONFIG_CODEC == SWCODEC        /* software codec platforms */
-mp3_encoder.c
-wav2wv.c
-#else                              /* hardware codec platforms */
-#if !defined(ARCHOS_ONDIOSP) && !defined(ARCHOS_ONDIOFM)
-    /* not for Ondio, has no remote control pin */
-alpine_cdc.c
-#endif
-#if defined(HAVE_LCD_BITMAP) && !defined(SIMULATOR)
-splitedit.c
-#endif
-#endif /* CONFIG_CODEC */
+
 
 #if LCD_DEPTH > 1                  /* non-mono bitmap targets */
-matrix.c
-#endif
 
-/* Platform-specific plugins */
-#if defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES)
-iriverify.c
-#endif
-#if defined(IRIVER_H100_SERIES) && !defined(SIMULATOR)
-iriver_flash.c
-#endif
+matrix.c
 
-#endif /* iFP7xx */
-#if (LCD_WIDTH > 138) && (LCD_DEPTH > 1)
-/* Built for bitmap targets except H10 5/6gb, Archoses, iPod mini, mrobe100 and ifp*/
+#if (LCD_WIDTH > 138)
 invadrox.c
 superdom.c
 #endif
 
-md5sum.c
+#endif /* LCD_DEPTH > 1 */
+
 
-#ifdef USB_ENABLE_HID
-remote_control.c
-#endif
 
 #ifdef HAVE_TEST_PLUGINS /* enable in advanced build options */
 #ifdef HAVE_ADJUSTABLE_CPU_FREQ
diff --git a/apps/plugins/SUBDIRS b/apps/plugins/SUBDIRS
index 1c7f969c02..2a88e7d1b1 100644
--- a/apps/plugins/SUBDIRS
+++ b/apps/plugins/SUBDIRS
@@ -1,5 +1,3 @@
-#if !defined(IRIVER_IFP7XX_SERIES)
-
 /* For all targets */
 shortcuts
 
@@ -10,32 +8,38 @@ clock
 #endif
 
 #if (CONFIG_KEYPAD == RECORDER_PAD) || defined(HAVE_LCD_COLOR) \
- || defined(IRIVER_H100_SERIES) || defined(IAUDIO_M5)
+ || defined(IRIVER_H100_SERIES) || defined(IAUDIO_M5) /* FIXME */
 rockboy
 #endif
 
 /* For all targets with a bitmap display */
 #ifdef HAVE_LCD_BITMAP
+
 #ifdef HAVE_TAGCACHE
 pictureflow
 #endif
+
 #if (CONFIG_CODEC == SWCODEC)
 fft
 #endif
+
 chessbox
 fractals
 imageviewer
 sudoku
 reversi
 goban
+
 /* setjmp/longjmp are not implemented on sh */
 #if (CONFIG_CPU != SH7034)
 frotz
 #endif
+
 #ifndef OLYMPUS_MROBE_500
 zxbox
 #endif
-#endif
+
+#endif /* HAVE_LCD_BITMAP */
 
 /* For all big enough colour screens, iriver H1x0 and iAudio M5 */
 #if defined(HAVE_LCD_COLOR) && LCD_HEIGHT > 96\
@@ -43,32 +47,30 @@ zxbox
 pacbox
 #endif
 
-/* For all the color targets */
 #if (defined(HAVE_LCD_COLOR) || defined(MROBE_100) || \
-    (LCD_DEPTH == 2) && !defined(ARCHOS_AV300)) && (MEMORYSIZE > 2)
-#ifndef RB_PROFILE
+    (LCD_DEPTH == 2) && !defined(ARCHOS_AV300)) && (MEMORYSIZE > 2) && \
+    !defined(RB_PROFILE)
 doom
 #endif
-#endif
 
 /* For all the swcodec targets */
 #if CONFIG_CODEC == SWCODEC
+
 midi
+
 /* beatbox */
 #if defined(IRIVER_H300_SERIES) || defined(IRIVER_H100_SERIES)
 /* PDBox is confirmed to run on these player models. */
 pdbox
 #endif
-#ifndef RB_PROFILE
-#if MEMORYSIZE > 2  /* mpegplayer allocates at least 2MB of RAM */
+
+#if !defined(RB_PROFILE) && MEMORYSIZE > 2  /* mpegplayer allocates at least 2MB of RAM */
 mpegplayer
 #endif
-#endif
-#endif
+
+#endif /* CONFIG_CODEC == SWCODEC */
 
 /* Lua needs at least 160 KB to work in */
 #if (PLUGIN_BUFFER_SIZE >= 0x80000)
 lua
 #endif
-
-#endif /* IRIVER_IFP7XX_SERIES */