diff options
| author | Björn Stenberg <bjorn@haxx.se> | 2008-11-20 11:27:31 +0000 |
|---|---|---|
| committer | Björn Stenberg <bjorn@haxx.se> | 2008-11-20 11:27:31 +0000 |
| commit | c6b3d38a156dd624760a8eb1bb374affd43b4f2a (patch) | |
| tree | 493eba929e2396d86cf4f077709aa09fe172cd35 /apps/codecs/libwma | |
| parent | f66c30346783a400a029bedcd60ab67c81c34a07 (diff) | |
| download | rockbox-c6b3d38a156dd624760a8eb1bb374affd43b4f2a.zip rockbox-c6b3d38a156dd624760a8eb1bb374affd43b4f2a.tar.gz rockbox-c6b3d38a156dd624760a8eb1bb374affd43b4f2a.tar.bz2 rockbox-c6b3d38a156dd624760a8eb1bb374affd43b4f2a.tar.xz | |
New makefile solution: A single invocation of 'make' to build the entire tree. Fully controlled dependencies give faster and more correct recompiles.
Many #include lines adjusted to conform to the new standards.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19146 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libwma')
| -rw-r--r-- | apps/codecs/libwma/Makefile | 43 | ||||
| -rw-r--r-- | apps/codecs/libwma/libwma.make | 17 |
2 files changed, 17 insertions, 43 deletions
diff --git a/apps/codecs/libwma/Makefile b/apps/codecs/libwma/Makefile deleted file mode 100644 index 91ea49b..0000000 --- a/apps/codecs/libwma/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# __________ __ ___. -# Open \______ \ ____ ____ | | _\_ |__ _______ ___ -# Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / -# Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < -# Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ -# \/ \/ \/ \/ \/ -# $Id$ -# - -INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ - -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR) - -ifdef APPEXTRA - INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) -endif - -WMAOPTS = -O2 -DROCKBOX -CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET_INC) $(WMAOPTS) $(TARGET) \ -$(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} $(PROFILE_OPTS) -DCODEC=1 - -# This sets up 'SRC' based on the files mentioned in SOURCES -include $(TOOLSDIR)/makesrc.inc - -SOURCES = $(SRC) -OBJS2 := $(SRC:%.c=$(OBJDIR)/%.o) -OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2)) -DEPFILE = $(OBJDIR)/dep-libwma -DIRS = - -all: $(OUTPUT) - -$(OUTPUT): $(OBJS) - $(call PRINTS,AR+RANLIB $(@F))$(AR) ruv $@ $+ >/dev/null 2>&1 - $(SILENT)$(RANLIB) $@ - -include $(TOOLSDIR)/make.inc - -clean: - $(call PRINTS,cleaning libwma)rm -f $(OBJS) $(OUTPUT) $(DEPFILE) - -ifneq ($(MAKECMDGOALS),clean) --include $(DEPFILE) -endif diff --git a/apps/codecs/libwma/libwma.make b/apps/codecs/libwma/libwma.make new file mode 100644 index 0000000..d40d62e --- /dev/null +++ b/apps/codecs/libwma/libwma.make @@ -0,0 +1,17 @@ +# __________ __ ___. +# Open \______ \ ____ ____ | | _\_ |__ _______ ___ +# Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / +# Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < +# Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ +# \/ \/ \/ \/ \/ +# $Id: Makefile 19082 2008-11-10 23:54:24Z zagor $ +# + +# libwma +WMALIB := $(CODECDIR)/libwma.a +WMALIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libwma/SOURCES) +WMALIB_OBJ := $(call c2obj, $(WMALIB_SRC)) +OTHER_SRC += $(WMALIB_SRC) + +$(WMALIB): $(WMALIB_OBJ) + $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 |