diff options
author | Daniel Stenberg <daniel@haxx.se> | 2005-06-22 19:41:30 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2005-06-22 19:41:30 +0000 |
commit | 1dd672fe3226fa77113f35e4d72f50b863484c63 (patch) | |
tree | 67b424ab990f160dbc8fb238b9fa3390ceba10ed /apps/plugins/Makefile | |
parent | b7aaa641b864628d76103b8c9d57c15747560ca7 (diff) |
moved and renamed the codecs, gave the codecs a new extension (.codec),
unified to a single codec-only API, made a new codeclib, disabled the building
of the *2wav plugins
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6812 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/Makefile')
-rw-r--r-- | apps/plugins/Makefile | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/apps/plugins/Makefile b/apps/plugins/Makefile index 44e055d2a4..fbae027ca3 100644 --- a/apps/plugins/Makefile +++ b/apps/plugins/Makefile @@ -22,7 +22,6 @@ endif LDS := plugin.lds LINKFILE := $(OBJDIR)/pluginlink.lds -LINKCODEC := $(OBJDIR)/codeclink.lds DEPFILE = $(OBJDIR)/dep-plugins # This sets up 'SRC' based on the files mentioned in SOURCES @@ -55,13 +54,7 @@ ifndef SIMVER $(OBJDIR)/%.elf: $(OBJDIR)/%.o $(LINKFILE) $(LINKCODEC) $(BUILDDIR)/libplugin.a $(SILENT)(file=`basename $@`; \ echo "LD $$file"; \ - match=`grep $$file CODECS`; \ - if test -z "$$match"; then \ - LINKWITH=$(LINKFILE); \ - else \ - LINKWITH=$(LINKCODEC); \ - fi; \ - $(CC) $(GCCOPTS) -O -nostdlib -o $@ $< -L$(BUILDDIR) $(CODECLIBS) -lplugin -lgcc -T$$LINKWITH -Wl,-Map,$(OBJDIR)/$*.map) + $(CC) $(GCCOPTS) -O -nostdlib -o $@ $< -L$(BUILDDIR) $(CODECLIBS) -lplugin -lgcc -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/$*.map) $(OBJDIR)/%.rock : $(OBJDIR)/%.elf @echo "OBJCOPY "`basename $@` @@ -108,7 +101,7 @@ endif # end of simulator section include $(TOOLSDIR)/make.inc $(BUILDDIR)/libplugin.a: - @echo "MAKE in lib" + @echo "MAKE in plugin/lib" @mkdir -p $(OBJDIR)/lib @$(MAKE) -C lib OBJDIR=$(OBJDIR)/lib @@ -116,10 +109,6 @@ $(LINKFILE): $(LDS) @echo "build $@" @cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P - >$@ -$(LINKCODEC): $(LDS) - @echo "build $@" - @cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) -DCODEC $(INCLUDES) $(TARGET) $(DEFINES) -E -P - >$@ - $(SUBDIRS): @echo "MAKE in $@" @mkdir -p $(OBJDIR)/$@ |