summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2021-02-27 18:28:09 -0500
committerSolomon Peachy <pizza@shaftnet.org>2021-02-27 18:29:02 -0500
commitdad23a060745bec1d7b7999996c1af4e92148bcf (patch)
tree101cfaafc18f87cef8ae50ab2a02be4eb59a8de5
parentef685cc6da09d01817be6ccfbeae85516c2a9296 (diff)
downloadrockbox-dad23a060745bec1d7b7999996c1af4e92148bcf.tar.gz
rockbox-dad23a060745bec1d7b7999996c1af4e92148bcf.tar.bz2
rockbox-dad23a060745bec1d7b7999996c1af4e92148bcf.zip
database: Database tool was excluding all SWCODECs!
When fixing this, I used this this opportunity to clean up the Makefile Change-Id: I5dea77a8a2048bbfce5930f8ce2899b597e425eb
-rw-r--r--tools/database/database.make15
1 files changed, 2 insertions, 13 deletions
diff --git a/tools/database/database.make b/tools/database/database.make
index dfe632446b..79f84b4bee 100644
--- a/tools/database/database.make
+++ b/tools/database/database.make
@@ -9,20 +9,9 @@
GCCOPTS += -g -DDEBUG -D__PCTOOL__ -DDBTOOL
-# Make compatibility hack
-H := \#
-createsrc = $(shell cat $(1) > $(3); echo "$(H)if CONFIG_CODEC == SWCODEC" >> $(3); \
- echo $(2) | sed 's/ /\n/g' >> $(3); \
- echo "$(H)endif" >> $(3); \
- echo $(3))
+METADATAS := $(wildcard $(ROOTDIR)/lib/rbcodec/metadata/*.c)
-METADATAS := $(call full_path_subst,$(ROOTDIR)/%,../../%,$(wildcard $(ROOTDIR)/lib/rbcodec/metadata/*.c))
-
-SRCFILE := $(call createsrc, $(TOOLSDIR)/database/SOURCES, \
- $(METADATAS), \
- $(TOOLSDIR)/database/SOURCES.build)
-
-DATABASE_SRC = $(call preprocess, $(SRCFILE))
+DATABASE_SRC = $(call preprocess, $(TOOLSDIR)/database/SOURCES) $(METADATAS)
DATABASE_OBJ = $(call c2obj,$(DATABASE_SRC))
OTHER_SRC += $(DATABASE_SRC)