1 files changed, 17 insertions, 37 deletions

diff --git a/tools/database/database.make b/tools/database/database.make
index 49ad2ff9bc..89a4aa7d85 100644
--- a/tools/database/database.make
+++ b/tools/database/database.make
@@ -7,8 +7,7 @@
 # $Id: checkwps.make 22680 2009-09-11 17:58:17Z gevaerts $
 #
 
-DBDEFINES=-g -DDEBUG -D__PCTOOL__
-CFLAGS+=$(DBDEFINES)
+GCCOPTS += -g -DDEBUG -D__PCTOOL__ -DDBTOOL
 
 createsrc = $(shell cat $(1) > $(3); echo "\#if CONFIG_CODEC == SWCODEC" >> $(3); \
                                      echo $(2) | sed 's/ /\n/g' >> $(3); \
@@ -21,44 +20,25 @@ SRCFILE := $(call createsrc, $(TOOLSDIR)/database/SOURCES, \
                              $(METADATAS), \
                              $(TOOLSDIR)/database/SOURCES.build)
 
-SRC= $(call preprocess, $(SRCFILE))
+DATABASE_SRC = $(call preprocess, $(SRCFILE))
+DATABASE_OBJ = $(call c2obj,$(DATABASE_SRC))
 
-INCLUDES = -I$(ROOTDIR)/apps/gui \
-           -I$(ROOTDIR)/firmware/export \
-           -I$(ROOTDIR)/firmware/include \
-           -I$(ROOTDIR)/apps \
-           -I$(ROOTDIR)/apps/recorder \
-           -I$(ROOTDIR)/lib/rbcodec \
-           -I$(ROOTDIR)/lib/rbcodec/metadata \
-           -I$(ROOTDIR)/lib/rbcodec/dsp \
-           -I$(APPSDIR) \
-           -I$(BUILDDIR) \
+OTHER_SRC += $(DATABASE_SRC)
 
-SIMINCLUDES += -I$(FIRMDIR)/target/hosted/sdl -I$(FIRMDIR)/target/hosted \
-        -I$(ROOTDIR)/uisimulator/common -I$(FIRMDIR)/export -I$(BUILDDIR) -I$(APPSDIR)
+INCLUDES += -I$(ROOTDIR)/apps/gui \
+            -I$(ROOTDIR)/firmware/export \
+            -I$(ROOTDIR)/firmware/include \
+            -I$(ROOTDIR)/apps \
+            -I$(ROOTDIR)/apps/recorder \
+            -I$(ROOTDIR)/lib/rbcodec \
+            -I$(ROOTDIR)/lib/rbcodec/metadata \
+            -I$(ROOTDIR)/lib/rbcodec/dsp \
+            -I$(APPSDIR) \
+            -I$(BUILDDIR)
 
-# Makes mkdepfile happy
-GCCOPTS+=`$(SDLCONFIG) --cflags`
-OLDGCCOPTS:=$(GCCOPTS)
-GCCOPTS+=-D__PCTOOL__ -fno-builtin $(INCLUDES) $(SIMINCLUDES)
-
-LIBS=`$(SDLCONFIG) --libs` -lc
-ifneq ($(findstring MINGW,$(shell uname)),MINGW)
-LIBS += -ldl
-endif
 
 .SECONDEXPANSION: # $$(OBJ) is not populated until after this
 
-SIMFLAGS += $(SIMINCLUDES) $(DBDEFINES) -DHAVE_CONFIG_H $(OLDGCCOPTS) $(INCLUDES)
-
-$(BUILDDIR)/$(BINARY): $$(OBJ)
-        @echo LD $(BINARY)
-        $(SILENT)$(HOSTCC) $(SIMFLAGS) $(LIBS) -o $@ $+
-
-$(BUILDDIR)/tools/database/../../uisimulator/%.o: $(ROOTDIR)/uisimulator/%.c
-        $(SILENT)mkdir -p $(dir $@)
-        $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(SIMFLAGS) -c $< -o $@
-
-$(BUILDDIR)/tools/database/database.o: $(APPSDIR)/database.c
-        $(SILENT)mkdir -p $(dir $@)
-        $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(SIMFLAGS) -c $< -o $@
+$(BUILDDIR)/$(BINARY): $$(DATABASE_OBJ)
+        $(call PRINTS,LD $(BINARY))
+        $(SILENT)$(HOSTCC) -o $@ $+