diff options
author | Will Robertson <aliask@rockbox.org> | 2007-09-21 15:51:53 +0000 |
---|---|---|
committer | Will Robertson <aliask@rockbox.org> | 2007-09-21 15:51:53 +0000 |
commit | 590501cfe404b5463adecc70628e5bc7c8f142a2 (patch) | |
tree | 3b038f90c9c3bbef8cf0b84f5a4ea338f9599851 /tools/Makefile | |
parent | a26110c52dff9bc15d20146462d52d07f61bd238 (diff) | |
download | rockbox-590501cfe404b5463adecc70628e5bc7c8f142a2.tar.gz rockbox-590501cfe404b5463adecc70628e5bc7c8f142a2.zip |
Merge the Gigabeat S branch back into trunk. Fingers crossed nothing breaks.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14805 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools/Makefile')
-rw-r--r-- | tools/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/Makefile b/tools/Makefile index b7f445ebf6..74d82affab 100644 --- a/tools/Makefile +++ b/tools/Makefile | |||
@@ -16,13 +16,14 @@ CLEANALL := scramble descramble iriver sh2d bmp2rb rdf2binary convbdf \ | |||
16 | all: | 16 | all: |
17 | @echo "Run make in your build directory!" | 17 | @echo "Run make in your build directory!" |
18 | 18 | ||
19 | scramble: scramble.o iriver.o mi4.o gigabeat.o | 19 | scramble: scramble.o iriver.o mi4.o gigabeat.o gigabeats.o |
20 | descramble: descramble.o iriver.o gigabeat.o | 20 | descramble: descramble.o iriver.o gigabeat.o |
21 | 21 | ||
22 | scramble.o: scramble.c iriver.h mi4.h gigabeat.h | 22 | scramble.o: scramble.c iriver.h mi4.h gigabeat.h |
23 | descramble.o: descramble.c iriver.h gigabeat.h | 23 | descramble.o: descramble.c iriver.h gigabeat.h |
24 | iriver.o: iriver.c iriver.h | 24 | iriver.o: iriver.c iriver.h |
25 | gigabeat.o: gigabeat.c gigabeat.h | 25 | gigabeat.o: gigabeat.c gigabeat.h |
26 | gigabeats.o: gigabeats.c gigabeats.h | ||
26 | mi4.o: mi4.c mi4.h | 27 | mi4.o: mi4.c mi4.h |
27 | 28 | ||
28 | sh2d: sh2d.c | 29 | sh2d: sh2d.c |