From 1501df045f75b1ee607b49ce2f970c762a2538a4 Mon Sep 17 00:00:00 2001
From: Björn Stenberg <bjorn@haxx.se>
Date: Thu, 24 Jan 2013 16:01:28 +0100
Subject: Deprecate the EXTRA_LIBS variable.

Instead specify explicit library dependencies for codecs and plugins.
---
 apps/plugins/mikmod/mikmod.make | 2 +-
 apps/plugins/pdbox/pdbox.make   | 2 +-
 apps/plugins/plugins.make       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'apps/plugins')

diff --git a/apps/plugins/mikmod/mikmod.make b/apps/plugins/mikmod/mikmod.make
index 38a95c3695..016b05433e 100644
--- a/apps/plugins/mikmod/mikmod.make
+++ b/apps/plugins/mikmod/mikmod.make
@@ -20,7 +20,7 @@ OTHER_SRC += $(MIKMOD_SRC)
 
 MIKMODCFLAGS = $(PLUGINFLAGS) -I$(MIKMODSRCDIR) -O2
 
-$(MIKMODBUILDDIR)/mikmod.rock: $(MIKMOD_OBJ)
+$(MIKMODBUILDDIR)/mikmod.rock: $(MIKMOD_OBJ) $(TLSFLIB)
 
 # new rule needed to use extra compile flags
 $(MIKMODBUILDDIR)/%.o: $(MIKMODSRCDIR)/%.c
diff --git a/apps/plugins/pdbox/pdbox.make b/apps/plugins/pdbox/pdbox.make
index e0cbaef9ab..e95cdba2b9 100644
--- a/apps/plugins/pdbox/pdbox.make
+++ b/apps/plugins/pdbox/pdbox.make
@@ -26,7 +26,7 @@ ifdef APP_TYPE
 PDBOXLDFLAGS += -lm
 endif
 
-$(PDBOXBUILDDIR)/pdbox.rock: $(PDBOX_OBJ)
+$(PDBOXBUILDDIR)/pdbox.rock: $(PDBOX_OBJ) $(TLSFLIB)
 
 # Compile PDBox with extra flags (adapted from ZXBox)
 $(PDBOXBUILDDIR)/%.o: $(PDBOXSRCDIR)/%.c $(PDBOXSRCDIR)/pdbox.make
diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make
index 12344ae590..0fc8ba7dc1 100644
--- a/apps/plugins/plugins.make
+++ b/apps/plugins/plugins.make
@@ -53,7 +53,7 @@ else
 PLUGINSUBDIRS := $(call preprocess, $(APPSDIR)/plugins/SUBDIRS)
 endif
 
-PLUGIN_LIBS := $(EXTRA_LIBS) $(PLUGINLIB) $(PLUGINBITMAPLIB)
+PLUGIN_LIBS := $(PLUGINLIB) $(PLUGINBITMAPLIB) $(SETJMPLIB)
 
 # include <dir>.make from each subdir (yay!)
 $(foreach dir,$(PLUGINSUBDIRS),$(eval include $(dir)/$(notdir $(dir)).make))
-- 
cgit