made 'make' in tools/database work again

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

2 files changed, 17 insertions, 14 deletions

diff --git a/apps/misc.c b/apps/misc.c
index 7bf9ac01f5..d7a64b3733 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -25,7 +25,6 @@
 #include "lcd.h"
 #include "file.h"
 #ifdef __PCTOOL__
-#include <stdint.h>
 #include <stdarg.h>
 #include <stdio.h>
 #ifdef WPSEDITOR
@@ -766,16 +765,6 @@ char* strrsplt(char* str, int c)
     return s;
 }
 
-char* skip_whitespace(char* const str)
-{
-    char *s = str;
-
-    while (isspace(*s)) 
-        s++;
-    
-    return s;
-}
-
 /* Test file existence, using dircache of possible */
 bool file_exists(const char *file)
 {
@@ -839,6 +828,16 @@ char *strip_extension(char* buffer, int buffer_size, const char *filename)
 }
 #endif /* !defined(__PCTOOL__) */
 
+char* skip_whitespace(char* const str)
+{
+    char *s = str;
+
+    while (isspace(*s)) 
+        s++;
+    
+    return s;
+}
+
 /* Format time into buf.
  *
  * buf      - buffer to format to.
diff --git a/tools/database/Makefile b/tools/database/Makefile
index 88b92125ea..2c20bb7d25 100644
--- a/tools/database/Makefile
+++ b/tools/database/Makefile
@@ -1,4 +1,6 @@
+ifndef V
 SILENT = @
+endif
 INCLUDE = -I../../firmware/export \
         -I../../apps -I../../uisimulator/sdl -I/usr/include/SDL
 FIRMINC = -I../../firmware/include -fno-builtin
@@ -12,7 +14,7 @@ SRC = database.o tagcache.o replaygain.o \
         a52.o mp3.o adx.o mp4.o aiff.o mpc.o ape.o ogg.o \
         asap.o sid.o asf.o spc.o flac.o vorbis.o wave.o \
         mod.o wavpack.o monkeys.o \
-        logf.o unicode.o ctype.o structec.o crc32.o io.o
+        logf.o unicode.o ctype.o structec.o crc32.o io.o misc.o
 
 OBJ = $(SRC:.c=.o)
 
@@ -20,7 +22,9 @@ OBJ = $(SRC:.c=.o)
 VPATH = ../../apps ../../apps/metadata ../../firmware/common ../../firmware/ \
         ../../uisimulator/common
 
-all: database
+TARGET= database
+
+all: $(TARGET)
 
 %.o : ../../uisimulator/common/%.c
         @echo CC $(<F)
@@ -35,4 +39,4 @@ database: $(OBJ)
         $(SILENT)$(CC) -g -ldl -o $@ $+
 
 clean:
-        rm $(OBJ)
+        rm -f $(OBJ) $(TARGET)