diff options
-rw-r--r-- | apps/misc.c | 21 | ||||
-rw-r--r-- | tools/database/Makefile | 10 |
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 @@ | |||
25 | #include "lcd.h" | 25 | #include "lcd.h" |
26 | #include "file.h" | 26 | #include "file.h" |
27 | #ifdef __PCTOOL__ | 27 | #ifdef __PCTOOL__ |
28 | #include <stdint.h> | ||
29 | #include <stdarg.h> | 28 | #include <stdarg.h> |
30 | #include <stdio.h> | 29 | #include <stdio.h> |
31 | #ifdef WPSEDITOR | 30 | #ifdef WPSEDITOR |
@@ -766,16 +765,6 @@ char* strrsplt(char* str, int c) | |||
766 | return s; | 765 | return s; |
767 | } | 766 | } |
768 | 767 | ||
769 | char* skip_whitespace(char* const str) | ||
770 | { | ||
771 | char *s = str; | ||
772 | |||
773 | while (isspace(*s)) | ||
774 | s++; | ||
775 | |||
776 | return s; | ||
777 | } | ||
778 | |||
779 | /* Test file existence, using dircache of possible */ | 768 | /* Test file existence, using dircache of possible */ |
780 | bool file_exists(const char *file) | 769 | bool file_exists(const char *file) |
781 | { | 770 | { |
@@ -839,6 +828,16 @@ char *strip_extension(char* buffer, int buffer_size, const char *filename) | |||
839 | } | 828 | } |
840 | #endif /* !defined(__PCTOOL__) */ | 829 | #endif /* !defined(__PCTOOL__) */ |
841 | 830 | ||
831 | char* skip_whitespace(char* const str) | ||
832 | { | ||
833 | char *s = str; | ||
834 | |||
835 | while (isspace(*s)) | ||
836 | s++; | ||
837 | |||
838 | return s; | ||
839 | } | ||
840 | |||
842 | /* Format time into buf. | 841 | /* Format time into buf. |
843 | * | 842 | * |
844 | * buf - buffer to format to. | 843 | * 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 @@ | |||
1 | ifndef V | ||
1 | SILENT = @ | 2 | SILENT = @ |
3 | endif | ||
2 | INCLUDE = -I../../firmware/export \ | 4 | INCLUDE = -I../../firmware/export \ |
3 | -I../../apps -I../../uisimulator/sdl -I/usr/include/SDL | 5 | -I../../apps -I../../uisimulator/sdl -I/usr/include/SDL |
4 | FIRMINC = -I../../firmware/include -fno-builtin | 6 | FIRMINC = -I../../firmware/include -fno-builtin |
@@ -12,7 +14,7 @@ SRC = database.o tagcache.o replaygain.o \ | |||
12 | a52.o mp3.o adx.o mp4.o aiff.o mpc.o ape.o ogg.o \ | 14 | a52.o mp3.o adx.o mp4.o aiff.o mpc.o ape.o ogg.o \ |
13 | asap.o sid.o asf.o spc.o flac.o vorbis.o wave.o \ | 15 | asap.o sid.o asf.o spc.o flac.o vorbis.o wave.o \ |
14 | mod.o wavpack.o monkeys.o \ | 16 | mod.o wavpack.o monkeys.o \ |
15 | logf.o unicode.o ctype.o structec.o crc32.o io.o | 17 | logf.o unicode.o ctype.o structec.o crc32.o io.o misc.o |
16 | 18 | ||
17 | OBJ = $(SRC:.c=.o) | 19 | OBJ = $(SRC:.c=.o) |
18 | 20 | ||
@@ -20,7 +22,9 @@ OBJ = $(SRC:.c=.o) | |||
20 | VPATH = ../../apps ../../apps/metadata ../../firmware/common ../../firmware/ \ | 22 | VPATH = ../../apps ../../apps/metadata ../../firmware/common ../../firmware/ \ |
21 | ../../uisimulator/common | 23 | ../../uisimulator/common |
22 | 24 | ||
23 | all: database | 25 | TARGET= database |
26 | |||
27 | all: $(TARGET) | ||
24 | 28 | ||
25 | %.o : ../../uisimulator/common/%.c | 29 | %.o : ../../uisimulator/common/%.c |
26 | @echo CC $(<F) | 30 | @echo CC $(<F) |
@@ -35,4 +39,4 @@ database: $(OBJ) | |||
35 | $(SILENT)$(CC) -g -ldl -o $@ $+ | 39 | $(SILENT)$(CC) -g -ldl -o $@ $+ |
36 | 40 | ||
37 | clean: | 41 | clean: |
38 | rm $(OBJ) | 42 | rm -f $(OBJ) $(TARGET) |