diff options
author | Thomas Martitz <kugel@rockbox.org> | 2012-03-26 22:24:57 +0200 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2012-03-26 22:27:40 +0200 |
commit | f269aa0060950f7b9c42216267c639a2fb556196 (patch) | |
tree | 218ad3a737f11cb18e48676f300bc22038cfa140 /apps/plugins/plugins.make | |
parent | 9445d4625a3d47b28d756a5763165eb73d6b4ada (diff) | |
download | rockbox-f269aa0060950f7b9c42216267c639a2fb556196.tar.gz rockbox-f269aa0060950f7b9c42216267c639a2fb556196.zip |
build system: unify/simplify library handling a bit.
libs in $ROOT/lib now add to $(CORE_LIBS) and $(EXTRA_LIBS) and are
automatically linked by the core and codecs/plugins respectively.
Change-Id: Iff482c792a8c8142718f6a16a450c6e2f1497c9a
Diffstat (limited to 'apps/plugins/plugins.make')
-rw-r--r-- | apps/plugins/plugins.make | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make index 272b1b8e93..3ea6d96432 100644 --- a/apps/plugins/plugins.make +++ b/apps/plugins/plugins.make | |||
@@ -53,6 +53,8 @@ else | |||
53 | PLUGINSUBDIRS := $(call preprocess, $(APPSDIR)/plugins/SUBDIRS) | 53 | PLUGINSUBDIRS := $(call preprocess, $(APPSDIR)/plugins/SUBDIRS) |
54 | endif | 54 | endif |
55 | 55 | ||
56 | PLUGIN_LIBS := $(EXTRA_LIBS) $(TLSFLIB) $(PLUGINLIB) $(PLUGINBITMAPLIB) | ||
57 | |||
56 | # include <dir>.make from each subdir (yay!) | 58 | # include <dir>.make from each subdir (yay!) |
57 | $(foreach dir,$(PLUGINSUBDIRS),$(eval include $(dir)/$(notdir $(dir)).make)) | 59 | $(foreach dir,$(PLUGINSUBDIRS),$(eval include $(dir)/$(notdir $(dir)).make)) |
58 | 60 | ||
@@ -65,7 +67,7 @@ PLUGINFLAGS = -I$(APPSDIR)/plugins -DPLUGIN $(CFLAGS) | |||
65 | $(ROCKS1): $(BUILDDIR)/%.rock: $(BUILDDIR)/%.o | 67 | $(ROCKS1): $(BUILDDIR)/%.rock: $(BUILDDIR)/%.o |
66 | 68 | ||
67 | # dependency for all plugins | 69 | # dependency for all plugins |
68 | $(ROCKS): $(APPSDIR)/plugin.h $(PLUGINLINK_LDS) $(LIBARMSUPPORT) $(PLUGINLIB) $(PLUGINBITMAPLIB) $(PLUGIN_CRT0) $(LIBSETJMP) | 70 | $(ROCKS): $(APPSDIR)/plugin.h $(PLUGINLINK_LDS) $(PLUGIN_LIBS) $(PLUGIN_CRT0) |
69 | 71 | ||
70 | $(PLUGINLIB): $(PLUGINLIB_OBJ) | 72 | $(PLUGINLIB): $(PLUGINLIB_OBJ) |
71 | $(SILENT)$(shell rm -f $@) | 73 | $(SILENT)$(shell rm -f $@) |
@@ -85,7 +87,7 @@ $(BUILDDIR)/credits.raw credits.raw: $(DOCSDIR)/CREDITS | |||
85 | $(call PRINTS,Create credits.raw)perl $(APPSDIR)/plugins/credits.pl < $< > $(BUILDDIR)/$(@F) | 87 | $(call PRINTS,Create credits.raw)perl $(APPSDIR)/plugins/credits.pl < $< > $(BUILDDIR)/$(@F) |
86 | 88 | ||
87 | # special dependencies | 89 | # special dependencies |
88 | $(BUILDDIR)/apps/plugins/wav2wv.rock: $(BUILDDIR)/apps/codecs/libwavpack.a $(PLUGINLIB) | 90 | $(BUILDDIR)/apps/plugins/wav2wv.rock: $(BUILDDIR)/apps/codecs/libwavpack.a $(PLUGIN_LIBS) |
89 | 91 | ||
90 | # Do not use '-ffunction-sections' and '-fdata-sections' when compiling sdl-sim | 92 | # Do not use '-ffunction-sections' and '-fdata-sections' when compiling sdl-sim |
91 | ifeq ($(findstring sdl-sim, $(APP_TYPE)), sdl-sim) | 93 | ifeq ($(findstring sdl-sim, $(APP_TYPE)), sdl-sim) |
@@ -129,7 +131,7 @@ endif | |||
129 | $(BUILDDIR)/apps/plugins/%.lua: $(ROOTDIR)/apps/plugins/%.lua | 131 | $(BUILDDIR)/apps/plugins/%.lua: $(ROOTDIR)/apps/plugins/%.lua |
130 | $(call PRINTS,CP $(subst $(ROOTDIR)/,,$<))cp $< $(BUILDDIR)/apps/plugins/ | 132 | $(call PRINTS,CP $(subst $(ROOTDIR)/,,$<))cp $< $(BUILDDIR)/apps/plugins/ |
131 | 133 | ||
132 | $(BUILDDIR)/%.refmap: $(APPSDIR)/plugin.h $(OVERLAYREF_LDS) $(LIBARMSUPPORT) $(PLUGINLIB) $(PLUGINBITMAPLIB) $(LIBSETJMP) $(PLUGIN_CRT0) | 134 | $(BUILDDIR)/%.refmap: $(APPSDIR)/plugin.h $(OVERLAYREF_LDS) $(PLUGIN_LIBS) |
133 | $(call PRINTS,LD $(@F))$(CC) $(PLUGINFLAGS) -o /dev/null \ | 135 | $(call PRINTS,LD $(@F))$(CC) $(PLUGINFLAGS) -o /dev/null \ |
134 | $(filter %.o, $^) \ | 136 | $(filter %.o, $^) \ |
135 | $(filter %.a, $+) \ | 137 | $(filter %.a, $+) \ |