Rockbox

This is the bug/patch tracker for Rockbox. Click here for more information.

Quick links: Bugs · Patches · Rockbox frontpage

Tasklist

FS#9534 - Unified makefile

Attached to Project: Rockbox
Opened by Björn Stenberg (zagor) - Friday, 07 November 2008, 17:05 GMT+2
Last edited by Björn Stenberg (zagor) - Thursday, 20 November 2008, 12:38 GMT+2
Task Type Patches
Category Build environment
Status Closed
Assigned To No-one
Player Type All players
Severity Low
Priority Normal
Reported Version Daily build (which?)
Due in Version Undecided
Due Date Undecided
Percent Complete 100%
Private No

Details

Here's a snapshot of my "unified makefile" work in progress.

I'm not asking for bug reports. I am far from done. If you have opinions about the concept as such, though, feel free to comment.

The current state is that it builds the core completely (no plugins or codecs) and links it fine on ipod video, but nothing else.

If you want to play with other targets, remove/comment out the STARTUP(crt0.o) line in the app.lds file for that target.
This task depends upon

Closed by  Björn Stenberg (zagor)
Thursday, 20 November 2008, 12:38 GMT+2
Reason for closing:  Accepted
Comment by Björn Stenberg (zagor) - Monday, 10 November 2008, 17:02 GMT+2
One step further: Now builds single-file plugins as well, with plugin-specific compiler flags.
   unified_make.patch (68.2 KiB)
 tools/configure                             |  193 +++++++------------------
 tools/rules.make                            |   49 ++++++
 tools/root.make                             |  209 ++++++++++++++++++++++++++++
 tools/tools.make                            |   25 +++
 apps/plugins/xobox.c                        |    2 
 apps/plugins/test_resize.c                  |    4 
 apps/plugins/keybox.c                       |    2 
 apps/plugins/sliding_puzzle.c               |    2 
 apps/plugins/plasma.c                       |    6 
 apps/plugins/random_folder_advance_config.c |    2 
 apps/plugins/mandelbrot.c                   |    4 
 apps/plugins/maze.c                         |    2 
 apps/plugins/wavrecord.c                    |    2 
 apps/plugins/oscilloscope.c                 |    6 
 apps/plugins/euroconverter.c                |    2 
 apps/plugins/video.c                        |    2 
 apps/plugins/zxbox.c                        |    2 
 apps/plugins/fireworks.c                    |    4 
 apps/plugins/plugins.make                   |   41 +++++
 apps/plugins/starfield.c                    |    2 
 apps/plugins/ppmviewer.c                    |    2 
 apps/plugins/bitmaps/native/SOURCES         |   42 ++---
 apps/plugins/bitmaps/pluginbitmaps.make     |   24 +++
 apps/plugins/chessbox.c                     |    2 
 apps/plugins/test_sampr.c                   |    2 
 apps/plugins/rockblox.c                     |    6 
 apps/plugins/fire.c                         |    8 -
 apps/plugins/solitaire.c                    |    6 
 apps/plugins/rocklife.c                     |    4 
 apps/plugins/pictureflow.c                  |    8 -
 apps/plugins/dice.c                         |    4 
 apps/plugins/bounce.c                       |    2 
 apps/plugins/cube.c                         |    8 -
 apps/plugins/greyscale.c                    |    4 
 apps/plugins/vu_meter.c                     |    2 
 apps/plugins/snow.c                         |    2 
 apps/plugins/test_disk.c                    |    4 
 apps/plugins/lamp.c                         |    2 
 apps/plugins/jackpot.c                      |    4 
 apps/plugins/spacerocks.c                   |    4 
 apps/plugins/logo.c                         |    2 
 apps/plugins/brickmania.c                   |    4 
 apps/plugins/chopper.c                      |    6 
 apps/plugins/viewer.c                       |    4 
 apps/plugins/mazezam.c                      |    8 -
 apps/plugins/metronome.c                    |    2 
 apps/plugins/rockboy.c                      |    2 
 apps/plugins/demystify.c                    |    4 
 apps/plugins/bubbles.c                      |    6 
 apps/plugins/mosaique.c                     |    2 
 apps/plugins/test_fps.c                     |    4 
 apps/plugins/robotfindskitten.c             |    2 
 apps/plugins/jewels.c                       |    2 
 apps/plugins/wormlet.c                      |    4 
 apps/plugins/invadrox.c                     |    4 
 apps/plugins/rockpaint.c                    |    1 
 apps/plugins/text_editor.c                  |    2 
 apps/plugins/credits.c                      |    2 
 apps/lang/lang.make                         |   25 +++
 apps/bitmaps/bitmaps.make                   |   31 ++++
 apps/apps.make                              |   10 +
 apps/codecs/libspeex/libspeex.make          |   20 ++
 apps/codecs/libspeex/cb_search.c            |    6 
 apps/codecs/libspeex/ltp.c                  |   11 +
 apps/codecs/libspeex/filters.c              |    3 
 apps/codecs/libspeex/rockbox.h              |    9 +
 apps/codecs/libspeex/ltp_arm4.h             |    1 
 apps/codecs/libspeex/lsp.c                  |    1 
 apps/codecs/libspeex/stereo.c               |    1 
 apps/codecs/libspeex/speex_callbacks.c      |   11 +
 firmware/target/arm/ipod/app.lds            |    2 
 firmware/firmware.make                      |   22 ++
 72 files changed, 662 insertions(+), 253 deletions(-)

Comment by Björn Stenberg (zagor) - Tuesday, 11 November 2008, 11:15 GMT+2
Added codec libraries.
   unified_make3.patch (69.5 KiB)
 tools/configure                             |  193 +++++++------------------
 tools/rules.make                            |   52 ++++++
 tools/root.make                             |  210 ++++++++++++++++++++++++++++
 tools/tools.make                            |   33 ++++
 apps/lang/lang.make                         |   25 +++
 apps/plugins/xobox.c                        |    2 
 apps/plugins/test_resize.c                  |    4 
 apps/plugins/keybox.c                       |    2 
 apps/plugins/sliding_puzzle.c               |    2 
 apps/plugins/plasma.c                       |    6 
 apps/plugins/random_folder_advance_config.c |    2 
 apps/plugins/mandelbrot.c                   |    4 
 apps/plugins/maze.c                         |    2 
 apps/plugins/wavrecord.c                    |    2 
 apps/plugins/oscilloscope.c                 |    6 
 apps/plugins/euroconverter.c                |    2 
 apps/plugins/video.c                        |    2 
 apps/plugins/zxbox.c                        |    2 
 apps/plugins/fireworks.c                    |    4 
 apps/plugins/plugins.make                   |   41 +++++
 apps/plugins/starfield.c                    |    2 
 apps/plugins/ppmviewer.c                    |    2 
 apps/plugins/bitmaps/native/SOURCES         |   42 ++---
 apps/plugins/bitmaps/pluginbitmaps.make     |   24 +++
 apps/plugins/chessbox.c                     |    2 
 apps/plugins/test_sampr.c                   |    2 
 apps/plugins/rockblox.c                     |    6 
 apps/plugins/fire.c                         |    8 -
 apps/plugins/solitaire.c                    |    6 
 apps/plugins/rocklife.c                     |    4 
 apps/plugins/pictureflow.c                  |    8 -
 apps/plugins/dice.c                         |    4 
 apps/plugins/bounce.c                       |    2 
 apps/plugins/cube.c                         |    8 -
 apps/plugins/greyscale.c                    |    4 
 apps/plugins/vu_meter.c                     |    2 
 apps/plugins/snow.c                         |    2 
 apps/plugins/test_disk.c                    |    4 
 apps/plugins/lamp.c                         |    2 
 apps/plugins/jackpot.c                      |    4 
 apps/plugins/spacerocks.c                   |    4 
 apps/plugins/logo.c                         |    2 
 apps/plugins/brickmania.c                   |    4 
 apps/plugins/chopper.c                      |    6 
 apps/plugins/viewer.c                       |    4 
 apps/plugins/mazezam.c                      |    8 -
 apps/plugins/metronome.c                    |    2 
 apps/plugins/rockboy.c                      |    2 
 apps/plugins/demystify.c                    |    4 
 apps/plugins/bubbles.c                      |    6 
 apps/plugins/mosaique.c                     |    2 
 apps/plugins/test_fps.c                     |    4 
 apps/plugins/robotfindskitten.c             |    2 
 apps/plugins/jewels.c                       |    2 
 apps/plugins/wormlet.c                      |    4 
 apps/plugins/invadrox.c                     |    4 
 apps/plugins/rockpaint.c                    |    1 
 apps/plugins/text_editor.c                  |    2 
 apps/plugins/credits.c                      |    2 
 apps/bitmaps/bitmaps.make                   |   31 ++++
 apps/apps.make                              |   10 +
 apps/codecs/ape.c                           |    1 
 apps/codecs/libspeex/libspeex.make          |   20 ++
 apps/codecs/libspeex/cb_search.c            |    6 
 apps/codecs/libspeex/ltp.c                  |   11 +
 apps/codecs/libspeex/filters.c              |    3 
 apps/codecs/libspeex/rockbox.h              |    9 +
 apps/codecs/libspeex/ltp_arm4.h             |    1 
 apps/codecs/libspeex/lsp.c                  |    1 
 apps/codecs/libspeex/stereo.c               |    1 
 apps/codecs/libspeex/speex_callbacks.c      |   11 +
 apps/codecs/libspc/spc_codec.h              |    2 
 firmware/target/arm/ipod/app.lds            |    2 
 firmware/firmware.make                      |   22 ++
 74 files changed, 676 insertions(+), 254 deletions(-)

Comment by Björn Stenberg (zagor) - Tuesday, 11 November 2008, 16:09 GMT+2
Ipod video now compiles completely. Plugins, codecs and all.
   unified_make4.patch (70.7 KiB)
 tools/configure                             |  193 +++++++------------------
 tools/rules.make                            |   52 ++++++
 tools/root.make                             |  211 ++++++++++++++++++++++++++++
 tools/tools.make                            |   33 ++++
 apps/lang/lang.make                         |   25 +++
 apps/plugins/xobox.c                        |    2 
 apps/plugins/test_resize.c                  |    4 
 apps/plugins/keybox.c                       |    2 
 apps/plugins/sliding_puzzle.c               |    2 
 apps/plugins/plasma.c                       |    6 
 apps/plugins/random_folder_advance_config.c |    2 
 apps/plugins/mandelbrot.c                   |    4 
 apps/plugins/maze.c                         |    2 
 apps/plugins/wavrecord.c                    |    2 
 apps/plugins/oscilloscope.c                 |    6 
 apps/plugins/euroconverter.c                |    2 
 apps/plugins/video.c                        |    2 
 apps/plugins/zxbox.c                        |    2 
 apps/plugins/fireworks.c                    |    4 
 apps/plugins/plugins.make                   |   46 ++++++
 apps/plugins/starfield.c                    |    2 
 apps/plugins/ppmviewer.c                    |    2 
 apps/plugins/bitmaps/native/SOURCES         |   42 ++---
 apps/plugins/bitmaps/pluginbitmaps.make     |   24 +++
 apps/plugins/chessbox.c                     |    2 
 apps/plugins/test_sampr.c                   |    2 
 apps/plugins/rockblox.c                     |    6 
 apps/plugins/fire.c                         |    8 -
 apps/plugins/solitaire.c                    |    6 
 apps/plugins/rocklife.c                     |    4 
 apps/plugins/pictureflow.c                  |    8 -
 apps/plugins/dice.c                         |    4 
 apps/plugins/bounce.c                       |    2 
 apps/plugins/cube.c                         |    8 -
 apps/plugins/greyscale.c                    |    4 
 apps/plugins/vu_meter.c                     |    2 
 apps/plugins/snow.c                         |    2 
 apps/plugins/test_disk.c                    |    4 
 apps/plugins/lamp.c                         |    2 
 apps/plugins/jackpot.c                      |    4 
 apps/plugins/spacerocks.c                   |    4 
 apps/plugins/logo.c                         |    2 
 apps/plugins/brickmania.c                   |    4 
 apps/plugins/chopper.c                      |    6 
 apps/plugins/viewer.c                       |    4 
 apps/plugins/mazezam.c                      |    8 -
 apps/plugins/metronome.c                    |    2 
 apps/plugins/rockboy.c                      |    2 
 apps/plugins/demystify.c                    |    4 
 apps/plugins/bubbles.c                      |    6 
 apps/plugins/mosaique.c                     |    2 
 apps/plugins/test_fps.c                     |    4 
 apps/plugins/robotfindskitten.c             |    2 
 apps/plugins/jewels.c                       |    2 
 apps/plugins/wormlet.c                      |    4 
 apps/plugins/invadrox.c                     |    4 
 apps/plugins/rockpaint.c                    |    1 
 apps/plugins/text_editor.c                  |    2 
 apps/plugins/credits.c                      |    2 
 apps/bitmaps/bitmaps.make                   |   31 ++++
 apps/apps.make                              |   10 +
 apps/codecs/ape.c                           |    1 
 apps/codecs/libspeex/libspeex.make          |   45 +++++
 apps/codecs/libspeex/cb_search.c            |    6 
 apps/codecs/libspeex/ltp.c                  |   11 +
 apps/codecs/libspeex/filters.c              |    3 
 apps/codecs/libspeex/rockbox.h              |    9 +
 apps/codecs/libspeex/ltp_arm4.h             |    1 
 apps/codecs/libspeex/lsp.c                  |    1 
 apps/codecs/libspeex/stereo.c               |    1 
 apps/codecs/libspeex/speex_callbacks.c      |   11 +
 apps/codecs/libspc/spc_codec.h              |    2 
 firmware/target/arm/ipod/app.lds            |    2 
 firmware/firmware.make                      |   22 ++
 74 files changed, 707 insertions(+), 254 deletions(-)

Comment by Björn Stenberg (zagor) - Tuesday, 11 November 2008, 16:50 GMT+2
Added missing codecs.make, and some polishing.
   unified_make5.patch (78.2 KiB)
 tools/configure                             |  193 +++++++------------------
 tools/rules.make                            |   52 ++++++
 tools/root.make                             |  213 ++++++++++++++++++++++++++++
 tools/tools.make                            |   33 ++++
 apps/lang/lang.make                         |   25 +++
 apps/plugins/xobox.c                        |    2 
 apps/plugins/test_resize.c                  |    4 
 apps/plugins/keybox.c                       |    2 
 apps/plugins/sliding_puzzle.c               |    2 
 apps/plugins/plasma.c                       |    6 
 apps/plugins/random_folder_advance_config.c |    2 
 apps/plugins/mandelbrot.c                   |    4 
 apps/plugins/maze.c                         |    4 
 apps/plugins/wavrecord.c                    |    2 
 apps/plugins/oscilloscope.c                 |    6 
 apps/plugins/euroconverter.c                |    2 
 apps/plugins/video.c                        |    2 
 apps/plugins/zxbox.c                        |    2 
 apps/plugins/fireworks.c                    |    4 
 apps/plugins/plugins.make                   |   48 ++++++
 apps/plugins/starfield.c                    |    2 
 apps/plugins/ppmviewer.c                    |    2 
 apps/plugins/bitmaps/native/SOURCES         |   42 ++---
 apps/plugins/bitmaps/pluginbitmaps.make     |   24 +++
 apps/plugins/chessbox.c                     |    2 
 apps/plugins/test_sampr.c                   |    2 
 apps/plugins/rockblox.c                     |    6 
 apps/plugins/fire.c                         |    8 -
 apps/plugins/solitaire.c                    |    6 
 apps/plugins/rocklife.c                     |    4 
 apps/plugins/pictureflow.c                  |    8 -
 apps/plugins/dice.c                         |    4 
 apps/plugins/bounce.c                       |    2 
 apps/plugins/cube.c                         |    8 -
 apps/plugins/greyscale.c                    |    4 
 apps/plugins/vu_meter.c                     |    2 
 apps/plugins/snow.c                         |    2 
 apps/plugins/test_disk.c                    |    4 
 apps/plugins/lamp.c                         |    2 
 apps/plugins/jackpot.c                      |    4 
 apps/plugins/spacerocks.c                   |    4 
 apps/plugins/logo.c                         |    2 
 apps/plugins/brickmania.c                   |    4 
 apps/plugins/chopper.c                      |    6 
 apps/plugins/viewer.c                       |    4 
 apps/plugins/mazezam.c                      |    8 -
 apps/plugins/metronome.c                    |    2 
 apps/plugins/rockboy.c                      |    2 
 apps/plugins/demystify.c                    |    4 
 apps/plugins/bubbles.c                      |    6 
 apps/plugins/mosaique.c                     |    2 
 apps/plugins/test_fps.c                     |    4 
 apps/plugins/robotfindskitten.c             |    2 
 apps/plugins/jewels.c                       |    2 
 apps/plugins/wormlet.c                      |    4 
 apps/plugins/invadrox.c                     |    4 
 apps/plugins/rockpaint.c                    |    1 
 apps/plugins/text_editor.c                  |    2 
 apps/plugins/credits.c                      |    2 
 apps/bitmaps/bitmaps.make                   |   31 ++++
 apps/apps.make                              |   10 +
 apps/codecs/ape.c                           |    1 
 apps/codecs/codecs.make                     |  200 ++++++++++++++++++++++++++
 apps/codecs/libspeex/libspeex.make          |   45 +++++
 apps/codecs/libspeex/cb_search.c            |    6 
 apps/codecs/libspeex/ltp.c                  |   11 +
 apps/codecs/libspeex/filters.c              |    3 
 apps/codecs/libspeex/rockbox.h              |    9 +
 apps/codecs/libspeex/ltp_arm4.h             |    1 
 apps/codecs/libspeex/lsp.c                  |    1 
 apps/codecs/libspeex/stereo.c               |    1 
 apps/codecs/libspeex/speex_callbacks.c      |   11 +
 apps/codecs/libspc/spc_codec.h              |    2 
 firmware/target/arm/ipod/app.lds            |    2 
 firmware/target/arm/sandisk/app.lds         |    1 
 firmware/firmware.make                      |   22 ++
 76 files changed, 912 insertions(+), 256 deletions(-)

Comment by Björn Stenberg (zagor) - Wednesday, 12 November 2008, 14:14 GMT+2
Now includes all plugins (subdir plugins were missing from patch 5).
   unified_make6.patch (109.5 KiB)
 tools/configure                             |  193 ++++++---------------
 tools/functions.make                        |   48 +++++
 tools/root.make                             |  246 ++++++++++++++++++++++++++++
 tools/tools.make                            |   36 ++++
 apps/lang/lang.make                         |   25 ++
 apps/plugins/xobox.c                        |    2 
 apps/plugins/test_resize.c                  |    4 
 apps/plugins/keybox.c                       |    2 
 apps/plugins/sliding_puzzle.c               |    2 
 apps/plugins/jpeg/jpeg.make                 |   12 +
 apps/plugins/plasma.c                       |    6 
 apps/plugins/random_folder_advance_config.c |    2 
 apps/plugins/mandelbrot.c                   |    4 
 apps/plugins/zxbox/zxbox.make               |   36 ++++
 apps/plugins/sudoku/sudoku.make             |   12 +
 apps/plugins/sudoku/sudoku.c                |    6 
 apps/plugins/maze.c                         |    4 
 apps/plugins/wavrecord.c                    |    2 
 apps/plugins/chessbox/chessbox.c            |    2 
 apps/plugins/chessbox/SOURCES               |    4 
 apps/plugins/chessbox/chessbox.make         |   36 ++++
 apps/plugins/oscilloscope.c                 |    6 
 apps/plugins/euroconverter.c                |    2 
 apps/plugins/video.c                        |    2 
 apps/plugins/clock/clock_counter.h          |    2 
 apps/plugins/clock/clock_draw_digital.c     |    2 
 apps/plugins/clock/clock_bitmap_strings.h   |    2 
 apps/plugins/clock/clock_bitmaps.c          |   28 +--
 apps/plugins/clock/clock_settings.c         |    2 
 apps/plugins/clock/clock_draw_binary.c      |    2 
 apps/plugins/clock/clock_bitmaps.h          |    2 
 apps/plugins/clock/clock.make               |   12 +
 apps/plugins/clock/clock_draw_analog.c      |    4 
 apps/plugins/clock/clock.c                  |    4 
 apps/plugins/zxbox.c                        |    2 
 apps/plugins/fireworks.c                    |    4 
 apps/plugins/plugins.make                   |   58 ++++++
 apps/plugins/starfield.c                    |    2 
 apps/plugins/ppmviewer.c                    |    2 
 apps/plugins/bitmaps/native/SOURCES         |   42 ++--
 apps/plugins/bitmaps/pluginbitmaps.make     |   24 ++
 apps/plugins/chessbox.c                     |    2 
 apps/plugins/test_sampr.c                   |    2 
 apps/plugins/rockblox.c                     |    6 
 apps/plugins/mpegplayer/stream_mgr.c        |    2 
 apps/plugins/mpegplayer/mpegplayer.make     |   12 +
 apps/plugins/mpegplayer/mpegplayer.c        |    2 
 apps/plugins/mpegplayer/mpeg_settings.c     |    2 
 apps/plugins/mpegplayer/video_thread.c      |    2 
 apps/plugins/fire.c                         |    8 
 apps/plugins/solitaire.c                    |    6 
 apps/plugins/rocklife.c                     |    4 
 apps/plugins/midi/midi.make                 |   20 ++
 apps/plugins/pictureflow.c                  |    8 
 apps/plugins/dice.c                         |    4 
 apps/plugins/bounce.c                       |    2 
 apps/plugins/shortcuts/shortcuts.make       |   16 +
 apps/plugins/doom/SOURCES                   |   62 +++++++
 apps/plugins/doom/doom.make                 |   46 +++++
 apps/plugins/cube.c                         |    8 
 apps/plugins/greyscale.c                    |    4 
 apps/plugins/vu_meter.c                     |    2 
 apps/plugins/snow.c                         |    2 
 apps/plugins/rockboy/rockboy.make           |   43 ++++
 apps/plugins/rockboy/SOURCES                |   16 +
 apps/plugins/test_disk.c                    |    4 
 apps/plugins/lamp.c                         |    2 
 apps/plugins/jackpot.c                      |    4 
 apps/plugins/spacerocks.c                   |    4 
 apps/plugins/reversi/reversi.make           |   20 ++
 apps/plugins/logo.c                         |    2 
 apps/plugins/brickmania.c                   |    4 
 apps/plugins/chopper.c                      |    6 
 apps/plugins/viewer.c                       |    4 
 apps/plugins/mazezam.c                      |    8 
 apps/plugins/metronome.c                    |    2 
 apps/plugins/rockboy.c                      |    2 
 apps/plugins/demystify.c                    |    4 
 apps/plugins/bubbles.c                      |    6 
 apps/plugins/mosaique.c                     |    2 
 apps/plugins/test_fps.c                     |    4 
 apps/plugins/robotfindskitten.c             |    2 
 apps/plugins/jewels.c                       |    2 
 apps/plugins/wormlet.c                      |    4 
 apps/plugins/invadrox.c                     |    4 
 apps/plugins/rockpaint.c                    |    1 
 apps/plugins/text_editor.c                  |    2 
 apps/plugins/pacbox/pacbox.make             |   12 +
 apps/plugins/credits.c                      |    2 
 apps/bitmaps/bitmaps.make                   |   31 +++
 apps/apps.make                              |   10 +
 apps/codecs/ape.c                           |    1 
 apps/codecs/libmad/libmad.make              |   44 +++++
 apps/codecs/codecs.make                     |  195 ++++++++++++++++++++++
 apps/codecs/wma.c                           |    2 
 apps/codecs/libspeex/libspeex.make          |   45 +++++
 apps/codecs/libspeex/cb_search.c            |    6 
 apps/codecs/libspeex/ltp.c                  |   11 +
 apps/codecs/libspeex/filters.c              |    3 
 apps/codecs/libspeex/rockbox.h              |    9 +
 apps/codecs/libspeex/ltp_arm4.h             |    1 
 apps/codecs/libspeex/lsp.c                  |    1 
 apps/codecs/libspeex/stereo.c               |    1 
 apps/codecs/libspeex/speex_callbacks.c      |   11 +
 apps/codecs/libspc/spc_codec.h              |    2 
 firmware/rom.lds                            |    5 
 firmware/target/arm/tcc780x/app.lds         |    1 
 firmware/target/arm/pnx0101/app.lds         |    1 
 firmware/target/arm/olympus/app.lds         |    1 
 firmware/target/arm/tcc77x/app.lds          |    1 
 firmware/target/arm/as3525/app.lds          |    1 
 firmware/target/arm/ipod/app.lds            |    1 
 firmware/target/arm/sandisk/app.lds         |    1 
 firmware/target/arm/tms320dm320/app.lds     |    1 
 firmware/target/arm/iriver/app.lds          |    1 
 firmware/target/arm/imx31/app.lds           |    1 
 firmware/target/arm/s3c2440/app.lds         |    1 
 firmware/target/arm/philips/app.lds         |    1 
 firmware/target/coldfire/iriver/app.lds     |    1 
 firmware/target/coldfire/iaudio/app.lds     |    1 
 firmware/target/sh/archos/app.lds           |    1 
 firmware/firmware.make                      |   22 ++
 uisimulator/sdl/uisdl.h                     |    2 
 uisimulator/uisimulator.make                |   18 ++
 124 files changed, 1403 insertions(+), 308 deletions(-)

Comment by Björn Stenberg (zagor) - Wednesday, 12 November 2008, 17:07 GMT+2
Split up codecs.make into subdir files. Added codec-specific -O flags.
   unified_make7.patch (107.5 KiB)
 tools/configure                              |  141 ---------------
 tools/functions.make                         |   58 ++++++
 tools/root.make                              |  246 +++++++++++++++++++++++++++
 tools/tools.make                             |   36 +++
 rbutil/mkamsboot/Makefile                    |   74 +++-----
 apps/lang/lang.make                          |   25 ++
 apps/plugins/xobox.c                         |    2 
 apps/plugins/test_resize.c                   |    4 
 apps/plugins/keybox.c                        |    2 
 apps/plugins/sliding_puzzle.c                |    2 
 apps/plugins/jpeg/jpeg.make                  |   12 +
 apps/plugins/plasma.c                        |    6 
 apps/plugins/random_folder_advance_config.c  |    2 
 apps/plugins/mandelbrot.c                    |    4 
 apps/plugins/zxbox/zxbox.make                |   36 +++
 apps/plugins/sudoku/sudoku.make              |   12 +
 apps/plugins/sudoku/sudoku.c                 |    6 
 apps/plugins/maze.c                          |    4 
 apps/plugins/wavrecord.c                     |    2 
 apps/plugins/chessbox/chessbox.c             |    2 
 apps/plugins/chessbox/SOURCES                |    4 
 apps/plugins/chessbox/chessbox.make          |   36 +++
 apps/plugins/oscilloscope.c                  |    6 
 apps/plugins/euroconverter.c                 |    2 
 apps/plugins/video.c                         |    2 
 apps/plugins/clock/clock_counter.h           |    2 
 apps/plugins/clock/clock_draw_digital.c      |    2 
 apps/plugins/clock/clock_bitmap_strings.h    |    2 
 apps/plugins/clock/clock_bitmaps.c           |   28 +--
 apps/plugins/clock/clock_settings.c          |    2 
 apps/plugins/clock/clock_draw_binary.c       |    2 
 apps/plugins/clock/clock_bitmaps.h           |    2 
 apps/plugins/clock/clock.make                |   12 +
 apps/plugins/clock/clock_draw_analog.c       |    4 
 apps/plugins/clock/clock.c                   |    4 
 apps/plugins/zxbox.c                         |    2 
 apps/plugins/fireworks.c                     |    4 
 apps/plugins/plugins.make                    |   64 +++++++
 apps/plugins/starfield.c                     |    2 
 apps/plugins/ppmviewer.c                     |    2 
 apps/plugins/bitmaps/native/SOURCES          |   42 ++--
 apps/plugins/bitmaps/pluginbitmaps.make      |   44 ++++
 apps/plugins/chessbox.c                      |    2 
 apps/plugins/test_sampr.c                    |    2 
 apps/plugins/rockblox.c                      |    6 
 apps/plugins/mpegplayer/stream_mgr.c         |    2 
 apps/plugins/mpegplayer/mpegplayer.make      |   12 +
 apps/plugins/mpegplayer/mpegplayer.c         |    2 
 apps/plugins/mpegplayer/mpeg_settings.c      |    2 
 apps/plugins/mpegplayer/video_thread.c       |    2 
 apps/plugins/fire.c                          |    8 
 apps/plugins/solitaire.c                     |    6 
 apps/plugins/rocklife.c                      |    4 
 apps/plugins/midi/midi.make                  |   20 ++
 apps/plugins/pictureflow.c                   |    8 
 apps/plugins/dice.c                          |    4 
 apps/plugins/bounce.c                        |    2 
 apps/plugins/shortcuts/shortcuts.make        |   16 +
 apps/plugins/doom/SOURCES                    |   62 ++++++
 apps/plugins/doom/doom.make                  |   46 +++++
 apps/plugins/cube.c                          |    8 
 apps/plugins/greyscale.c                     |    4 
 apps/plugins/vu_meter.c                      |    2 
 apps/plugins/snow.c                          |    2 
 apps/plugins/rockboy/rockboy.make            |   43 ++++
 apps/plugins/rockboy/SOURCES                 |   16 +
 apps/plugins/test_disk.c                     |    4 
 apps/plugins/lamp.c                          |    2 
 apps/plugins/jackpot.c                       |    4 
 apps/plugins/spacerocks.c                    |    4 
 apps/plugins/reversi/reversi.make            |   20 ++
 apps/plugins/logo.c                          |    2 
 apps/plugins/brickmania.c                    |    4 
 apps/plugins/chopper.c                       |    6 
 apps/plugins/viewer.c                        |    4 
 apps/plugins/mazezam.c                       |    8 
 apps/plugins/metronome.c                     |    2 
 apps/plugins/rockboy.c                       |    2 
 apps/plugins/demystify.c                     |    4 
 apps/plugins/bubbles.c                       |    6 
 apps/plugins/mosaique.c                      |    2 
 apps/plugins/test_fps.c                      |    4 
 apps/plugins/robotfindskitten.c              |    2 
 apps/plugins/jewels.c                        |    2 
 apps/plugins/wormlet.c                       |    4 
 apps/plugins/invadrox.c                      |    4 
 apps/plugins/rockpaint.c                     |    1 
 apps/plugins/text_editor.c                   |    2 
 apps/plugins/pacbox/pacbox.make              |   12 +
 apps/plugins/credits.c                       |    2 
 apps/bitmaps/bitmaps.make                    |   41 ++++
 apps/apps.make                               |   10 +
 apps/codecs/libffmpegFLAC/libffmpegFLAC.make |    7 
 apps/codecs/libfaad/libfaad.make             |    7 
 apps/codecs/ape.c                            |    1 
 apps/codecs/libmad/libmad.make               |   44 ++++
 apps/codecs/libmusepack/libmusepack.make     |   19 ++
 apps/codecs/libwma/libwma.make               |    7 
 apps/codecs/codecs.make                      |   87 +++++++++
 apps/codecs/liba52/liba52.make               |    7 
 apps/codecs/libwavpack/libwavpack.make       |    7 
 apps/codecs/libalac/libalac.make             |   14 +
 apps/codecs/libtremor/libtremor.make         |   26 ++
 apps/codecs/wma.c                            |    2 
 apps/codecs/libm4a/libm4a.make               |   14 +
 apps/codecs/demac/libdemac.make              |   14 +
 apps/codecs/libspeex/libspeex.make           |   54 +++++
 apps/codecs/libspeex/cb_search.c             |    6 
 apps/codecs/libspeex/ltp.c                   |   11 +
 apps/codecs/libspeex/filters.c               |    3 
 apps/codecs/libspeex/rockbox.h               |    9 
 apps/codecs/libspeex/ltp_arm4.h              |    1 
 apps/codecs/libspeex/lsp.c                   |    1 
 apps/codecs/libspeex/stereo.c                |    1 
 apps/codecs/libspeex/speex_callbacks.c       |   11 -
 apps/codecs/libasap/libasap.make             |   14 +
 apps/codecs/libspc/spc_codec.h               |    2 
 apps/codecs/libspc/libspc.make               |   14 +
 firmware/rom.lds                             |    5 
 firmware/target/arm/tcc780x/app.lds          |    1 
 firmware/target/arm/pnx0101/app.lds          |    1 
 firmware/target/arm/olympus/app.lds          |    1 
 firmware/target/arm/tcc77x/app.lds           |    1 
 firmware/target/arm/as3525/app.lds           |    1 
 firmware/target/arm/ipod/app.lds             |    1 
 firmware/target/arm/sandisk/app.lds          |    1 
 firmware/target/arm/tms320dm320/app.lds      |    1 
 firmware/target/arm/iriver/app.lds           |    1 
 firmware/target/arm/imx31/app.lds            |    1 
 firmware/target/arm/s3c2440/app.lds          |    1 
 firmware/target/arm/philips/app.lds          |    1 
 firmware/target/coldfire/iriver/app.lds      |    1 
 firmware/target/coldfire/iaudio/app.lds      |    1 
 firmware/target/sh/archos/app.lds            |    1 
 firmware/firmware.make                       |   22 ++
 uisimulator/sdl/uisdl.h                      |    2 
 uisimulator/uisimulator.make                 |   18 +
 137 files changed, 1479 insertions(+), 351 deletions(-)

Comment by Kai Posadowsky (Riffer) - Thursday, 13 November 2008, 13:23 GMT+2
Is it done now?
Comment by Björn Stenberg (zagor) - Thursday, 13 November 2008, 13:55 GMT+2
No. Targets are done, working on simulator now.
Comment by Björn Stenberg (zagor) - Friday, 14 November 2008, 01:40 GMT+2
Targets and sims are now ready. Bootloader remains.

Now is the time to start testing builds for your favourite targets. I'm sure there's a couple of glitches left.
   unified_make8.patch (228.3 KiB)
 tools/configure                              |  147 --------------
 tools/makesubdirs.inc                        |   14 -
 tools/makebmp.inc                            |   33 ---
 tools/functions.make                         |   58 +++++
 tools/root.make                              |  228 ++++++++++++++++++++++
 tools/tools.make                             |   36 +++
 apps/Makefile                                |  268 ---------------------------
 apps/lang/Makefile                           |   40 ----
 apps/lang/lang.make                          |   25 ++
 apps/plugins/xobox.c                         |    2 
 apps/plugins/test_resize.c                   |    4 
 apps/plugins/keybox.c                        |    2 
 apps/plugins/sliding_puzzle.c                |    2 
 apps/plugins/jpeg/jpeg.make                  |   12 +
 apps/plugins/jpeg/Makefile                   |   75 -------
 apps/plugins/plasma.c                        |    6 
 apps/plugins/random_folder_advance_config.c  |    2 
 apps/plugins/mandelbrot.c                    |    4 
 apps/plugins/zxbox/Makefile                  |   84 --------
 apps/plugins/zxbox/zxbox.make                |   48 ++++
 apps/plugins/sudoku/sudoku.make              |   12 +
 apps/plugins/sudoku/sudoku.c                 |    6 
 apps/plugins/sudoku/Makefile                 |   75 -------
 apps/plugins/maze.c                          |    4 
 apps/plugins/Makefile                        |  180 ------------------
 apps/plugins/wavrecord.c                     |    2 
 apps/plugins/chessbox/chessbox.c             |    2 
 apps/plugins/chessbox/SOURCES                |    4 
 apps/plugins/chessbox/chessbox.make          |   49 ++++
 apps/plugins/chessbox/Makefile               |  114 -----------
 apps/plugins/oscilloscope.c                  |    6 
 apps/plugins/euroconverter.c                 |    2 
 apps/plugins/video.c                         |    2 
 apps/plugins/clock/clock_counter.h           |    2 
 apps/plugins/clock/clock_draw_digital.c      |    2 
 apps/plugins/clock/clock_bitmap_strings.h    |    2 
 apps/plugins/clock/clock_bitmaps.c           |   28 +-
 apps/plugins/clock/clock_settings.c          |    2 
 apps/plugins/clock/clock_draw_binary.c       |    2 
 apps/plugins/clock/clock_bitmaps.h           |    2 
 apps/plugins/clock/clock.make                |   12 +
 apps/plugins/clock/clock_draw_analog.c       |    4 
 apps/plugins/clock/clock.c                   |    4 
 apps/plugins/clock/Makefile                  |  112 -----------
 apps/plugins/zxbox.c                         |    2 
 apps/plugins/fireworks.c                     |    4 
 apps/plugins/plugins.make                    |   72 +++++++
 apps/plugins/starfield.c                     |    2 
 apps/plugins/ppmviewer.c                     |    2 
 apps/plugins/bitmaps/remote_native/SOURCES   |    4 
 apps/plugins/bitmaps/remote_native/Makefile  |   32 ---
 apps/plugins/bitmaps/remote_mono/Makefile    |   32 ---
 apps/plugins/bitmaps/native/SOURCES          |   42 ++--
 apps/plugins/bitmaps/native/Makefile         |   32 ---
 apps/plugins/bitmaps/mono/Makefile           |   32 ---
 apps/plugins/bitmaps/pluginbitmaps.make      |   48 ++++
 apps/plugins/chessbox.c                      |    2 
 apps/plugins/test_sampr.c                    |    2 
 apps/plugins/rockblox.c                      |    6 
 apps/plugins/mpegplayer/stream_mgr.c         |    2 
 apps/plugins/mpegplayer/mpegplayer.make      |   12 +
 apps/plugins/mpegplayer/mpegplayer.c         |    2 
 apps/plugins/mpegplayer/mpeg_settings.c      |    2 
 apps/plugins/mpegplayer/mpegplayer.h         |    2 
 apps/plugins/mpegplayer/Makefile             |   78 -------
 apps/plugins/mpegplayer/video_thread.c       |    2 
 apps/plugins/fire.c                          |    8 
 apps/plugins/solitaire.c                     |    6 
 apps/plugins/rocklife.c                      |    4 
 apps/plugins/midi/Makefile                   |   81 --------
 apps/plugins/midi/midi.make                  |   19 +
 apps/plugins/pictureflow.c                   |    8 
 apps/plugins/dice.c                          |    4 
 apps/plugins/searchengine/Makefile           |  105 ----------
 apps/plugins/bounce.c                        |    2 
 apps/plugins/shortcuts/shortcuts.make        |   16 +
 apps/plugins/shortcuts/Makefile              |   90 ---------
 apps/plugins/doom/SOURCES                    |   62 ++++++
 apps/plugins/doom/doom.make                  |   45 ++++
 apps/plugins/doom/Makefile                   |  173 -----------------
 apps/plugins/cube.c                          |    8 
 apps/plugins/greyscale.c                     |    4 
 apps/plugins/lib/Makefile                    |   50 -----
 apps/plugins/vu_meter.c                      |    2 
 apps/plugins/snow.c                          |    2 
 apps/plugins/rockboy/rockboy.make            |   44 ++++
 apps/plugins/rockboy/Makefile                |  119 -----------
 apps/plugins/rockboy/SOURCES                 |   16 +
 apps/plugins/test_disk.c                     |    4 
 apps/plugins/lamp.c                          |    2 
 apps/plugins/jackpot.c                       |    4 
 apps/plugins/spacerocks.c                    |    4 
 apps/plugins/reversi/reversi.make            |   19 +
 apps/plugins/reversi/Makefile                |  111 -----------
 apps/plugins/logo.c                          |    2 
 apps/plugins/brickmania.c                    |    4 
 apps/plugins/chopper.c                       |    6 
 apps/plugins/viewer.c                        |    4 
 apps/plugins/beatbox/Makefile                |   74 -------
 apps/plugins/mazezam.c                       |    8 
 apps/plugins/metronome.c                     |    2 
 apps/plugins/rockboy.c                       |    2 
 apps/plugins/demystify.c                     |    4 
 apps/plugins/bubbles.c                       |    6 
 apps/plugins/mosaique.c                      |    2 
 apps/plugins/test_fps.c                      |    4 
 apps/plugins/robotfindskitten.c              |    2 
 apps/plugins/jewels.c                        |    2 
 apps/plugins/wormlet.c                       |    4 
 apps/plugins/invadrox.c                      |    4 
 apps/plugins/rockpaint.c                     |    1 
 apps/plugins/text_editor.c                   |    2 
 apps/plugins/pacbox/pacbox.make              |   18 +
 apps/plugins/pacbox/Makefile                 |  108 ----------
 apps/plugins/credits.c                       |    2 
 apps/bitmaps/remote_native/Makefile          |   32 ---
 apps/bitmaps/remote_mono/Makefile            |   32 ---
 apps/bitmaps/native/Makefile                 |   32 ---
 apps/bitmaps/mono/Makefile                   |   32 ---
 apps/bitmaps/bitmaps.make                    |   43 ++++
 apps/apps.make                               |   10 +
 apps/codecs/libffmpegFLAC/decoder.c          |    2 
 apps/codecs/libffmpegFLAC/tables.c           |    2 
 apps/codecs/libffmpegFLAC/libffmpegFLAC.make |    8 
 apps/codecs/libffmpegFLAC/Makefile           |   43 ----
 apps/codecs/libfaad/Makefile                 |   43 ----
 apps/codecs/libfaad/libfaad.make             |    8 
 apps/codecs/libfaad/common.h                 |    3 
 apps/codecs/ape.c                            |    1 
 apps/codecs/libmad/Makefile                  |   50 -----
 apps/codecs/libmad/global.h                  |    2 
 apps/codecs/libmad/libmad.make               |   45 ++++
 apps/codecs/libmusepack/musepack.h           |    1 
 apps/codecs/libmusepack/libmusepack.make     |   20 ++
 apps/codecs/libmusepack/Makefile             |   49 ----
 apps/codecs/codec.h                          |   49 ----
 apps/codecs/lib/libcodec.make                |   14 +
 apps/codecs/lib/codeclib.c                   |    4 
 apps/codecs/lib/codeclib.h                   |   13 +
 apps/codecs/lib/Makefile                     |   50 -----
 apps/codecs/libwma/libwma.make               |    8 
 apps/codecs/libwma/Makefile                  |   43 ----
 apps/codecs/codecs.make                      |   86 ++++++++
 apps/codecs/Makefile                         |  256 -------------------------
 apps/codecs/liba52/config-a52.h              |    2 
 apps/codecs/liba52/liba52.make               |    8 
 apps/codecs/liba52/Makefile                  |   43 ----
 apps/codecs/libwavpack/wavpack.h             |    6 
 apps/codecs/libwavpack/libwavpack.make       |    8 
 apps/codecs/libwavpack/Makefile              |   43 ----
 apps/codecs/libalac/alac.c                   |    2 
 apps/codecs/libalac/libalac.make             |   15 +
 apps/codecs/libalac/Makefile                 |   43 ----
 apps/codecs/libtremor/config-tremor.h        |    2 
 apps/codecs/libtremor/Makefile               |   49 ----
 apps/codecs/libtremor/oggmalloc.c            |    3 
 apps/codecs/libtremor/libtremor.make         |   27 ++
 apps/codecs/wma.c                            |    2 
 apps/codecs/libm4a/m4a.c                     |    7 
 apps/codecs/libm4a/demux.c                   |    5 
 apps/codecs/libm4a/libm4a.make               |   15 +
 apps/codecs/libm4a/Makefile                  |   43 ----
 apps/codecs/demac/libdemac.make              |   15 +
 apps/codecs/libspeex/speex/ogg.h             |    2 
 apps/codecs/libspeex/libspeex.make           |   51 +++++
 apps/codecs/libspeex/cb_search.c             |    6 
 apps/codecs/libspeex/Makefile                |   57 -----
 apps/codecs/libspeex/ltp.c                   |   11 +
 apps/codecs/libspeex/filters.c               |    5 
 apps/codecs/libspeex/rockbox.h               |   13 +
 apps/codecs/libspeex/ltp_arm4.h              |    1 
 apps/codecs/libspeex/lsp.c                   |    1 
 apps/codecs/libspeex/stereo.c                |    1 
 apps/codecs/libspeex/speex_callbacks.c       |   11 -
 apps/codecs/libspeex/config-speex.h          |    2 
 apps/codecs/libasap/libasap.make             |   15 +
 apps/codecs/libasap/Makefile                 |   44 ----
 apps/codecs/libspc/spc_codec.h               |    2 
 apps/codecs/libspc/spc_profiler.c            |    2 
 apps/codecs/libspc/libspc.make               |   15 +
 apps/codecs/libspc/spc_dsp.c                 |    3 
 apps/codecs/libspc/spc_emu.c                 |    3 
 apps/codecs/libspc/Makefile                  |   44 ----
 apps/codecs/libspc/spc_cpu.c                 |    3 
 firmware/export/debug.h                      |    3 
 firmware/export/config-mrobe500.h            |    3 
 firmware/Makefile                            |   57 -----
 firmware/rom.lds                             |    5 
 firmware/firmware.make                       |   30 +++
 uisimulator/sdl/uisdl.h                      |    2 
 uisimulator/uisimulator.make                 |   22 ++
 191 files changed, 1552 insertions(+), 3588 deletions(-)

Comment by Björn Stenberg (zagor) - Friday, 14 November 2008, 16:33 GMT+2
Commit candidate. Please review and comment.
   unified_make9.patch (231.4 KiB)
 bootloader/show_logo.c                       |    2 
 bootloader/bootloader.make                   |   27 ++
 tools/Makefile                               |    4 
 tools/configure                              |  149 ---------------
 tools/makesubdirs.inc                        |   14 -
 tools/makebmp.inc                            |   33 ---
 tools/functions.make                         |   58 +++++
 tools/root.make                              |  176 +++++++++++++++++
 tools/tools.make                             |   42 ++++
 apps/Makefile                                |  268 ---------------------------
 apps/plugins/xobox.c                         |    2 
 apps/plugins/test_resize.c                   |    4 
 apps/plugins/keybox.c                        |    2 
 apps/plugins/sliding_puzzle.c                |    2 
 apps/plugins/jpeg/jpeg.make                  |   12 +
 apps/plugins/jpeg/Makefile                   |   75 -------
 apps/plugins/plasma.c                        |    6 
 apps/plugins/random_folder_advance_config.c  |    2 
 apps/plugins/mandelbrot.c                    |    4 
 apps/plugins/zxbox/Makefile                  |   84 --------
 apps/plugins/zxbox/zxbox.make                |   48 ++++
 apps/plugins/sudoku/sudoku.make              |   12 +
 apps/plugins/sudoku/sudoku.c                 |    6 
 apps/plugins/sudoku/Makefile                 |   75 -------
 apps/plugins/maze.c                          |    4 
 apps/plugins/Makefile                        |  180 ------------------
 apps/plugins/wavrecord.c                     |    2 
 apps/plugins/chessbox/chessbox.c             |    2 
 apps/plugins/chessbox/SOURCES                |    4 
 apps/plugins/chessbox/chessbox.make          |   49 ++++
 apps/plugins/chessbox/Makefile               |  114 -----------
 apps/plugins/oscilloscope.c                  |    6 
 apps/plugins/euroconverter.c                 |    2 
 apps/plugins/video.c                         |    2 
 apps/plugins/zxbox.c                         |    2 
 apps/plugins/clock/clock_counter.h           |    2 
 apps/plugins/clock/clock_bitmap_strings.h    |    2 
 apps/plugins/clock/clock_draw_digital.c      |    2 
 apps/plugins/clock/clock_bitmaps.c           |   28 +-
 apps/plugins/clock/clock_settings.c          |    2 
 apps/plugins/clock/clock_draw_binary.c       |    2 
 apps/plugins/clock/clock_bitmaps.h           |    2 
 apps/plugins/clock/clock.make                |   12 +
 apps/plugins/clock/clock_draw_analog.c       |    4 
 apps/plugins/clock/clock.c                   |    4 
 apps/plugins/clock/Makefile                  |  112 -----------
 apps/plugins/fireworks.c                     |    4 
 apps/plugins/plugins.make                    |   68 ++++++
 apps/plugins/starfield.c                     |    2 
 apps/plugins/chessbox.c                      |    2 
 apps/plugins/bitmaps/remote_native/SOURCES   |    4 
 apps/plugins/bitmaps/remote_native/Makefile  |   32 ---
 apps/plugins/bitmaps/remote_mono/Makefile    |   32 ---
 apps/plugins/bitmaps/native/SOURCES          |   42 ++--
 apps/plugins/bitmaps/native/Makefile         |   32 ---
 apps/plugins/bitmaps/mono/Makefile           |   32 ---
 apps/plugins/bitmaps/pluginbitmaps.make      |   49 ++++
 apps/plugins/ppmviewer.c                     |    2 
 apps/plugins/test_sampr.c                    |    2 
 apps/plugins/rockblox.c                      |    6 
 apps/plugins/mpegplayer/stream_mgr.c         |    2 
 apps/plugins/mpegplayer/mpegplayer.make      |   12 +
 apps/plugins/mpegplayer/mpegplayer.c         |    2 
 apps/plugins/mpegplayer/mpeg_settings.c      |    2 
 apps/plugins/mpegplayer/mpegplayer.h         |    2 
 apps/plugins/mpegplayer/Makefile             |   78 -------
 apps/plugins/mpegplayer/video_thread.c       |    2 
 apps/plugins/fire.c                          |    8 
 apps/plugins/solitaire.c                     |    6 
 apps/plugins/rocklife.c                      |    4 
 apps/plugins/midi/Makefile                   |   81 --------
 apps/plugins/midi/midi.make                  |   19 +
 apps/plugins/pictureflow.c                   |    8 
 apps/plugins/dice.c                          |    4 
 apps/plugins/searchengine/Makefile           |  105 ----------
 apps/plugins/bounce.c                        |    2 
 apps/plugins/shortcuts/shortcuts.make        |   16 +
 apps/plugins/shortcuts/Makefile              |   90 ---------
 apps/plugins/doom/SOURCES                    |   62 ++++++
 apps/plugins/doom/doom.make                  |   45 ++++
 apps/plugins/doom/Makefile                   |  173 -----------------
 apps/plugins/cube.c                          |    8 
 apps/plugins/greyscale.c                     |    4 
 apps/plugins/lib/Makefile                    |   50 -----
 apps/plugins/vu_meter.c                      |    2 
 apps/plugins/snow.c                          |    2 
 apps/plugins/rockboy/rockboy.make            |   44 ++++
 apps/plugins/rockboy/Makefile                |  119 -----------
 apps/plugins/rockboy/SOURCES                 |   16 +
 apps/plugins/test_disk.c                     |    4 
 apps/plugins/lamp.c                          |    2 
 apps/plugins/jackpot.c                       |    4 
 apps/plugins/spacerocks.c                    |    4 
 apps/plugins/reversi/reversi.make            |   19 +
 apps/plugins/reversi/Makefile                |  111 -----------
 apps/plugins/logo.c                          |    2 
 apps/plugins/brickmania.c                    |    4 
 apps/plugins/chopper.c                       |    6 
 apps/plugins/viewer.c                        |    4 
 apps/plugins/beatbox/Makefile                |   74 -------
 apps/plugins/mazezam.c                       |    8 
 apps/plugins/metronome.c                     |    2 
 apps/plugins/rockboy.c                       |    2 
 apps/plugins/demystify.c                     |    4 
 apps/plugins/bubbles.c                       |    6 
 apps/plugins/mosaique.c                      |    2 
 apps/plugins/test_fps.c                      |    4 
 apps/plugins/robotfindskitten.c              |    2 
 apps/plugins/jewels.c                        |    2 
 apps/plugins/wormlet.c                       |    4 
 apps/plugins/invadrox.c                      |    4 
 apps/plugins/rockpaint.c                     |    1 
 apps/plugins/text_editor.c                   |    2 
 apps/plugins/pacbox/pacbox.make              |   18 +
 apps/plugins/pacbox/Makefile                 |  108 ----------
 apps/plugins/credits.c                       |    2 
 apps/lang/Makefile                           |   40 ----
 apps/lang/lang.make                          |   25 ++
 apps/bitmaps/remote_native/Makefile          |   32 ---
 apps/bitmaps/remote_mono/Makefile            |   32 ---
 apps/bitmaps/native/Makefile                 |   32 ---
 apps/bitmaps/mono/Makefile                   |   32 ---
 apps/bitmaps/bitmaps.make                    |   40 ++++
 apps/apps.make                               |   77 +++++++
 apps/codecs/libffmpegFLAC/decoder.c          |    2 
 apps/codecs/libffmpegFLAC/tables.c           |    2 
 apps/codecs/libffmpegFLAC/libffmpegFLAC.make |    8 
 apps/codecs/libffmpegFLAC/Makefile           |   43 ----
 apps/codecs/libfaad/Makefile                 |   43 ----
 apps/codecs/libfaad/libfaad.make             |    8 
 apps/codecs/libfaad/common.h                 |    3 
 apps/codecs/ape.c                            |    1 
 apps/codecs/libmad/Makefile                  |   50 -----
 apps/codecs/libmad/global.h                  |    2 
 apps/codecs/libmad/libmad.make               |   45 ++++
 apps/codecs/libmusepack/musepack.h           |    1 
 apps/codecs/libmusepack/libmusepack.make     |   20 ++
 apps/codecs/libmusepack/Makefile             |   49 ----
 apps/codecs/codec.h                          |   49 ----
 apps/codecs/lib/libcodec.make                |   14 +
 apps/codecs/lib/codeclib.c                   |    4 
 apps/codecs/lib/codeclib.h                   |   13 +
 apps/codecs/lib/Makefile                     |   50 -----
 apps/codecs/libwma/libwma.make               |    8 
 apps/codecs/libwma/Makefile                  |   43 ----
 apps/codecs/codecs.make                      |   86 ++++++++
 apps/codecs/Makefile                         |  256 -------------------------
 apps/codecs/liba52/config-a52.h              |    2 
 apps/codecs/liba52/liba52.make               |    8 
 apps/codecs/liba52/Makefile                  |   43 ----
 apps/codecs/libwavpack/wavpack.h             |    6 
 apps/codecs/libwavpack/libwavpack.make       |    8 
 apps/codecs/libwavpack/Makefile              |   43 ----
 apps/codecs/libalac/alac.c                   |    2 
 apps/codecs/libalac/libalac.make             |   15 +
 apps/codecs/libalac/Makefile                 |   43 ----
 apps/codecs/libtremor/config-tremor.h        |    2 
 apps/codecs/libtremor/Makefile               |   49 ----
 apps/codecs/libtremor/oggmalloc.c            |    3 
 apps/codecs/libtremor/libtremor.make         |   27 ++
 apps/codecs/wma.c                            |    2 
 apps/codecs/libm4a/m4a.c                     |    7 
 apps/codecs/libm4a/demux.c                   |    5 
 apps/codecs/libm4a/libm4a.make               |   15 +
 apps/codecs/libm4a/Makefile                  |   43 ----
 apps/codecs/demac/libdemac.make              |   15 +
 apps/codecs/libspeex/speex/ogg.h             |    2 
 apps/codecs/libspeex/libspeex.make           |   51 +++++
 apps/codecs/libspeex/cb_search.c             |    6 
 apps/codecs/libspeex/Makefile                |   57 -----
 apps/codecs/libspeex/ltp.c                   |   11 +
 apps/codecs/libspeex/filters.c               |    5 
 apps/codecs/libspeex/rockbox.h               |   13 +
 apps/codecs/libspeex/ltp_arm4.h              |    1 
 apps/codecs/libspeex/lsp.c                   |    1 
 apps/codecs/libspeex/stereo.c                |    1 
 apps/codecs/libspeex/speex_callbacks.c       |   11 -
 apps/codecs/libspeex/config-speex.h          |    2 
 apps/codecs/libasap/libasap.make             |   15 +
 apps/codecs/libasap/Makefile                 |   44 ----
 apps/codecs/libspc/spc_codec.h               |    2 
 apps/codecs/libspc/spc_profiler.c            |    2 
 apps/codecs/libspc/libspc.make               |   15 +
 apps/codecs/libspc/spc_dsp.c                 |    3 
 apps/codecs/libspc/spc_emu.c                 |    3 
 apps/codecs/libspc/Makefile                  |   44 ----
 apps/codecs/libspc/spc_cpu.c                 |    3 
 firmware/export/debug.h                      |    3 
 firmware/export/config-mrobe500.h            |    3 
 firmware/Makefile                            |   57 -----
 firmware/rom.lds                             |    5 
 firmware/firmware.make                       |   30 +++
 uisimulator/sdl/uisdl.h                      |    2 
 uisimulator/uisimulator.make                 |   22 ++
 194 files changed, 1597 insertions(+), 3593 deletions(-)

Comment by Steve Bavin (pondlife) - Friday, 14 November 2008, 17:22 GMT+2
Hi Bjorn,

I get patch errors: http://www.pastebin.ca/1256232
Should Makefile itself be in the patch?
Comment by Steve Bavin (pondlife) - Friday, 14 November 2008, 17:23 GMT+2
Ah - I spoke too soon:

$ make
Generating dependencies
CC uclpack
CC lang.c
CC apps/action.c
CC apps/alarm_menu.c
CC apps/abrepeat.c
BMP2RB remote_rockboxlogo.128x42x1.bmp
CC buildsim/apps/bitmaps/remote_native/remote_rockboxlogo.128x42x1.c
BMP2RB remote_usblogo.104x27x1.bmp
CC buildsim/apps/bitmaps/remote_native/remote_usblogo.104x27x1.c
BMP2RB remote_default_icons.6x8x1.bmp
CC buildsim/apps/bitmaps/remote_native/remote_default_icons.6x8x1.c
CONVBDF fonts/08-Schumacher-Clean.bdf
CC apps/bookmark.c
In file included from /home/Steve/rockbox/apps/bookmark.c:34:
/home/Steve/rockbox/apps/recorder/icons.h:33:33: bitmaps/rockboxlogo.h: No such file or directory
make: *** [/home/Steve/rockbox/buildsim/apps/bookmark.o] Error 1
Comment by Daniel Stenberg (bagder) - Friday, 14 November 2008, 20:15 GMT+2
I got the makefile rejects too but they're harmless.

But I didn't get any rockbox-info.txt file created!?
Comment by Björn Stenberg (zagor) - Saturday, 15 November 2008, 00:10 GMT+2
Steve: Thanks, fixed. (change line 13 in apps/bitmaps/bitmaps.make from = to += if you don't want to reapply the whole patch)

Daniel: Thanks. rockbox-info.txt added.

It seems /usr/bin/patch just doesn't handle removed files well. I have attached a version of this patch done with "svn diff --no-diff-deleted" that should apply easier.

   unified_make10.patch (231.7 KiB)
 bootloader/show_logo.c                       |    2 
 bootloader/bootloader.make                   |   27 ++
 tools/Makefile                               |    4 
 tools/configure                              |  149 ---------------
 tools/makesubdirs.inc                        |   14 -
 tools/makebmp.inc                            |   33 ---
 tools/functions.make                         |   58 +++++
 tools/root.make                              |  177 +++++++++++++++++
 tools/tools.make                             |   42 ++++
 apps/Makefile                                |  268 ---------------------------
 apps/plugins/xobox.c                         |    2 
 apps/plugins/test_resize.c                   |    4 
 apps/plugins/keybox.c                        |    2 
 apps/plugins/sliding_puzzle.c                |    2 
 apps/plugins/jpeg/jpeg.make                  |   12 +
 apps/plugins/jpeg/Makefile                   |   75 -------
 apps/plugins/plasma.c                        |    6 
 apps/plugins/random_folder_advance_config.c  |    2 
 apps/plugins/mandelbrot.c                    |    4 
 apps/plugins/zxbox/Makefile                  |   84 --------
 apps/plugins/zxbox/zxbox.make                |   48 ++++
 apps/plugins/sudoku/sudoku.make              |   12 +
 apps/plugins/sudoku/sudoku.c                 |    6 
 apps/plugins/sudoku/Makefile                 |   75 -------
 apps/plugins/maze.c                          |    4 
 apps/plugins/Makefile                        |  180 ------------------
 apps/plugins/wavrecord.c                     |    2 
 apps/plugins/chessbox/chessbox.c             |    2 
 apps/plugins/chessbox/SOURCES                |    4 
 apps/plugins/chessbox/chessbox.make          |   49 ++++
 apps/plugins/chessbox/Makefile               |  114 -----------
 apps/plugins/oscilloscope.c                  |    6 
 apps/plugins/euroconverter.c                 |    2 
 apps/plugins/video.c                         |    2 
 apps/plugins/zxbox.c                         |    2 
 apps/plugins/clock/clock_counter.h           |    2 
 apps/plugins/clock/clock_bitmap_strings.h    |    2 
 apps/plugins/clock/clock_draw_digital.c      |    2 
 apps/plugins/clock/clock_bitmaps.c           |   28 +-
 apps/plugins/clock/clock_settings.c          |    2 
 apps/plugins/clock/clock_draw_binary.c       |    2 
 apps/plugins/clock/clock_bitmaps.h           |    2 
 apps/plugins/clock/clock.make                |   12 +
 apps/plugins/clock/clock_draw_analog.c       |    4 
 apps/plugins/clock/clock.c                   |    4 
 apps/plugins/clock/Makefile                  |  112 -----------
 apps/plugins/fireworks.c                     |    4 
 apps/plugins/plugins.make                    |   68 ++++++
 apps/plugins/starfield.c                     |    2 
 apps/plugins/chessbox.c                      |    2 
 apps/plugins/bitmaps/remote_native/SOURCES   |    4 
 apps/plugins/bitmaps/remote_native/Makefile  |   32 ---
 apps/plugins/bitmaps/remote_mono/Makefile    |   32 ---
 apps/plugins/bitmaps/native/SOURCES          |   42 ++--
 apps/plugins/bitmaps/native/Makefile         |   32 ---
 apps/plugins/bitmaps/mono/Makefile           |   32 ---
 apps/plugins/bitmaps/pluginbitmaps.make      |   51 +++++
 apps/plugins/ppmviewer.c                     |    2 
 apps/plugins/test_sampr.c                    |    2 
 apps/plugins/rockblox.c                      |    6 
 apps/plugins/mpegplayer/stream_mgr.c         |    2 
 apps/plugins/mpegplayer/mpegplayer.make      |   12 +
 apps/plugins/mpegplayer/mpegplayer.c         |    2 
 apps/plugins/mpegplayer/mpeg_settings.c      |    2 
 apps/plugins/mpegplayer/mpegplayer.h         |    2 
 apps/plugins/mpegplayer/Makefile             |   78 -------
 apps/plugins/mpegplayer/video_thread.c       |    2 
 apps/plugins/fire.c                          |    8 
 apps/plugins/solitaire.c                     |    6 
 apps/plugins/rocklife.c                      |    4 
 apps/plugins/midi/Makefile                   |   81 --------
 apps/plugins/midi/midi.make                  |   19 +
 apps/plugins/pictureflow.c                   |    8 
 apps/plugins/dice.c                          |    4 
 apps/plugins/searchengine/Makefile           |  105 ----------
 apps/plugins/bounce.c                        |    2 
 apps/plugins/shortcuts/shortcuts.make        |   16 +
 apps/plugins/shortcuts/Makefile              |   90 ---------
 apps/plugins/doom/SOURCES                    |   62 ++++++
 apps/plugins/doom/doom.make                  |   45 ++++
 apps/plugins/doom/Makefile                   |  173 -----------------
 apps/plugins/cube.c                          |    8 
 apps/plugins/greyscale.c                     |    4 
 apps/plugins/lib/Makefile                    |   50 -----
 apps/plugins/vu_meter.c                      |    2 
 apps/plugins/snow.c                          |    2 
 apps/plugins/rockboy/rockboy.make            |   44 ++++
 apps/plugins/rockboy/Makefile                |  119 -----------
 apps/plugins/rockboy/SOURCES                 |   16 +
 apps/plugins/test_disk.c                     |    4 
 apps/plugins/lamp.c                          |    2 
 apps/plugins/jackpot.c                       |    4 
 apps/plugins/spacerocks.c                    |    4 
 apps/plugins/reversi/reversi.make            |   19 +
 apps/plugins/reversi/Makefile                |  111 -----------
 apps/plugins/logo.c                          |    2 
 apps/plugins/brickmania.c                    |    4 
 apps/plugins/chopper.c                       |    6 
 apps/plugins/viewer.c                        |    4 
 apps/plugins/beatbox/Makefile                |   74 -------
 apps/plugins/mazezam.c                       |    8 
 apps/plugins/metronome.c                     |    2 
 apps/plugins/rockboy.c                       |    2 
 apps/plugins/demystify.c                     |    4 
 apps/plugins/bubbles.c                       |    6 
 apps/plugins/mosaique.c                      |    2 
 apps/plugins/test_fps.c                      |    4 
 apps/plugins/robotfindskitten.c              |    2 
 apps/plugins/jewels.c                        |    2 
 apps/plugins/wormlet.c                       |    4 
 apps/plugins/invadrox.c                      |    4 
 apps/plugins/rockpaint.c                     |    1 
 apps/plugins/text_editor.c                   |    2 
 apps/plugins/pacbox/pacbox.make              |   18 +
 apps/plugins/pacbox/Makefile                 |  108 ----------
 apps/plugins/credits.c                       |    2 
 apps/lang/Makefile                           |   40 ----
 apps/lang/lang.make                          |   25 ++
 apps/bitmaps/remote_native/Makefile          |   32 ---
 apps/bitmaps/remote_mono/Makefile            |   32 ---
 apps/bitmaps/native/Makefile                 |   32 ---
 apps/bitmaps/mono/Makefile                   |   32 ---
 apps/bitmaps/bitmaps.make                    |   42 ++++
 apps/apps.make                               |   77 +++++++
 apps/codecs/libffmpegFLAC/decoder.c          |    2 
 apps/codecs/libffmpegFLAC/tables.c           |    2 
 apps/codecs/libffmpegFLAC/libffmpegFLAC.make |    8 
 apps/codecs/libffmpegFLAC/Makefile           |   43 ----
 apps/codecs/libfaad/Makefile                 |   43 ----
 apps/codecs/libfaad/libfaad.make             |    8 
 apps/codecs/libfaad/common.h                 |    3 
 apps/codecs/ape.c                            |    1 
 apps/codecs/libmad/Makefile                  |   50 -----
 apps/codecs/libmad/global.h                  |    2 
 apps/codecs/libmad/libmad.make               |   45 ++++
 apps/codecs/libmusepack/musepack.h           |    1 
 apps/codecs/libmusepack/libmusepack.make     |   20 ++
 apps/codecs/libmusepack/Makefile             |   49 ----
 apps/codecs/codec.h                          |   49 ----
 apps/codecs/lib/libcodec.make                |   14 +
 apps/codecs/lib/codeclib.c                   |    4 
 apps/codecs/lib/codeclib.h                   |   13 +
 apps/codecs/lib/Makefile                     |   50 -----
 apps/codecs/libwma/libwma.make               |    8 
 apps/codecs/libwma/Makefile                  |   43 ----
 apps/codecs/codecs.make                      |   86 ++++++++
 apps/codecs/Makefile                         |  256 -------------------------
 apps/codecs/liba52/config-a52.h              |    2 
 apps/codecs/liba52/liba52.make               |    8 
 apps/codecs/liba52/Makefile                  |   43 ----
 apps/codecs/libwavpack/wavpack.h             |    6 
 apps/codecs/libwavpack/libwavpack.make       |    8 
 apps/codecs/libwavpack/Makefile              |   43 ----
 apps/codecs/libalac/alac.c                   |    2 
 apps/codecs/libalac/libalac.make             |   15 +
 apps/codecs/libalac/Makefile                 |   43 ----
 apps/codecs/libtremor/config-tremor.h        |    2 
 apps/codecs/libtremor/Makefile               |   49 ----
 apps/codecs/libtremor/oggmalloc.c            |    3 
 apps/codecs/libtremor/libtremor.make         |   27 ++
 apps/codecs/wma.c                            |    2 
 apps/codecs/libm4a/m4a.c                     |    7 
 apps/codecs/libm4a/demux.c                   |    5 
 apps/codecs/libm4a/libm4a.make               |   15 +
 apps/codecs/libm4a/Makefile                  |   43 ----
 apps/codecs/demac/libdemac.make              |   15 +
 apps/codecs/libspeex/speex/ogg.h             |    2 
 apps/codecs/libspeex/libspeex.make           |   51 +++++
 apps/codecs/libspeex/cb_search.c             |    6 
 apps/codecs/libspeex/Makefile                |   57 -----
 apps/codecs/libspeex/ltp.c                   |   11 +
 apps/codecs/libspeex/filters.c               |    5 
 apps/codecs/libspeex/rockbox.h               |   13 +
 apps/codecs/libspeex/ltp_arm4.h              |    1 
 apps/codecs/libspeex/lsp.c                   |    1 
 apps/codecs/libspeex/stereo.c                |    1 
 apps/codecs/libspeex/speex_callbacks.c       |   11 -
 apps/codecs/libspeex/config-speex.h          |    2 
 apps/codecs/libasap/libasap.make             |   15 +
 apps/codecs/libasap/Makefile                 |   44 ----
 apps/codecs/libspc/spc_codec.h               |    2 
 apps/codecs/libspc/spc_profiler.c            |    2 
 apps/codecs/libspc/libspc.make               |   15 +
 apps/codecs/libspc/spc_dsp.c                 |    3 
 apps/codecs/libspc/spc_emu.c                 |    3 
 apps/codecs/libspc/Makefile                  |   44 ----
 apps/codecs/libspc/spc_cpu.c                 |    3 
 firmware/export/debug.h                      |    3 
 firmware/export/config-mrobe500.h            |    3 
 firmware/Makefile                            |   57 -----
 firmware/rom.lds                             |    5 
 firmware/firmware.make                       |   30 +++
 uisimulator/sdl/uisdl.h                      |    2 
 uisimulator/uisimulator.make                 |   22 ++
 194 files changed, 1602 insertions(+), 3593 deletions(-)

   unified_make10-nodelete.patch (120.9 KiB)
 bootloader/show_logo.c                       |    2 
 bootloader/bootloader.make                   |   27 ++++
 tools/Makefile                               |    4 
 tools/configure                              |  149 ----------------------
 tools/functions.make                         |   58 ++++++++
 tools/root.make                              |  177 +++++++++++++++++++++++++++
 tools/tools.make                             |   42 ++++++
 apps/plugins/xobox.c                         |    2 
 apps/plugins/test_resize.c                   |    4 
 apps/plugins/keybox.c                        |    2 
 apps/plugins/sliding_puzzle.c                |    2 
 apps/plugins/jpeg/jpeg.make                  |   12 +
 apps/plugins/plasma.c                        |    6 
 apps/plugins/random_folder_advance_config.c  |    2 
 apps/plugins/mandelbrot.c                    |    4 
 apps/plugins/zxbox/zxbox.make                |   48 +++++++
 apps/plugins/sudoku/sudoku.make              |   12 +
 apps/plugins/sudoku/sudoku.c                 |    6 
 apps/plugins/maze.c                          |    4 
 apps/plugins/wavrecord.c                     |    2 
 apps/plugins/chessbox/chessbox.c             |    2 
 apps/plugins/chessbox/SOURCES                |    4 
 apps/plugins/chessbox/chessbox.make          |   49 +++++++
 apps/plugins/oscilloscope.c                  |    6 
 apps/plugins/euroconverter.c                 |    2 
 apps/plugins/video.c                         |    2 
 apps/plugins/zxbox.c                         |    2 
 apps/plugins/clock/clock_counter.h           |    2 
 apps/plugins/clock/clock_bitmap_strings.h    |    2 
 apps/plugins/clock/clock_draw_digital.c      |    2 
 apps/plugins/clock/clock_bitmaps.c           |   28 ++--
 apps/plugins/clock/clock_settings.c          |    2 
 apps/plugins/clock/clock_draw_binary.c       |    2 
 apps/plugins/clock/clock_bitmaps.h           |    2 
 apps/plugins/clock/clock.make                |   12 +
 apps/plugins/clock/clock_draw_analog.c       |    4 
 apps/plugins/clock/clock.c                   |    4 
 apps/plugins/fireworks.c                     |    4 
 apps/plugins/plugins.make                    |   68 ++++++++++
 apps/plugins/starfield.c                     |    2 
 apps/plugins/chessbox.c                      |    2 
 apps/plugins/bitmaps/remote_native/SOURCES   |    4 
 apps/plugins/bitmaps/native/SOURCES          |   42 +++---
 apps/plugins/bitmaps/pluginbitmaps.make      |   51 +++++++
 apps/plugins/ppmviewer.c                     |    2 
 apps/plugins/test_sampr.c                    |    2 
 apps/plugins/rockblox.c                      |    6 
 apps/plugins/mpegplayer/stream_mgr.c         |    2 
 apps/plugins/mpegplayer/mpegplayer.make      |   12 +
 apps/plugins/mpegplayer/mpegplayer.c         |    2 
 apps/plugins/mpegplayer/mpeg_settings.c      |    2 
 apps/plugins/mpegplayer/mpegplayer.h         |    2 
 apps/plugins/mpegplayer/video_thread.c       |    2 
 apps/plugins/fire.c                          |    8 -
 apps/plugins/solitaire.c                     |    6 
 apps/plugins/rocklife.c                      |    4 
 apps/plugins/midi/midi.make                  |   19 ++
 apps/plugins/pictureflow.c                   |    8 -
 apps/plugins/dice.c                          |    4 
 apps/plugins/bounce.c                        |    2 
 apps/plugins/shortcuts/shortcuts.make        |   16 ++
 apps/plugins/doom/SOURCES                    |   62 +++++++++
 apps/plugins/doom/doom.make                  |   45 ++++++
 apps/plugins/cube.c                          |    8 -
 apps/plugins/greyscale.c                     |    4 
 apps/plugins/vu_meter.c                      |    2 
 apps/plugins/snow.c                          |    2 
 apps/plugins/rockboy/rockboy.make            |   44 ++++++
 apps/plugins/rockboy/SOURCES                 |   16 ++
 apps/plugins/test_disk.c                     |    4 
 apps/plugins/lamp.c                          |    2 
 apps/plugins/jackpot.c                       |    4 
 apps/plugins/spacerocks.c                    |    4 
 apps/plugins/reversi/reversi.make            |   19 ++
 apps/plugins/logo.c                          |    2 
 apps/plugins/brickmania.c                    |    4 
 apps/plugins/chopper.c                       |    6 
 apps/plugins/viewer.c                        |    4 
 apps/plugins/mazezam.c                       |    8 -
 apps/plugins/metronome.c                     |    2 
 apps/plugins/rockboy.c                       |    2 
 apps/plugins/demystify.c                     |    4 
 apps/plugins/bubbles.c                       |    6 
 apps/plugins/mosaique.c                      |    2 
 apps/plugins/test_fps.c                      |    4 
 apps/plugins/robotfindskitten.c              |    2 
 apps/plugins/jewels.c                        |    2 
 apps/plugins/wormlet.c                       |    4 
 apps/plugins/invadrox.c                      |    4 
 apps/plugins/rockpaint.c                     |    1 
 apps/plugins/text_editor.c                   |    2 
 apps/plugins/pacbox/pacbox.make              |   18 ++
 apps/plugins/credits.c                       |    2 
 apps/lang/lang.make                          |   25 +++
 apps/bitmaps/bitmaps.make                    |   42 ++++++
 apps/apps.make                               |   77 +++++++++++
 apps/codecs/libffmpegFLAC/decoder.c          |    2 
 apps/codecs/libffmpegFLAC/tables.c           |    2 
 apps/codecs/libffmpegFLAC/libffmpegFLAC.make |    8 +
 apps/codecs/libfaad/libfaad.make             |    8 +
 apps/codecs/libfaad/common.h                 |    3 
 apps/codecs/ape.c                            |    1 
 apps/codecs/libmad/global.h                  |    2 
 apps/codecs/libmad/libmad.make               |   45 ++++++
 apps/codecs/libmusepack/musepack.h           |    1 
 apps/codecs/libmusepack/libmusepack.make     |   20 +++
 apps/codecs/lib/libcodec.make                |   14 ++
 apps/codecs/lib/codeclib.c                   |    4 
 apps/codecs/lib/codeclib.h                   |   13 +
 apps/codecs/libwma/libwma.make               |    8 +
 apps/codecs/codecs.make                      |   86 +++++++++++++
 apps/codecs/liba52/config-a52.h              |    2 
 apps/codecs/liba52/liba52.make               |    8 +
 apps/codecs/libwavpack/wavpack.h             |    6 
 apps/codecs/libwavpack/libwavpack.make       |    8 +
 apps/codecs/libalac/alac.c                   |    2 
 apps/codecs/libalac/libalac.make             |   15 ++
 apps/codecs/libtremor/config-tremor.h        |    2 
 apps/codecs/libtremor/oggmalloc.c            |    3 
 apps/codecs/libtremor/libtremor.make         |   27 ++++
 apps/codecs/wma.c                            |    2 
 apps/codecs/libm4a/m4a.c                     |    7 -
 apps/codecs/libm4a/demux.c                   |    5 
 apps/codecs/libm4a/libm4a.make               |   15 ++
 apps/codecs/demac/libdemac.make              |   15 ++
 apps/codecs/libspeex/speex/ogg.h             |    2 
 apps/codecs/libspeex/libspeex.make           |   51 +++++++
 apps/codecs/libspeex/cb_search.c             |    6 
 apps/codecs/libspeex/ltp.c                   |   11 +
 apps/codecs/libspeex/filters.c               |    5 
 apps/codecs/libspeex/rockbox.h               |   13 +
 apps/codecs/libspeex/ltp_arm4.h              |    1 
 apps/codecs/libspeex/lsp.c                   |    1 
 apps/codecs/libspeex/stereo.c                |    1 
 apps/codecs/libspeex/speex_callbacks.c       |   11 +
 apps/codecs/libspeex/config-speex.h          |    2 
 apps/codecs/libasap/libasap.make             |   15 ++
 apps/codecs/libspc/spc_codec.h               |    2 
 apps/codecs/libspc/spc_profiler.c            |    2 
 apps/codecs/libspc/libspc.make               |   15 ++
 apps/codecs/libspc/spc_dsp.c                 |    3 
 apps/codecs/libspc/spc_emu.c                 |    3 
 apps/codecs/libspc/spc_cpu.c                 |    3 
 firmware/export/debug.h                      |    3 
 firmware/export/config-mrobe500.h            |    3 
 firmware/rom.lds                             |    5 
 firmware/firmware.make                       |   30 ++++
 uisimulator/sdl/uisdl.h                      |    2 
 uisimulator/uisimulator.make                 |   22 +++
 149 files changed, 1602 insertions(+), 347 deletions(-)

Comment by Björn Stenberg (zagor) - Saturday, 15 November 2008, 00:13 GMT+2
Uh, patch 10 was not against svn head. So here's patch11, against r19106.
   unified_make11-nodelete.patch (120.9 KiB)
 bootloader/show_logo.c                       |    2 
 bootloader/bootloader.make                   |   27 ++++
 tools/Makefile                               |    4 
 tools/configure                              |  149 ----------------------
 tools/functions.make                         |   58 ++++++++
 tools/root.make                              |  177 +++++++++++++++++++++++++++
 tools/tools.make                             |   42 ++++++
 apps/lang/lang.make                          |   25 +++
 apps/plugins/xobox.c                         |    2 
 apps/plugins/test_resize.c                   |    4 
 apps/plugins/keybox.c                        |    2 
 apps/plugins/sliding_puzzle.c                |    2 
 apps/plugins/jpeg/jpeg.make                  |   12 +
 apps/plugins/plasma.c                        |    6 
 apps/plugins/random_folder_advance_config.c  |    2 
 apps/plugins/mandelbrot.c                    |    4 
 apps/plugins/zxbox/zxbox.make                |   48 +++++++
 apps/plugins/sudoku/sudoku.make              |   12 +
 apps/plugins/sudoku/sudoku.c                 |    6 
 apps/plugins/maze.c                          |    4 
 apps/plugins/wavrecord.c                     |    2 
 apps/plugins/chessbox/chessbox.c             |    2 
 apps/plugins/chessbox/SOURCES                |    4 
 apps/plugins/chessbox/chessbox.make          |   49 +++++++
 apps/plugins/oscilloscope.c                  |    6 
 apps/plugins/euroconverter.c                 |    2 
 apps/plugins/video.c                         |    2 
 apps/plugins/clock/clock_counter.h           |    2 
 apps/plugins/clock/clock_draw_digital.c      |    2 
 apps/plugins/clock/clock_bitmap_strings.h    |    2 
 apps/plugins/clock/clock_bitmaps.c           |   28 ++--
 apps/plugins/clock/clock_settings.c          |    2 
 apps/plugins/clock/clock_draw_binary.c       |    2 
 apps/plugins/clock/clock_bitmaps.h           |    2 
 apps/plugins/clock/clock.make                |   12 +
 apps/plugins/clock/clock_draw_analog.c       |    4 
 apps/plugins/clock/clock.c                   |    4 
 apps/plugins/zxbox.c                         |    2 
 apps/plugins/fireworks.c                     |    4 
 apps/plugins/plugins.make                    |   68 ++++++++++
 apps/plugins/starfield.c                     |    2 
 apps/plugins/ppmviewer.c                     |    2 
 apps/plugins/bitmaps/remote_native/SOURCES   |    4 
 apps/plugins/bitmaps/native/SOURCES          |   42 +++---
 apps/plugins/bitmaps/pluginbitmaps.make      |   51 +++++++
 apps/plugins/chessbox.c                      |    2 
 apps/plugins/test_sampr.c                    |    2 
 apps/plugins/rockblox.c                      |    6 
 apps/plugins/mpegplayer/stream_mgr.c         |    2 
 apps/plugins/mpegplayer/mpegplayer.make      |   12 +
 apps/plugins/mpegplayer/mpegplayer.c         |    2 
 apps/plugins/mpegplayer/mpeg_settings.c      |    2 
 apps/plugins/mpegplayer/mpegplayer.h         |    2 
 apps/plugins/mpegplayer/video_thread.c       |    2 
 apps/plugins/fire.c                          |    8 -
 apps/plugins/solitaire.c                     |    6 
 apps/plugins/rocklife.c                      |    4 
 apps/plugins/midi/midi.make                  |   19 ++
 apps/plugins/pictureflow.c                   |    8 -
 apps/plugins/dice.c                          |    4 
 apps/plugins/bounce.c                        |    2 
 apps/plugins/shortcuts/shortcuts.make        |   16 ++
 apps/plugins/doom/SOURCES                    |   62 +++++++++
 apps/plugins/doom/doom.make                  |   45 ++++++
 apps/plugins/cube.c                          |    8 -
 apps/plugins/greyscale.c                     |    4 
 apps/plugins/vu_meter.c                      |    2 
 apps/plugins/snow.c                          |    2 
 apps/plugins/rockboy/rockboy.make            |   44 ++++++
 apps/plugins/rockboy/SOURCES                 |   16 ++
 apps/plugins/test_disk.c                     |    4 
 apps/plugins/lamp.c                          |    2 
 apps/plugins/jackpot.c                       |    4 
 apps/plugins/spacerocks.c                    |    4 
 apps/plugins/reversi/reversi.make            |   19 ++
 apps/plugins/logo.c                          |    2 
 apps/plugins/brickmania.c                    |    4 
 apps/plugins/chopper.c                       |    6 
 apps/plugins/viewer.c                        |    4 
 apps/plugins/mazezam.c                       |    8 -
 apps/plugins/metronome.c                     |    2 
 apps/plugins/rockboy.c                       |    2 
 apps/plugins/demystify.c                     |    4 
 apps/plugins/bubbles.c                       |    6 
 apps/plugins/mosaique.c                      |    2 
 apps/plugins/test_fps.c                      |    4 
 apps/plugins/robotfindskitten.c              |    2 
 apps/plugins/jewels.c                        |    2 
 apps/plugins/wormlet.c                       |    4 
 apps/plugins/invadrox.c                      |    4 
 apps/plugins/rockpaint.c                     |    1 
 apps/plugins/text_editor.c                   |    2 
 apps/plugins/pacbox/pacbox.make              |   18 ++
 apps/plugins/credits.c                       |    2 
 apps/bitmaps/bitmaps.make                    |   42 ++++++
 apps/apps.make                               |   77 +++++++++++
 apps/codecs/libffmpegFLAC/decoder.c          |    2 
 apps/codecs/libffmpegFLAC/tables.c           |    2 
 apps/codecs/libffmpegFLAC/libffmpegFLAC.make |    8 +
 apps/codecs/libfaad/libfaad.make             |    8 +
 apps/codecs/libfaad/common.h                 |    3 
 apps/codecs/ape.c                            |    1 
 apps/codecs/libmad/global.h                  |    2 
 apps/codecs/libmad/libmad.make               |   45 ++++++
 apps/codecs/libmusepack/musepack.h           |    1 
 apps/codecs/libmusepack/libmusepack.make     |   20 +++
 apps/codecs/lib/libcodec.make                |   14 ++
 apps/codecs/lib/codeclib.c                   |    4 
 apps/codecs/lib/codeclib.h                   |   13 +
 apps/codecs/libwma/libwma.make               |    8 +
 apps/codecs/codecs.make                      |   86 +++++++++++++
 apps/codecs/liba52/config-a52.h              |    2 
 apps/codecs/liba52/liba52.make               |    8 +
 apps/codecs/libwavpack/wavpack.h             |    6 
 apps/codecs/libwavpack/libwavpack.make       |    8 +
 apps/codecs/libalac/alac.c                   |    2 
 apps/codecs/libalac/libalac.make             |   15 ++
 apps/codecs/libtremor/config-tremor.h        |    2 
 apps/codecs/libtremor/oggmalloc.c            |    3 
 apps/codecs/libtremor/libtremor.make         |   27 ++++
 apps/codecs/wma.c                            |    2 
 apps/codecs/libm4a/m4a.c                     |    7 -
 apps/codecs/libm4a/demux.c                   |    5 
 apps/codecs/libm4a/libm4a.make               |   15 ++
 apps/codecs/demac/libdemac.make              |   15 ++
 apps/codecs/libspeex/speex/ogg.h             |    2 
 apps/codecs/libspeex/libspeex.make           |   51 +++++++
 apps/codecs/libspeex/cb_search.c             |    6 
 apps/codecs/libspeex/ltp.c                   |   11 +
 apps/codecs/libspeex/filters.c               |    5 
 apps/codecs/libspeex/rockbox.h               |   13 +
 apps/codecs/libspeex/ltp_arm4.h              |    1 
 apps/codecs/libspeex/lsp.c                   |    1 
 apps/codecs/libspeex/stereo.c                |    1 
 apps/codecs/libspeex/speex_callbacks.c       |   11 +
 apps/codecs/libspeex/config-speex.h          |    2 
 apps/codecs/libasap/libasap.make             |   15 ++
 apps/codecs/libspc/spc_codec.h               |    2 
 apps/codecs/libspc/spc_profiler.c            |    2 
 apps/codecs/libspc/libspc.make               |   15 ++
 apps/codecs/libspc/spc_dsp.c                 |    3 
 apps/codecs/libspc/spc_emu.c                 |    3 
 apps/codecs/libspc/spc_cpu.c                 |    3 
 firmware/export/debug.h                      |    3 
 firmware/export/config-mrobe500.h            |    3 
 firmware/rom.lds                             |    5 
 firmware/firmware.make                       |   30 ++++
 uisimulator/sdl/uisdl.h                      |    2 
 uisimulator/uisimulator.make                 |   22 +++
 149 files changed, 1602 insertions(+), 347 deletions(-)

Comment by Frank Gevaerts (fg) - Saturday, 15 November 2008, 02:00 GMT+2
m:robe 100:
/home/fg/rockbox/patched/apps/plugins/bitmaps/remote_native/SOURCES:20:6: warning: "LCD_REMOTE_DEPTH" is not defined
/home/fg/rockbox/patched/apps/plugins/bitmaps/remote_native/SOURCES:22:8: warning: "LCD_REMOTE_DEPTH" is not defined

h120 (and all other coldfires):
/home/fg/rockbox/dev/m68k-elf/bin/../lib/gcc/m68k-elf/3.4.6/../../../../m68k-elf/bin/ld: warning: cannot find entry symbol start; defaulting to 0010212c
/home/fg/rockbox/patched/apps/codecs/libmusepack/mpc_decoder.c: In function `mpc_move_next':
/home/fg/rockbox/patched/apps/codecs/libmusepack/mpc_decoder.c:184: warning: implicit declaration of function `swap32'
/home/fg/rockbox/patched/apps/codecs/libmusepack/mpc_decoder.c: In function `mpc_decoder_setup':
/home/fg/rockbox/patched/apps/codecs/libmusepack/mpc_decoder.c:1467: warning: implicit declaration of function `coldfire_set_macsr'
/home/fg/rockbox/patched/apps/codecs/libmusepack/mpc_decoder.c:1467: error: `EMAC_FRACTIONAL' undeclared (first use in this function)
/home/fg/rockbox/patched/apps/codecs/libmusepack/mpc_decoder.c:1467: error: (Each undeclared identifier is reported only once
/home/fg/rockbox/patched/apps/codecs/libmusepack/mpc_decoder.c:1467: error: for each function it appears in.)
/home/fg/rockbox/patched/apps/codecs/libmusepack/mpc_decoder.c:1467: error: `EMAC_SATURATE' undeclared (first use in this function)
make: *** [/home/fg/rockbox/patched/build-h120/apps/codecs/libmusepack/mpc_decoder.o] Error 1

Builds for other supported targets seem to be OK (although I haven't checked if all rocks were built) . I'm now building others as well. I haven't tried sims or bootloaders yet
Comment by Andrew Mahone (Unhelpful) - Saturday, 15 November 2008, 03:21 GMT+2
In a build against a completely clean tree, it was failing due to dependencies on sysfont.h and iaudio_bl_flash.h. This is an attempt to add those deps, and a rule for iaudio_bl_flash.h, to be applied on top of unified_make11-nodelete.patch. It works for me, but may need further improvement.
   unified_make11-sysfont-iaudio_bl_flash.patch (1.4 KiB)
 b/apps/plugins/plugins.make |    2 ++
 b/tools/tools.make          |    7 +++++++
 2 files changed, 9 insertions(+)

Comment by Björn Stenberg (zagor) - Sunday, 16 November 2008, 02:36 GMT+2
All reported issues fixed.
   unified_make12-nodelete.patch (125.2 KiB)
 bootloader/show_logo.c                       |    2 
 bootloader/bootloader.make                   |   27 +++
 tools/Makefile                               |    4 
 tools/configure                              |  164 ----------------------
 tools/functions.make                         |   59 ++++++++
 tools/root.make                              |  196 +++++++++++++++++++++++++++
 tools/tools.make                             |   31 ++++
 apps/lang/lang.make                          |   25 +++
 apps/plugins/xobox.c                         |    2 
 apps/plugins/test_resize.c                   |    4 
 apps/plugins/keybox.c                        |    2 
 apps/plugins/sliding_puzzle.c                |    2 
 apps/plugins/jpeg/jpeg.make                  |   12 +
 apps/plugins/plasma.c                        |    6 
 apps/plugins/random_folder_advance_config.c  |    2 
 apps/plugins/mandelbrot.c                    |    4 
 apps/plugins/zxbox/zxbox.make                |   48 ++++++
 apps/plugins/sudoku/sudoku.make              |   12 +
 apps/plugins/sudoku/sudoku.c                 |    6 
 apps/plugins/maze.c                          |    4 
 apps/plugins/wavrecord.c                     |    2 
 apps/plugins/chessbox/chessbox.c             |    2 
 apps/plugins/chessbox/SOURCES                |    4 
 apps/plugins/chessbox/chessbox.make          |   49 ++++++
 apps/plugins/oscilloscope.c                  |    6 
 apps/plugins/euroconverter.c                 |    2 
 apps/plugins/video.c                         |    2 
 apps/plugins/clock/clock_counter.h           |    2 
 apps/plugins/clock/clock_draw_digital.c      |    2 
 apps/plugins/clock/clock_bitmap_strings.h    |    2 
 apps/plugins/clock/clock_bitmaps.c           |   28 +--
 apps/plugins/clock/clock_settings.c          |    2 
 apps/plugins/clock/clock_draw_binary.c       |    2 
 apps/plugins/clock/clock_bitmaps.h           |    2 
 apps/plugins/clock/clock.make                |   12 +
 apps/plugins/clock/clock_draw_analog.c       |    4 
 apps/plugins/clock/clock.c                   |    4 
 apps/plugins/zxbox.c                         |    2 
 apps/plugins/fireworks.c                     |    4 
 apps/plugins/plugins.make                    |   66 +++++++++
 apps/plugins/starfield.c                     |    2 
 apps/plugins/ppmviewer.c                     |    2 
 apps/plugins/bitmaps/remote_native/SOURCES   |    4 
 apps/plugins/bitmaps/native/SOURCES          |   42 ++---
 apps/plugins/bitmaps/pluginbitmaps.make      |   51 +++++++
 apps/plugins/chessbox.c                      |    2 
 apps/plugins/test_sampr.c                    |    2 
 apps/plugins/rockblox.c                      |    6 
 apps/plugins/mpegplayer/stream_mgr.c         |    2 
 apps/plugins/mpegplayer/mpegplayer.make      |   12 +
 apps/plugins/mpegplayer/mpegplayer.c         |    2 
 apps/plugins/mpegplayer/mpeg_settings.c      |    2 
 apps/plugins/mpegplayer/mpegplayer.h         |    2 
 apps/plugins/mpegplayer/video_thread.c       |    2 
 apps/plugins/fire.c                          |    8 -
 apps/plugins/solitaire.c                     |    6 
 apps/plugins/rocklife.c                      |    4 
 apps/plugins/midi/midi.make                  |   19 ++
 apps/plugins/pictureflow.c                   |    8 -
 apps/plugins/dice.c                          |    4 
 apps/plugins/bounce.c                        |    2 
 apps/plugins/shortcuts/shortcuts.make        |   16 ++
 apps/plugins/doom/SOURCES                    |   62 ++++++++
 apps/plugins/doom/doom.make                  |   45 ++++++
 apps/plugins/cube.c                          |    8 -
 apps/plugins/greyscale.c                     |    4 
 apps/plugins/vu_meter.c                      |    2 
 apps/plugins/snow.c                          |    2 
 apps/plugins/rockboy/rockboy.make            |   44 ++++++
 apps/plugins/rockboy/SOURCES                 |   16 ++
 apps/plugins/test_disk.c                     |    4 
 apps/plugins/lamp.c                          |    2 
 apps/plugins/jackpot.c                       |    4 
 apps/plugins/sokoban.c                       |    8 +
 apps/plugins/spacerocks.c                    |    4 
 apps/plugins/reversi/reversi.make            |   19 ++
 apps/plugins/logo.c                          |    2 
 apps/plugins/brickmania.c                    |    4 
 apps/plugins/chopper.c                       |    6 
 apps/plugins/viewer.c                        |    4 
 apps/plugins/mazezam.c                       |    8 -
 apps/plugins/metronome.c                     |    2 
 apps/plugins/rockboy.c                       |    2 
 apps/plugins/demystify.c                     |    4 
 apps/plugins/bubbles.c                       |    6 
 apps/plugins/mosaique.c                      |    2 
 apps/plugins/test_fps.c                      |    4 
 apps/plugins/robotfindskitten.c              |   10 +
 apps/plugins/jewels.c                        |    2 
 apps/plugins/wormlet.c                       |    4 
 apps/plugins/invadrox.c                      |    4 
 apps/plugins/rockpaint.c                     |    1 
 apps/plugins/text_editor.c                   |    2 
 apps/plugins/pacbox/pacbox.make              |   18 ++
 apps/plugins/credits.c                       |    2 
 apps/bitmaps/bitmaps.make                    |   42 +++++
 apps/apps.make                               |   83 +++++++++++
 apps/codecs/libffmpegFLAC/decoder.c          |    2 
 apps/codecs/libffmpegFLAC/tables.c           |    2 
 apps/codecs/libffmpegFLAC/libffmpegFLAC.make |    8 +
 apps/codecs/libfaad/libfaad.make             |    8 +
 apps/codecs/libfaad/common.h                 |    3 
 apps/codecs/ape.c                            |    1 
 apps/codecs/libmad/global.h                  |    2 
 apps/codecs/libmad/libmad.make               |   45 ++++++
 apps/codecs/libmad/frame.c                   |    2 
 apps/codecs/libmusepack/musepack.h           |    4 
 apps/codecs/libmusepack/libmusepack.make     |   20 ++
 apps/codecs/lib/libcodec.make                |   14 +
 apps/codecs/lib/codeclib.c                   |    4 
 apps/codecs/lib/codeclib.h                   |   13 +
 apps/codecs/libwma/libwma.make               |    8 +
 apps/codecs/codecs.make                      |   93 ++++++++++++
 apps/codecs/liba52/config-a52.h              |    2 
 apps/codecs/liba52/liba52.make               |    8 +
 apps/codecs/libwavpack/wavpack.h             |    6 
 apps/codecs/libwavpack/libwavpack.make       |    8 +
 apps/codecs/libalac/alac.c                   |    2 
 apps/codecs/libalac/libalac.make             |   15 ++
 apps/codecs/libtremor/config-tremor.h        |    2 
 apps/codecs/libtremor/oggmalloc.c            |    3 
 apps/codecs/libtremor/libtremor.make         |   27 +++
 apps/codecs/wma.c                            |    2 
 apps/codecs/libm4a/m4a.c                     |    7 
 apps/codecs/libm4a/demux.c                   |    5 
 apps/codecs/libm4a/libm4a.make               |   15 ++
 apps/codecs/demac/libdemac/parser.h          |    2 
 apps/codecs/demac/libdemac/rangecoding.h     |    2 
 apps/codecs/demac/libdemac.make              |   15 ++
 apps/codecs/libspeex/speex/ogg.h             |    2 
 apps/codecs/libspeex/libspeex.make           |   51 +++++++
 apps/codecs/libspeex/cb_search.c             |    6 
 apps/codecs/libspeex/ltp.c                   |   11 +
 apps/codecs/libspeex/filters.c               |    5 
 apps/codecs/libspeex/rockbox.h               |   13 +
 apps/codecs/libspeex/ltp_arm4.h              |    1 
 apps/codecs/libspeex/lsp.c                   |    1 
 apps/codecs/libspeex/stereo.c                |    1 
 apps/codecs/libspeex/speex_callbacks.c       |   11 +
 apps/codecs/libspeex/config-speex.h          |    2 
 apps/codecs/libasap/libasap.make             |   15 ++
 apps/codecs/libspc/spc_codec.h               |    2 
 apps/codecs/libspc/spc_profiler.c            |    2 
 apps/codecs/libspc/libspc.make               |   15 ++
 apps/codecs/libspc/spc_dsp.c                 |    3 
 apps/codecs/libspc/spc_emu.c                 |    3 
 apps/codecs/libspc/spc_cpu.c                 |    3 
 firmware/export/debug.h                      |    3 
 firmware/export/config-mrobe500.h            |    3 
 firmware/firmware.make                       |   30 ++++
 uisimulator/sdl/uisdl.h                      |    2 
 uisimulator/uisimulator.make                 |   23 +++
 152 files changed, 1645 insertions(+), 360 deletions(-)

Comment by Frank Gevaerts (fg) - Sunday, 16 November 2008, 17:10 GMT+2
I tested all "normal" builds and quickly compared the zips:
- thai.lng isn't included in the zips for some reason
- ondio sp and player don't have a rombox.ucl anymore
- m200v4 and logik dax builds have linker errors that aren't there in trunk
- (probably as expected) no more midiplay.rock, but midi.rock instead
Comment by Frank Gevaerts (fg) - Sunday, 16 November 2008, 17:48 GMT+2
Bootloaders seem to build, except for the archoses (bootbox issues):
/home/fg/rockbox/patched/tools/root.make:33: /home/fg/rockbox/patched/flash/bootbox/apps.make: No such file or directory
/home/fg/rockbox/patched/tools/root.make:34: /home/fg/rockbox/patched/flash/bootbox/lang/lang.make: No such file or directory
/home/fg/rockbox/patched/tools/root.make:41: /home/fg/rockbox/patched/flash/bootbox/plugins/bitmaps/pluginbitmaps.make: No such file or directory
/home/fg/rockbox/patched/tools/root.make:42: /home/fg/rockbox/patched/flash/bootbox/plugins/plugins.make: No such file or directory
make: *** No rule to make target `/home/fg/rockbox/patched/flash/bootbox/plugins/plugins.make'. Stop.

The meizu m3 bootloader also doesn't build, but that's probably because of a meizu-specific bug (i.e. my fault). As that one isn't in the build table, it can be fixed later
Comment by Frank Gevaerts (fg) - Sunday, 16 November 2008, 20:36 GMT+2
All swcodec sims build on linux, but the hwcodec ones don't:
/home/fg/rockbox/patched/buildls-fmrecorder/uisimulator/sdl/sound.o: In function `pcm_apply_settings_nolock':
/home/fg/rockbox/patched/uisimulator/sdl/sound.c:75: undefined reference to `pcm_curr_sampr'
/home/fg/rockbox/patched/uisimulator/sdl/sound.c:78: undefined reference to `pcm_curr_sampr'
/home/fg/rockbox/patched/buildls-fmrecorder/uisimulator/sdl/sound.o: In function `sdl_audio_callback':
/home/fg/rockbox/patched/uisimulator/sdl/sound.c:235: undefined reference to `pcm_callback_for_more'
/home/fg/rockbox/patched/uisimulator/sdl/sound.c:236: undefined reference to `pcm_callback_for_more'
/home/fg/rockbox/patched/uisimulator/sdl/sound.c:256: undefined reference to `pcm_play_dma_stopped_callback'
collect2: ld returned 1 exit status
make: *** [/home/fg/rockbox/patched/buildls-fmrecorder/rockboxui] Error 1

The player gets another error first:
make: *** No rule to make target `lcd-playersim.h', needed by `/home/fg/rockbox/patched/buildls-player/uisimulator/sdl/lcd-charcells.o'. Stop.
Comment by Andrew Mahone (Unhelpful) - Sunday, 16 November 2008, 21:06 GMT+2
I get:
make: *** No rule to make target `../lib/codeclib.h', needed by `/home/chshrcat/build/rockbox/build/s_firm/apps/codecs/demac/libdemac/entropy.o'. Stop.

when building vs current svn. changing apps/codecs/demac/libdemac/entropy.c to include "codeclib.h" resolves it for me.
Comment by Andrew Mahone (Unhelpful) - Sunday, 16 November 2008, 21:34 GMT+2
On Gigabeat S, now that I've had a chance to attempt to play music, I'm getting codec failures attempting to play mp3 and vorbis (there's nothing else on the player).
Comment by Steve Bavin (pondlife) - Monday, 17 November 2008, 08:35 GMT+2
1) Small sync issue when patching:
...
patching file apps/codecs/demac/libdemac/parser.h
Hunk #1 FAILED at 31.
1 out of 1 hunk FAILED -- saving rejects to file apps/codecs/demac/libdemac/parser.h.rej
can't find file to patch at input line 3189
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: apps/codecs/demac/libdemac/rangecoding.h
|===================================================================
|--- apps/codecs/demac/libdemac/rangecoding.h (revision 19109)
|+++ apps/codecs/demac/libdemac/rangecoding.h (working copy)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
...

2) Warnings displayed when making:
$ make
Makefile:67: warning: overriding commands for target `install'
/home/Steve/rockbox/tools/root.make:140: warning: ignoring old commands for target `install'
Makefile:72: warning: overriding commands for target `fullinstall'
/home/Steve/rockbox/tools/root.make:145: warning: ignoring old commands for target `fullinstall'
Generating dependencies
...

3) Error buildimg H300 sim under Cygwin:
make: *** No rule to make target `/home/Steve/rockbox/buildsim/apps/SDL_main.o', needed by `/home/Steve/rockbox/buildsim/rockboxui.exe'. Stop.
Comment by Björn Stenberg (zagor) - Tuesday, 18 November 2008, 09:18 GMT+2
Reported issues fixed, except:

- I don't have a gigabeat s so I haven't verified if it works. It works on my c200 though.
- I also don't have a cygwin environment to test in, so that is likely still broken.
   unified_make13-nodelete.patch (129.6 KiB)
 bootloader/show_logo.c                       |    2 
 bootloader/bootloader.make                   |   27 ++
 flash/bootbox/bootbox.make                   |    4 
 tools/Makefile                               |    4 
 tools/configure                              |  181 -----------------
 tools/functions.make                         |   59 +++++
 tools/root.make                              |  276 +++++++++++++++++++++++++++
 tools/tools.make                             |   31 +++
 apps/plugins/xobox.c                         |    2 
 apps/plugins/test_resize.c                   |    4 
 apps/plugins/keybox.c                        |    2 
 apps/plugins/sliding_puzzle.c                |    2 
 apps/plugins/jpeg/jpeg.make                  |   12 +
 apps/plugins/plasma.c                        |    6 
 apps/plugins/random_folder_advance_config.c  |    2 
 apps/plugins/mandelbrot.c                    |    4 
 apps/plugins/zxbox/zxbox.make                |   48 ++++
 apps/plugins/zxbox/zxvid_com.h               |    2 
 apps/plugins/zxbox/spmain.c                  |    2 
 apps/plugins/sudoku/sudoku.make              |   12 +
 apps/plugins/sudoku/sudoku.c                 |    6 
 apps/plugins/maze.c                          |    4 
 apps/plugins/wavrecord.c                     |    2 
 apps/plugins/chessbox/chessbox.c             |    2 
 apps/plugins/chessbox/SOURCES                |    4 
 apps/plugins/chessbox/chessbox.make          |   49 ++++
 apps/plugins/oscilloscope.c                  |    6 
 apps/plugins/euroconverter.c                 |    2 
 apps/plugins/video.c                         |    2 
 apps/plugins/zxbox.c                         |    2 
 apps/plugins/clock/clock_counter.h           |    2 
 apps/plugins/clock/clock_bitmap_strings.h    |    2 
 apps/plugins/clock/clock_draw_digital.c      |    2 
 apps/plugins/clock/clock_bitmaps.c           |   28 +-
 apps/plugins/clock/clock_settings.c          |    2 
 apps/plugins/clock/clock_draw_binary.c       |    2 
 apps/plugins/clock/clock_bitmaps.h           |    2 
 apps/plugins/clock/clock.make                |   12 +
 apps/plugins/clock/clock_draw_analog.c       |    4 
 apps/plugins/clock/clock.c                   |    4 
 apps/plugins/fireworks.c                     |    4 
 apps/plugins/plugins.make                    |   66 ++++++
 apps/plugins/starfield.c                     |    2 
 apps/plugins/chessbox.c                      |    2 
 apps/plugins/bitmaps/remote_native/SOURCES   |    4 
 apps/plugins/bitmaps/native/SOURCES          |   42 ++--
 apps/plugins/bitmaps/pluginbitmaps.make      |   50 ++++
 apps/plugins/ppmviewer.c                     |    2 
 apps/plugins/test_sampr.c                    |    2 
 apps/plugins/rockblox.c                      |    6 
 apps/plugins/mpegplayer/stream_mgr.c         |    2 
 apps/plugins/mpegplayer/mpegplayer.make      |   12 +
 apps/plugins/mpegplayer/mpegplayer.c         |    2 
 apps/plugins/mpegplayer/mpeg_settings.c      |    2 
 apps/plugins/mpegplayer/mpegplayer.h         |    2 
 apps/plugins/mpegplayer/audio_thread.c       |    4 
 apps/plugins/mpegplayer/video_thread.c       |    2 
 apps/plugins/fire.c                          |    8 
 apps/plugins/solitaire.c                     |    6 
 apps/plugins/rocklife.c                      |    4 
 apps/plugins/midi/midi.make                  |   19 +
 apps/plugins/pictureflow.c                   |    8 
 apps/plugins/dice.c                          |    4 
 apps/plugins/bounce.c                        |    2 
 apps/plugins/shortcuts/shortcuts.make        |   16 +
 apps/plugins/doom/i_video.c                  |    2 
 apps/plugins/doom/SOURCES                    |   62 ++++++
 apps/plugins/doom/doom.make                  |   45 ++++
 apps/plugins/cube.c                          |    8 
 apps/plugins/greyscale.c                     |    4 
 apps/plugins/vu_meter.c                      |    2 
 apps/plugins/snow.c                          |    2 
 apps/plugins/rockboy/rockboy.make            |   44 ++++
 apps/plugins/rockboy/SOURCES                 |   16 +
 apps/plugins/test_disk.c                     |    4 
 apps/plugins/lamp.c                          |    2 
 apps/plugins/jackpot.c                       |    4 
 apps/plugins/sokoban.c                       |    8 
 apps/plugins/spacerocks.c                    |    4 
 apps/plugins/reversi/reversi-gui.c           |    2 
 apps/plugins/reversi/reversi.make            |   19 +
 apps/plugins/logo.c                          |    2 
 apps/plugins/brickmania.c                    |    4 
 apps/plugins/chopper.c                       |    6 
 apps/plugins/viewer.c                        |    4 
 apps/plugins/mazezam.c                       |    8 
 apps/plugins/metronome.c                     |    2 
 apps/plugins/rockboy.c                       |    2 
 apps/plugins/demystify.c                     |    4 
 apps/plugins/bubbles.c                       |    6 
 apps/plugins/mosaique.c                      |    2 
 apps/plugins/test_fps.c                      |    4 
 apps/plugins/robotfindskitten.c              |   10 
 apps/plugins/jewels.c                        |    2 
 apps/plugins/wormlet.c                       |    4 
 apps/plugins/invadrox.c                      |    4 
 apps/plugins/rockpaint.c                     |    1 
 apps/plugins/text_editor.c                   |    2 
 apps/plugins/pacbox/pacbox.make              |   18 +
 apps/plugins/credits.c                       |    2 
 apps/lang/lang.make                          |   25 ++
 apps/bitmaps/bitmaps.make                    |   42 ++++
 apps/apps.make                               |   16 +
 apps/debug_menu.c                            |    2 
 apps/codecs/libffmpegFLAC/decoder.c          |    2 
 apps/codecs/libffmpegFLAC/tables.c           |    2 
 apps/codecs/libffmpegFLAC/libffmpegFLAC.make |    8 
 apps/codecs/libfaad/libfaad.make             |    8 
 apps/codecs/libfaad/common.h                 |    3 
 apps/codecs/ape.c                            |    1 
 apps/codecs/libmad/global.h                  |    2 
 apps/codecs/libmad/libmad.make               |   45 ++++
 apps/codecs/libmad/frame.c                   |    2 
 apps/codecs/libmusepack/musepack.h           |    4 
 apps/codecs/libmusepack/libmusepack.make     |   20 +
 apps/codecs/lib/libcodec.make                |   14 +
 apps/codecs/lib/codeclib.c                   |    4 
 apps/codecs/lib/codeclib.h                   |   13 +
 apps/codecs/libwma/libwma.make               |    8 
 apps/codecs/codecs.make                      |   93 +++++++++
 apps/codecs/liba52/config-a52.h              |    2 
 apps/codecs/liba52/liba52.make               |    8 
 apps/codecs/libwavpack/wavpack.h             |    6 
 apps/codecs/libwavpack/libwavpack.make       |    8 
 apps/codecs/libalac/alac.c                   |    2 
 apps/codecs/libalac/libalac.make             |   15 +
 apps/codecs/libtremor/config-tremor.h        |    2 
 apps/codecs/libtremor/oggmalloc.c            |    3 
 apps/codecs/libtremor/ctype.c                |    2 
 apps/codecs/libtremor/libtremor.make         |   27 ++
 apps/codecs/wma.c                            |    2 
 apps/codecs/libm4a/m4a.c                     |    7 
 apps/codecs/libm4a/demux.c                   |    5 
 apps/codecs/libm4a/libm4a.make               |   15 +
 apps/codecs/demac/libdemac/demac_config.h    |    2 
 apps/codecs/demac/libdemac.make              |   15 +
 apps/codecs/libspeex/speex/ogg.h             |    2 
 apps/codecs/libspeex/libspeex.make           |   51 ++++
 apps/codecs/libspeex/cb_search.c             |    6 
 apps/codecs/libspeex/ltp.c                   |   11 +
 apps/codecs/libspeex/filters.c               |    5 
 apps/codecs/libspeex/rockbox.h               |   13 +
 apps/codecs/libspeex/ltp_arm4.h              |    1 
 apps/codecs/libspeex/lsp.c                   |    1 
 apps/codecs/libspeex/stereo.c                |    1 
 apps/codecs/libspeex/speex_callbacks.c       |   11 -
 apps/codecs/libspeex/config-speex.h          |    2 
 apps/codecs/libasap/libasap.make             |   15 +
 apps/codecs/libspc/spc_codec.h               |    2 
 apps/codecs/libspc/spc_profiler.c            |    2 
 apps/codecs/libspc/libspc.make               |   15 +
 apps/codecs/libspc/spc_dsp.c                 |    3 
 apps/codecs/libspc/spc_emu.c                 |    3 
 apps/codecs/libspc/spc_cpu.c                 |    3 
 firmware/export/debug.h                      |    3 
 firmware/export/config-mrobe500.h            |    3 
 firmware/decompressor/Makefile               |    1 
 firmware/firmware.make                       |   30 ++
 uisimulator/sdl/uisdl.h                      |    2 
 uisimulator/uisimulator.make                 |   33 +++
 160 files changed, 1679 insertions(+), 384 deletions(-)

Comment by Steve Bavin (pondlife) - Tuesday, 18 November 2008, 09:29 GMT+2
Thanks Bjorn - much better on Cygwin now, but sim builds still fail (as you expected).

Error is as before - "make: *** No rule to make target `/home/Steve/rockbox/buildsim/apps/SDL_main.o', needed by `/home/Steve/rockbox/buildsim/rockboxui.exe'. Stop."

Full output is at http://www.pastebin.ca/1260177, if it helps at all. Also attached a comparison of the old and new makefiles.
Comment by Björn Stenberg (zagor) - Wednesday, 19 November 2008, 00:45 GMT+2
According to tonight's 103 test builds, this patch should now compile on all targets svn compiles on.

The cygwin issue is still unsolved. My only clue is the file /usr/include/SDL/SDL_main.h. Can you upload make.dep somewhere?
   unified_make14-nodelete.patch (130 KiB)
 bootloader/show_logo.c                       |    2 
 bootloader/bootloader.make                   |   27 ++
 flash/bootbox/bootbox.make                   |    4 
 tools/Makefile                               |    4 
 tools/configure                              |  183 -----------------
 tools/functions.make                         |   59 +++++
 tools/root.make                              |  282 +++++++++++++++++++++++++++
 tools/tools.make                             |   31 ++
 apps/plugins/xobox.c                         |    2 
 apps/plugins/test_resize.c                   |    4 
 apps/plugins/keybox.c                        |    2 
 apps/plugins/sliding_puzzle.c                |    2 
 apps/plugins/jpeg/jpeg.make                  |   12 +
 apps/plugins/plasma.c                        |    6 
 apps/plugins/random_folder_advance_config.c  |    2 
 apps/plugins/mandelbrot.c                    |    4 
 apps/plugins/zxbox/zxbox.make                |   48 ++++
 apps/plugins/zxbox/zxvid_com.h               |    2 
 apps/plugins/zxbox/spmain.c                  |    2 
 apps/plugins/sudoku/sudoku.make              |   12 +
 apps/plugins/sudoku/sudoku.c                 |    6 
 apps/plugins/maze.c                          |    4 
 apps/plugins/wavrecord.c                     |    2 
 apps/plugins/chessbox/chessbox.c             |    2 
 apps/plugins/chessbox/SOURCES                |    4 
 apps/plugins/chessbox/chessbox.make          |   49 ++++
 apps/plugins/oscilloscope.c                  |    6 
 apps/plugins/euroconverter.c                 |    2 
 apps/plugins/video.c                         |    2 
 apps/plugins/zxbox.c                         |    2 
 apps/plugins/clock/clock_counter.h           |    2 
 apps/plugins/clock/clock_bitmap_strings.h    |    2 
 apps/plugins/clock/clock_draw_digital.c      |    2 
 apps/plugins/clock/clock_bitmaps.c           |   28 +-
 apps/plugins/clock/clock_settings.c          |    2 
 apps/plugins/clock/clock_draw_binary.c       |    2 
 apps/plugins/clock/clock_bitmaps.h           |    2 
 apps/plugins/clock/clock.make                |   12 +
 apps/plugins/clock/clock_draw_analog.c       |    4 
 apps/plugins/clock/clock.c                   |    4 
 apps/plugins/fireworks.c                     |    4 
 apps/plugins/plugins.make                    |   66 ++++++
 apps/plugins/starfield.c                     |    2 
 apps/plugins/chessbox.c                      |    2 
 apps/plugins/bitmaps/remote_native/SOURCES   |    4 
 apps/plugins/bitmaps/native/SOURCES          |   42 ++--
 apps/plugins/bitmaps/pluginbitmaps.make      |   50 ++++
 apps/plugins/ppmviewer.c                     |    2 
 apps/plugins/test_sampr.c                    |    2 
 apps/plugins/rockblox.c                      |    6 
 apps/plugins/mpegplayer/stream_mgr.c         |    2 
 apps/plugins/mpegplayer/mpegplayer.make      |   12 +
 apps/plugins/mpegplayer/mpegplayer.c         |    2 
 apps/plugins/mpegplayer/mpeg_settings.c      |    2 
 apps/plugins/mpegplayer/mpegplayer.h         |    2 
 apps/plugins/mpegplayer/audio_thread.c       |    4 
 apps/plugins/mpegplayer/video_thread.c       |    2 
 apps/plugins/fire.c                          |    8 
 apps/plugins/solitaire.c                     |    6 
 apps/plugins/rocklife.c                      |    4 
 apps/plugins/midi/midi.make                  |   19 +
 apps/plugins/pictureflow.c                   |    8 
 apps/plugins/dice.c                          |    4 
 apps/plugins/bounce.c                        |    2 
 apps/plugins/shortcuts/shortcuts.make        |   16 +
 apps/plugins/doom/i_video.c                  |    2 
 apps/plugins/doom/SOURCES                    |   62 +++++
 apps/plugins/doom/doom.make                  |   45 ++++
 apps/plugins/cube.c                          |    8 
 apps/plugins/greyscale.c                     |    4 
 apps/plugins/vu_meter.c                      |    2 
 apps/plugins/snow.c                          |    2 
 apps/plugins/rockboy/rockboy.make            |   44 ++++
 apps/plugins/rockboy/SOURCES                 |   16 +
 apps/plugins/test_disk.c                     |    4 
 apps/plugins/lamp.c                          |    2 
 apps/plugins/jackpot.c                       |    4 
 apps/plugins/sokoban.c                       |    8 
 apps/plugins/spacerocks.c                    |    4 
 apps/plugins/reversi/reversi-gui.c           |    2 
 apps/plugins/reversi/reversi.make            |   19 +
 apps/plugins/logo.c                          |    2 
 apps/plugins/brickmania.c                    |    4 
 apps/plugins/chopper.c                       |    6 
 apps/plugins/viewer.c                        |    4 
 apps/plugins/mazezam.c                       |    8 
 apps/plugins/metronome.c                     |    2 
 apps/plugins/rockboy.c                       |    2 
 apps/plugins/demystify.c                     |    4 
 apps/plugins/bubbles.c                       |    6 
 apps/plugins/mosaique.c                      |    2 
 apps/plugins/test_fps.c                      |    4 
 apps/plugins/robotfindskitten.c              |   10 
 apps/plugins/jewels.c                        |    2 
 apps/plugins/wormlet.c                       |    4 
 apps/plugins/invadrox.c                      |    4 
 apps/plugins/rockpaint.c                     |    1 
 apps/plugins/text_editor.c                   |    2 
 apps/plugins/pacbox/pacbox.make              |   18 +
 apps/plugins/credits.c                       |    2 
 apps/lang/lang.make                          |   25 ++
 apps/bitmaps/bitmaps.make                    |   42 ++++
 apps/apps.make                               |   16 +
 apps/debug_menu.c                            |    2 
 apps/codecs/libffmpegFLAC/decoder.c          |    2 
 apps/codecs/libffmpegFLAC/tables.c           |    2 
 apps/codecs/libffmpegFLAC/libffmpegFLAC.make |    8 
 apps/codecs/libfaad/libfaad.make             |    8 
 apps/codecs/libfaad/common.h                 |    3 
 apps/codecs/ape.c                            |    1 
 apps/codecs/libmad/global.h                  |    2 
 apps/codecs/libmad/libmad.make               |   45 ++++
 apps/codecs/libmad/frame.c                   |    2 
 apps/codecs/libmusepack/musepack.h           |    4 
 apps/codecs/libmusepack/libmusepack.make     |   20 +
 apps/codecs/lib/libcodec.make                |   14 +
 apps/codecs/lib/codeclib.c                   |    4 
 apps/codecs/lib/codeclib.h                   |   13 +
 apps/codecs/libwma/libwma.make               |    8 
 apps/codecs/codecs.make                      |   93 ++++++++
 apps/codecs/liba52/config-a52.h              |    2 
 apps/codecs/liba52/liba52.make               |    8 
 apps/codecs/libwavpack/wavpack.h             |    6 
 apps/codecs/libwavpack/libwavpack.make       |    8 
 apps/codecs/libalac/alac.c                   |    2 
 apps/codecs/libalac/libalac.make             |   15 +
 apps/codecs/libtremor/config-tremor.h        |    2 
 apps/codecs/libtremor/oggmalloc.c            |    3 
 apps/codecs/libtremor/ctype.c                |    2 
 apps/codecs/libtremor/libtremor.make         |   27 ++
 apps/codecs/wma.c                            |    2 
 apps/codecs/libm4a/m4a.c                     |    7 
 apps/codecs/libm4a/demux.c                   |    5 
 apps/codecs/libm4a/libm4a.make               |   15 +
 apps/codecs/demac/libdemac/demac_config.h    |    2 
 apps/codecs/demac/libdemac.make              |   15 +
 apps/codecs/libspeex/speex/ogg.h             |    2 
 apps/codecs/libspeex/libspeex.make           |   51 ++++
 apps/codecs/libspeex/cb_search.c             |    6 
 apps/codecs/libspeex/ltp.c                   |   11 +
 apps/codecs/libspeex/filters.c               |    5 
 apps/codecs/libspeex/rockbox.h               |   13 +
 apps/codecs/libspeex/ltp_arm4.h              |    1 
 apps/codecs/libspeex/lsp.c                   |    1 
 apps/codecs/libspeex/stereo.c                |    1 
 apps/codecs/libspeex/speex_callbacks.c       |   11 -
 apps/codecs/libspeex/config-speex.h          |    2 
 apps/codecs/libasap/libasap.make             |   15 +
 apps/codecs/libspc/spc_codec.h               |    2 
 apps/codecs/libspc/spc_profiler.c            |    2 
 apps/codecs/libspc/libspc.make               |   15 +
 apps/codecs/libspc/spc_dsp.c                 |    3 
 apps/codecs/libspc/spc_emu.c                 |    3 
 apps/codecs/libspc/spc_cpu.c                 |    3 
 firmware/export/debug.h                      |    3 
 firmware/export/config-mrobe500.h            |    3 
 firmware/decompressor/Makefile               |    1 
 firmware/firmware.make                       |   30 ++
 uisimulator/sdl/uisdl.h                      |    2 
 uisimulator/uisimulator.make                 |   35 +++
 160 files changed, 1689 insertions(+), 384 deletions(-)

Comment by Steve Bavin (pondlife) - Wednesday, 19 November 2008, 08:48 GMT+2
Hi Bjorn,

Here's my make.dep.
Comment by Björn Stenberg (zagor) - Wednesday, 19 November 2008, 13:16 GMT+2
Once more unto the breach.
   unified_make16-nodelete.patch (131.4 KiB)
 bootloader/show_logo.c                       |    2 
 bootloader/bootloader.make                   |   28 ++
 flash/bootbox/bootbox.make                   |    4 
 tools/Makefile                               |    4 
 tools/configure                              |  183 ----------------
 tools/functions.make                         |   59 +++++
 tools/root.make                              |  293 +++++++++++++++++++++++++++
 tools/tools.make                             |   31 ++
 apps/lang/lang.make                          |   25 ++
 apps/plugins/xobox.c                         |    2 
 apps/plugins/test_resize.c                   |    4 
 apps/plugins/keybox.c                        |    2 
 apps/plugins/sliding_puzzle.c                |    2 
 apps/plugins/jpeg/jpeg.make                  |   12 +
 apps/plugins/plasma.c                        |    6 
 apps/plugins/random_folder_advance_config.c  |    2 
 apps/plugins/mandelbrot.c                    |    4 
 apps/plugins/zxbox/zxbox.make                |   48 ++++
 apps/plugins/zxbox/zxvid_com.h               |    2 
 apps/plugins/zxbox/spmain.c                  |    2 
 apps/plugins/sudoku/sudoku.make              |   12 +
 apps/plugins/sudoku/sudoku.c                 |    6 
 apps/plugins/maze.c                          |    4 
 apps/plugins/wavrecord.c                     |    2 
 apps/plugins/chessbox/chessbox.c             |    2 
 apps/plugins/chessbox/SOURCES                |    4 
 apps/plugins/chessbox/chessbox.make          |   49 ++++
 apps/plugins/oscilloscope.c                  |    6 
 apps/plugins/euroconverter.c                 |    2 
 apps/plugins/video.c                         |    2 
 apps/plugins/clock/clock_counter.h           |    2 
 apps/plugins/clock/clock_draw_digital.c      |    2 
 apps/plugins/clock/clock_bitmap_strings.h    |    2 
 apps/plugins/clock/clock_bitmaps.c           |   28 +-
 apps/plugins/clock/clock_settings.c          |    2 
 apps/plugins/clock/clock_draw_binary.c       |    2 
 apps/plugins/clock/clock_bitmaps.h           |    2 
 apps/plugins/clock/clock.make                |   12 +
 apps/plugins/clock/clock_draw_analog.c       |    4 
 apps/plugins/clock/clock.c                   |    4 
 apps/plugins/zxbox.c                         |    2 
 apps/plugins/fireworks.c                     |    4 
 apps/plugins/plugins.make                    |   67 ++++++
 apps/plugins/starfield.c                     |    2 
 apps/plugins/ppmviewer.c                     |    2 
 apps/plugins/bitmaps/remote_native/SOURCES   |    4 
 apps/plugins/bitmaps/native/SOURCES          |   42 +--
 apps/plugins/bitmaps/pluginbitmaps.make      |   50 ++++
 apps/plugins/chessbox.c                      |    2 
 apps/plugins/test_sampr.c                    |    2 
 apps/plugins/rockblox.c                      |    6 
 apps/plugins/mpegplayer/stream_mgr.c         |    2 
 apps/plugins/mpegplayer/mpegplayer.make      |   12 +
 apps/plugins/mpegplayer/mpegplayer.c         |    2 
 apps/plugins/mpegplayer/mpeg_settings.c      |    2 
 apps/plugins/mpegplayer/mpegplayer.h         |    2 
 apps/plugins/mpegplayer/audio_thread.c       |    4 
 apps/plugins/mpegplayer/video_thread.c       |    2 
 apps/plugins/fire.c                          |    8 
 apps/plugins/solitaire.c                     |    6 
 apps/plugins/rocklife.c                      |    4 
 apps/plugins/midi/midi.make                  |   19 +
 apps/plugins/pictureflow.c                   |    8 
 apps/plugins/dice.c                          |    4 
 apps/plugins/bounce.c                        |    2 
 apps/plugins/shortcuts/shortcuts.make        |   16 +
 apps/plugins/doom/i_video.c                  |    2 
 apps/plugins/doom/SOURCES                    |   62 +++++
 apps/plugins/doom/doom.make                  |   45 ++++
 apps/plugins/cube.c                          |    8 
 apps/plugins/greyscale.c                     |    4 
 apps/plugins/vu_meter.c                      |    2 
 apps/plugins/snow.c                          |    2 
 apps/plugins/rockboy/rockboy.make            |   44 ++++
 apps/plugins/rockboy/SOURCES                 |   16 +
 apps/plugins/test_disk.c                     |    4 
 apps/plugins/lamp.c                          |    2 
 apps/plugins/jackpot.c                       |    4 
 apps/plugins/sokoban.c                       |    8 
 apps/plugins/spacerocks.c                    |    4 
 apps/plugins/reversi/reversi-gui.c           |    2 
 apps/plugins/reversi/reversi.make            |   19 +
 apps/plugins/logo.c                          |    2 
 apps/plugins/brickmania.c                    |    4 
 apps/plugins/chopper.c                       |    6 
 apps/plugins/viewer.c                        |    4 
 apps/plugins/mazezam.c                       |    8 
 apps/plugins/metronome.c                     |    2 
 apps/plugins/rockboy.c                       |    2 
 apps/plugins/demystify.c                     |    4 
 apps/plugins/bubbles.c                       |    6 
 apps/plugins/mosaique.c                      |    2 
 apps/plugins/test_fps.c                      |    4 
 apps/plugins/robotfindskitten.c              |   10 
 apps/plugins/jewels.c                        |    2 
 apps/plugins/wormlet.c                       |    4 
 apps/plugins/invadrox.c                      |    4 
 apps/plugins/rockpaint.c                     |    1 
 apps/plugins/text_editor.c                   |    2 
 apps/plugins/pacbox/pacbox.make              |   18 +
 apps/plugins/credits.c                       |    2 
 apps/bitmaps/bitmaps.make                    |   42 +++
 apps/apps.make                               |   16 +
 apps/debug_menu.c                            |    2 
 apps/codecs/libffmpegFLAC/decoder.c          |    2 
 apps/codecs/libffmpegFLAC/tables.c           |    2 
 apps/codecs/libffmpegFLAC/libffmpegFLAC.make |    8 
 apps/codecs/libfaad/libfaad.make             |    8 
 apps/codecs/libfaad/common.h                 |    3 
 apps/codecs/ape.c                            |    1 
 apps/codecs/libmad/global.h                  |    2 
 apps/codecs/libmad/libmad.make               |   45 ++++
 apps/codecs/libmad/frame.c                   |    2 
 apps/codecs/libmusepack/musepack.h           |    4 
 apps/codecs/libmusepack/libmusepack.make     |   20 +
 apps/codecs/lib/libcodec.make                |   14 +
 apps/codecs/lib/codeclib.c                   |    4 
 apps/codecs/lib/codeclib.h                   |   13 +
 apps/codecs/libwma/libwma.make               |    8 
 apps/codecs/codecs.make                      |   94 ++++++++
 apps/codecs/liba52/config-a52.h              |    2 
 apps/codecs/liba52/liba52.make               |    8 
 apps/codecs/libwavpack/wavpack.h             |    6 
 apps/codecs/libwavpack/libwavpack.make       |    8 
 apps/codecs/libalac/alac.c                   |    2 
 apps/codecs/libalac/libalac.make             |   15 +
 apps/codecs/libtremor/mapping0.c             |    2 
 apps/codecs/libtremor/config-tremor.h        |    2 
 apps/codecs/libtremor/oggmalloc.c            |    5 
 apps/codecs/libtremor/ctype.c                |    2 
 apps/codecs/libtremor/libtremor.make         |   27 ++
 apps/codecs/wma.c                            |    2 
 apps/codecs/libm4a/m4a.c                     |    7 
 apps/codecs/libm4a/demux.c                   |    5 
 apps/codecs/libm4a/libm4a.make               |   15 +
 apps/codecs/demac/libdemac/demac_config.h    |    2 
 apps/codecs/demac/libdemac.make              |   15 +
 apps/codecs/libspeex/speex/ogg.h             |    2 
 apps/codecs/libspeex/libspeex.make           |   51 ++++
 apps/codecs/libspeex/cb_search.c             |    6 
 apps/codecs/libspeex/ltp.c                   |   11 +
 apps/codecs/libspeex/filters.c               |    5 
 apps/codecs/libspeex/rockbox.h               |   13 +
 apps/codecs/libspeex/ltp_arm4.h              |    1 
 apps/codecs/libspeex/lsp.c                   |    1 
 apps/codecs/libspeex/stereo.c                |    1 
 apps/codecs/libspeex/speex_callbacks.c       |   11 -
 apps/codecs/libspeex/config-speex.h          |    2 
 apps/codecs/libasap/libasap.make             |   15 +
 apps/codecs/libspc/spc_codec.h               |    2 
 apps/codecs/libspc/spc_profiler.c            |    2 
 apps/codecs/libspc/libspc.make               |   15 +
 apps/codecs/libspc/spc_dsp.c                 |    3 
 apps/codecs/libspc/spc_emu.c                 |    3 
 apps/codecs/libspc/spc_cpu.c                 |    3 
 firmware/export/debug.h                      |    3 
 firmware/export/config-mrobe500.h            |    3 
 firmware/decompressor/Makefile               |    1 
 firmware/firmware.make                       |   30 ++
 uisimulator/sdl/uisdl.h                      |    2 
 uisimulator/uisimulator.make                 |   44 ++++
 161 files changed, 1714 insertions(+), 386 deletions(-)

Comment by Steve Bavin (pondlife) - Wednesday, 19 November 2008, 13:24 GMT+2
http://pastebin.com/m29f5c5e8 is the output for Cygwin/H300 sim.
Comment by Björn Stenberg (zagor) - Thursday, 20 November 2008, 10:46 GMT+2
Cygwin sim problems were due to mingw being an older gcc than any other compiler we use, and hence generating the dependencies differently.

This patch fixes that, so cygwin builds work now.
   unified_make17-nodelete.patch (153.6 KiB)
 bootloader/show_logo.c                       |    2 
 bootloader/bootloader.make                   |   37 +++
 flash/bootbox/bootbox.make                   |   13 +
 tools/Makefile                               |    4 
 tools/configure                              |  183 ----------------
 tools/functions.make                         |   68 ++++++
 tools/root.make                              |  294 +++++++++++++++++++++++++++
 tools/tools.make                             |   40 +++
 apps/lang/lang.make                          |   34 +++
 apps/plugins/xobox.c                         |    2 
 apps/plugins/test_resize.c                   |    4 
 apps/plugins/keybox.c                        |    2 
 apps/plugins/sliding_puzzle.c                |    2 
 apps/plugins/jpeg/jpeg.make                  |   21 +
 apps/plugins/plasma.c                        |    6 
 apps/plugins/random_folder_advance_config.c  |    2 
 apps/plugins/mandelbrot.c                    |    4 
 apps/plugins/zxbox/zxbox.make                |   57 +++++
 apps/plugins/zxbox/zxvid_com.h               |    2 
 apps/plugins/zxbox/spmain.c                  |    2 
 apps/plugins/sudoku/sudoku.make              |   21 +
 apps/plugins/sudoku/sudoku.c                 |    6 
 apps/plugins/maze.c                          |    4 
 apps/plugins/wavrecord.c                     |    2 
 apps/plugins/chessbox/chessbox.c             |    2 
 apps/plugins/chessbox/SOURCES                |    4 
 apps/plugins/chessbox/chessbox.make          |   58 +++++
 apps/plugins/oscilloscope.c                  |    6 
 apps/plugins/euroconverter.c                 |    2 
 apps/plugins/video.c                         |    2 
 apps/plugins/clock/clock_counter.h           |    2 
 apps/plugins/clock/clock_draw_digital.c      |    2 
 apps/plugins/clock/clock_bitmap_strings.h    |    2 
 apps/plugins/clock/clock_bitmaps.c           |   28 +-
 apps/plugins/clock/clock_settings.c          |    2 
 apps/plugins/clock/clock_draw_binary.c       |    2 
 apps/plugins/clock/clock_bitmaps.h           |    2 
 apps/plugins/clock/clock.make                |   21 +
 apps/plugins/clock/clock_draw_analog.c       |    4 
 apps/plugins/clock/clock.c                   |    4 
 apps/plugins/zxbox.c                         |    2 
 apps/plugins/fireworks.c                     |    4 
 apps/plugins/plugins.make                    |   76 ++++++
 apps/plugins/starfield.c                     |    2 
 apps/plugins/ppmviewer.c                     |    2 
 apps/plugins/bitmaps/remote_native/SOURCES   |    4 
 apps/plugins/bitmaps/native/SOURCES          |   42 +--
 apps/plugins/bitmaps/pluginbitmaps.make      |   59 +++++
 apps/plugins/chessbox.c                      |    2 
 apps/plugins/test_sampr.c                    |    2 
 apps/plugins/rockblox.c                      |    6 
 apps/plugins/mpegplayer/stream_mgr.c         |    2 
 apps/plugins/mpegplayer/mpegplayer.make      |   21 +
 apps/plugins/mpegplayer/mpegplayer.c         |    2 
 apps/plugins/mpegplayer/mpeg_settings.c      |    2 
 apps/plugins/mpegplayer/mpegplayer.h         |    2 
 apps/plugins/mpegplayer/audio_thread.c       |    4 
 apps/plugins/mpegplayer/video_thread.c       |    2 
 apps/plugins/fire.c                          |    8 
 apps/plugins/solitaire.c                     |    6 
 apps/plugins/rocklife.c                      |    4 
 apps/plugins/midi/midi.make                  |   28 ++
 apps/plugins/pictureflow.c                   |    8 
 apps/plugins/dice.c                          |    4 
 apps/plugins/bounce.c                        |    2 
 apps/plugins/shortcuts/shortcuts.make        |   25 ++
 apps/plugins/doom/i_video.c                  |    2 
 apps/plugins/doom/SOURCES                    |   62 +++++
 apps/plugins/doom/doom.make                  |   54 ++++
 apps/plugins/cube.c                          |    8 
 apps/plugins/greyscale.c                     |    4 
 apps/plugins/vu_meter.c                      |    2 
 apps/plugins/snow.c                          |    2 
 apps/plugins/rockboy/rockboy.make            |   53 ++++
 apps/plugins/rockboy/SOURCES                 |   16 +
 apps/plugins/test_disk.c                     |    4 
 apps/plugins/lamp.c                          |    2 
 apps/plugins/jackpot.c                       |    4 
 apps/plugins/sokoban.c                       |    8 
 apps/plugins/spacerocks.c                    |    4 
 apps/plugins/reversi/reversi-gui.c           |    2 
 apps/plugins/reversi/reversi.make            |   28 ++
 apps/plugins/logo.c                          |    2 
 apps/plugins/brickmania.c                    |    4 
 apps/plugins/chopper.c                       |    6 
 apps/plugins/viewer.c                        |    4 
 apps/plugins/mazezam.c                       |    8 
 apps/plugins/metronome.c                     |    2 
 apps/plugins/rockboy.c                       |    2 
 apps/plugins/demystify.c                     |    4 
 apps/plugins/bubbles.c                       |    6 
 apps/plugins/mosaique.c                      |    2 
 apps/plugins/test_fps.c                      |    4 
 apps/plugins/robotfindskitten.c              |   10 
 apps/plugins/jewels.c                        |    2 
 apps/plugins/wormlet.c                       |    4 
 apps/plugins/invadrox.c                      |    4 
 apps/plugins/rockpaint.c                     |    1 
 apps/plugins/text_editor.c                   |    2 
 apps/plugins/pacbox/pacbox.make              |   27 ++
 apps/plugins/credits.c                       |    2 
 apps/bitmaps/bitmaps.make                    |   51 ++++
 apps/apps.make                               |   25 ++
 apps/debug_menu.c                            |    2 
 apps/codecs/libffmpegFLAC/decoder.c          |    2 
 apps/codecs/libffmpegFLAC/tables.c           |    2 
 apps/codecs/libffmpegFLAC/libffmpegFLAC.make |   17 +
 apps/codecs/libfaad/libfaad.make             |   18 +
 apps/codecs/libfaad/common.h                 |    3 
 apps/codecs/ape.c                            |    1 
 apps/codecs/libmad/global.h                  |    2 
 apps/codecs/libmad/libmad.make               |   54 ++++
 apps/codecs/libmad/frame.c                   |    2 
 apps/codecs/libmusepack/huffsv46.c           |    6 
 apps/codecs/libmusepack/musepack.h           |    4 
 apps/codecs/libmusepack/huffsv7.c            |    6 
 apps/codecs/libmusepack/libmusepack.make     |   29 ++
 apps/codecs/lib/libcodec.make                |   23 ++
 apps/codecs/lib/codeclib.c                   |    4 
 apps/codecs/lib/codeclib.h                   |   13 +
 apps/codecs/libwma/libwma.make               |   17 +
 apps/codecs/codecs.make                      |  103 +++++++++
 apps/codecs/liba52/config-a52.h              |    2 
 apps/codecs/liba52/liba52.make               |   17 +
 apps/codecs/libwavpack/wavpack.h             |    6 
 apps/codecs/libwavpack/libwavpack.make       |   17 +
 apps/codecs/libalac/alac.c                   |    2 
 apps/codecs/libalac/libalac.make             |   24 ++
 apps/codecs/libtremor/mapping0.c             |    2 
 apps/codecs/libtremor/config-tremor.h        |    2 
 apps/codecs/libtremor/oggmalloc.c            |    5 
 apps/codecs/libtremor/ctype.c                |    2 
 apps/codecs/libtremor/libtremor.make         |   36 +++
 apps/codecs/wma.c                            |    2 
 apps/codecs/libm4a/m4a.c                     |    7 
 apps/codecs/libm4a/demux.c                   |    5 
 apps/codecs/libm4a/libm4a.make               |   24 ++
 apps/codecs/demac/libdemac/demac_config.h    |    2 
 apps/codecs/demac/libdemac.make              |   24 ++
 apps/codecs/libspeex/bits.c                  |    2 
 apps/codecs/libspeex/nb_celp.c               |    4 
 apps/codecs/libspeex/speex/ogg.h             |    2 
 apps/codecs/libspeex/libspeex.make           |   60 +++++
 apps/codecs/libspeex/nb_celp.h               |    4 
 apps/codecs/libspeex/cb_search.c             |    6 
 apps/codecs/libspeex/sb_celp.h               |    2 
 apps/codecs/libspeex/cb_search.h             |    2 
 apps/codecs/libspeex/ltp.c                   |   13 +
 apps/codecs/libspeex/ltp.h                   |    2 
 apps/codecs/libspeex/filters.c               |    5 
 apps/codecs/libspeex/modes.h                 |    4 
 apps/codecs/libspeex/rockbox.h               |   13 +
 apps/codecs/libspeex/ltp_arm4.h              |    1 
 apps/codecs/libspeex/lsp.c                   |    1 
 apps/codecs/libspeex/jitter.c                |    6 
 apps/codecs/libspeex/stereo.c                |    5 
 apps/codecs/libspeex/quant_lsp.h             |    2 
 apps/codecs/libspeex/speex_callbacks.c       |   13 -
 apps/codecs/libspeex/config-speex.h          |    2 
 apps/codecs/libspeex/speex_header.c          |    4 
 apps/codecs/libasap/libasap.make             |   24 ++
 apps/codecs/libspc/spc_codec.h               |    2 
 apps/codecs/libspc/spc_profiler.c            |    2 
 apps/codecs/libspc/libspc.make               |   24 ++
 apps/codecs/libspc/spc_dsp.c                 |    3 
 apps/codecs/libspc/spc_emu.c                 |    3 
 apps/codecs/libspc/spc_cpu.c                 |    3 
 firmware/export/debug.h                      |    3 
 firmware/export/config-mrobe500.h            |    3 
 firmware/decompressor/Makefile               |    1 
 firmware/firmware.make                       |   39 +++
 uisimulator/sdl/uisdl.h                      |    2 
 uisimulator/uisimulator.make                 |   38 +++
 173 files changed, 2078 insertions(+), 412 deletions(-)

Comment by Steve Bavin (pondlife) - Thursday, 20 November 2008, 11:02 GMT+2
I can confirm it works for me now! (You probably didn't need confirmation, but it can't hurt.)

Loading...