forked from len0rd/rockbox
Various build sytem cleanups
* Parallel build appears to work properly * Use $(SILENT) instead of @ about everywhere * Less calls to bash by using make builtin substitutions git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8638 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Brandon Low
parent
8fee5282ba
commit
4872825ed2
7 changed files with 148 additions and 144 deletions
|
|
@ -70,7 +70,7 @@ LIBROCKBOX = $(BUILDDIR)/librockbox.a
|
|||
ifdef SIMVER
|
||||
# this is a sim build
|
||||
|
||||
all: build-bitmaps $(BUILDDIR)/$(BINARY) $(CODECS) $(ROCKS)
|
||||
all: $(BUILDDIR)/$(BINARY) $(CODECS) $(ROCKS)
|
||||
|
||||
else
|
||||
# regular target build
|
||||
|
|
@ -82,7 +82,7 @@ else
|
|||
REALBIN = $(BUILDDIR)/$(BINARY)
|
||||
endif
|
||||
|
||||
all: build-bitmaps $(REALBIN) $(FLASHFILE) $(CODECS) $(ROCKS) $(ARCHOSROM)
|
||||
all: $(REALBIN) $(FLASHFILE) $(CODECS) $(ROCKS) $(ARCHOSROM)
|
||||
endif
|
||||
|
||||
dep: $(DEPFILE)
|
||||
|
|
@ -94,7 +94,9 @@ build-codecs:
|
|||
build-bitmaps:
|
||||
@$(MAKE) -C bitmaps OBJDIR=$(OBJDIR)/bitmaps
|
||||
|
||||
rocks:
|
||||
$(BITMAPLIBS): build-bitmaps
|
||||
|
||||
rocks: build-codecs
|
||||
@$(MAKE) -C plugins/lib OBJDIR=$(OBJDIR)/plugins/lib
|
||||
@$(MAKE) -C plugins OBJDIR=$(OBJDIR)/plugins
|
||||
|
||||
|
|
|
|||
|
|
@ -43,34 +43,33 @@ CODECDEPS = $(LINKCODEC) $(BUILDDIR)/libcodec.a
|
|||
|
||||
OUTPUT = $(SOFTWARECODECS)
|
||||
|
||||
all: $(OUTPUT) $(ROCKS)
|
||||
all: $(ROCKS)
|
||||
|
||||
ifndef SIMVER
|
||||
ELFIT = $(SILENT)(file=`basename $@`; \
|
||||
echo "LD $$file"; \
|
||||
$(CC) $(GCCOPTS) -O -nostdlib -o $@ $< -L$(BUILDDIR) $(CODECLIBS) -lcodec -lgcc -T$(LINKCODEC) -Wl,-Map,$(OBJDIR)/$*.map)
|
||||
NULL =
|
||||
|
||||
.elf.o:
|
||||
$(ELFIT)
|
||||
$(OBJDIR)/wav.elf : $(NULL)
|
||||
$(OBJDIR)/aiff.elf : $(NULL)
|
||||
$(OBJDIR)/mpa.elf : $(BUILDDIR)/libmad.a
|
||||
$(OBJDIR)/a52.elf : $(BUILDDIR)/liba52.a
|
||||
$(OBJDIR)/flac.elf : $(BUILDDIR)/libffmpegFLAC.a
|
||||
$(OBJDIR)/vorbis.elf : $(BUILDDIR)/libTremor.a
|
||||
$(OBJDIR)/mpc.elf : $(BUILDDIR)/libmusepack.a
|
||||
$(OBJDIR)/wavpack.elf : $(BUILDDIR)/libwavpack.a
|
||||
$(OBJDIR)/alac.elf : $(BUILDDIR)/libalac.a $(BUILDDIR)/libm4a.a
|
||||
$(OBJDIR)/aac.elf : $(BUILDDIR)/libfaad.a $(BUILDDIR)/libm4a.a
|
||||
$(OBJDIR)/shorten.elf : $(BUILDDIR)/libffmpegFLAC.a
|
||||
|
||||
$(OBJDIR)/mpa.elf: $(OBJDIR)/mpa.o $(CODECDEPS) $(BUILDDIR)/libmad.a
|
||||
$(OBJDIR)/a52.elf: $(OBJDIR)/a52.o $(CODECDEPS) $(BUILDDIR)/liba52.a
|
||||
$(OBJDIR)/flac.elf: $(OBJDIR)/flac.o $(CODECDEPS) $(BUILDDIR)/libffmpegFLAC.a
|
||||
$(OBJDIR)/vorbis.elf: $(OBJDIR)/vorbis.o $(CODECDEPS) $(BUILDDIR)/libTremor.a
|
||||
$(OBJDIR)/mpc.elf: $(OBJDIR)/mpc.o $(CODECDEPS) $(BUILDDIR)/libmusepack.a
|
||||
$(OBJDIR)/wav.elf: $(OBJDIR)/wav.o $(CODECDEPS)
|
||||
$(OBJDIR)/wavpack.elf: $(OBJDIR)/wavpack.o $(CODECDEPS) $(BUILDDIR)/libwavpack.a
|
||||
$(OBJDIR)/alac.elf: $(OBJDIR)/alac.o $(CODECDEPS) $(BUILDDIR)/libalac.a $(BUILDDIR)/libm4a.a
|
||||
$(OBJDIR)/aac.elf: $(OBJDIR)/aac.o $(CODECDEPS) $(BUILDDIR)/libfaad.a $(BUILDDIR)/libm4a.a
|
||||
$(OBJDIR)/shorten.elf: $(OBJDIR)/shorten.o $(CODECDEPS) $(BUILDDIR)/libffmpegFLAC.a
|
||||
$(OBJDIR)/aiff.elf: $(OBJDIR)/aiff.o $(CODECDEPS)
|
||||
$(OBJDIR)/%.elf :
|
||||
@echo "LD $(notdir $@)"
|
||||
$(SILENT)$(CC) $(GCCOPTS) -O -nostdlib -o $@ $^ -L$(BUILDDIR) -lcodec -lgcc -T$(LINKCODEC) -Wl,-Map,$(OBJDIR)/$*.map
|
||||
|
||||
$(OBJDIR)/%.elf: $(OBJDIR)/%.o $(CODECDEPS)
|
||||
$(ELFIT)
|
||||
$(BUILDDIR)/%.a : % $(CODECDEPS)
|
||||
|
||||
|
||||
$(OBJDIR)/%.codec : $(OBJDIR)/%.elf
|
||||
@echo "OBJCOPY "`basename $@`
|
||||
@$(OC) -O binary $< $@
|
||||
@echo "OBJCOPY $(notdir $@)"
|
||||
$(SILENT)$(OC) -O binary $< $@
|
||||
else
|
||||
|
||||
ifeq ($(SIMVER), x11)
|
||||
|
|
@ -78,14 +77,14 @@ ifeq ($(SIMVER), x11)
|
|||
# This is the X11 simulator version
|
||||
|
||||
$(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a
|
||||
@echo "LD "`basename $@`
|
||||
@$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR) $(CODECLIBS) -lcodec -o $@
|
||||
@echo "LD $(notdir $@)"
|
||||
$(SILENT)$(CC) $(CFLAGS) -shared $^ -L$(BUILDDIR) $(CODECLIBS) -lcodec -o $@
|
||||
ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN)
|
||||
# 'x' must be kept or you'll have "Win32 error 5"
|
||||
# $ fgrep 5 /usr/include/w32api/winerror.h | head -1
|
||||
# #define ERROR_ACCESS_DENIED 5L
|
||||
else
|
||||
@chmod -x $@
|
||||
$(SILENT)chmod -x $@
|
||||
endif
|
||||
|
||||
else # end of x11-simulator
|
||||
|
|
@ -95,13 +94,13 @@ ifeq ($(SIMVER), sdl)
|
|||
|
||||
$(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a
|
||||
@echo "LD "`basename $@`
|
||||
@$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR) $(CODECLIBS) -lcodec -o $@
|
||||
$(SILENT)$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR) $(CODECLIBS) -lcodec -o $@
|
||||
ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN)
|
||||
# 'x' must be kept or you'll have "Win32 error 5"
|
||||
# $ fgrep 5 /usr/include/w32api/winerror.h | head -1
|
||||
# #define ERROR_ACCESS_DENIED 5L
|
||||
else
|
||||
@chmod -x $@
|
||||
$(SILENT)chmod -x $@
|
||||
endif
|
||||
|
||||
else # end of sdl-simulator
|
||||
|
|
@ -111,16 +110,16 @@ DLLTOOLFLAGS = --export-all
|
|||
DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin
|
||||
|
||||
$(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a
|
||||
@echo "DLL "`basename $@`
|
||||
@$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $<
|
||||
@$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< $(BUILDDIR)/libcodec.a \
|
||||
@echo "DLL $(notdir $@)"
|
||||
$(SILENT)$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $<
|
||||
$(SILENT)$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< $(BUILDDIR)/libcodec.a \
|
||||
$(patsubst -l%,$(BUILDDIR)/lib%.a,$(CODECLIBS)) -o $@
|
||||
ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN)
|
||||
# 'x' must be kept or you'll have "Win32 error 5"
|
||||
# $ fgrep 5 /usr/include/w32api/winerror.h | head -1
|
||||
# #define ERROR_ACCESS_DENIED 5L
|
||||
else
|
||||
@chmod -x $@
|
||||
$(SILENT)chmod -x $@
|
||||
endif
|
||||
endif # end of win32-simulator
|
||||
endif
|
||||
|
|
@ -131,76 +130,77 @@ include $(TOOLSDIR)/make.inc
|
|||
|
||||
$(BUILDDIR)/libcodec.a:
|
||||
@echo "MAKE in codecs/lib"
|
||||
@mkdir -p $(OBJDIR)/lib
|
||||
@$(MAKE) -C lib OBJDIR=$(OBJDIR)/lib
|
||||
$(SILENT)mkdir -p $(OBJDIR)/lib
|
||||
$(SILENT)$(MAKE) -C lib OBJDIR=$(OBJDIR)/lib
|
||||
|
||||
$(LINKCODEC): $(LDS)
|
||||
@echo "build $@"
|
||||
@cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) -DCODEC $(INCLUDES) $(TARGET) $(DEFINES) -E -P - >$@
|
||||
$(SILENT)cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) -DCODEC $(INCLUDES) $(TARGET) $(DEFINES) -E -P - >$@
|
||||
|
||||
libmad:
|
||||
@echo "MAKE in libmad"
|
||||
@mkdir -p $(OBJDIR)/libmad
|
||||
@$(MAKE) -C libmad OBJDIR=$(OBJDIR)/libmad OUTPUT=$(BUILDDIR)/libmad.a
|
||||
$(SILENT)mkdir -p $(OBJDIR)/libmad
|
||||
$(SILENT)$(MAKE) -C libmad OBJDIR=$(OBJDIR)/libmad OUTPUT=$(BUILDDIR)/libmad.a
|
||||
|
||||
liba52:
|
||||
@echo "MAKE in liba52"
|
||||
@mkdir -p $(OBJDIR)/liba52
|
||||
@$(MAKE) -C liba52 OBJDIR=$(OBJDIR)/liba52 OUTPUT=$(BUILDDIR)/liba52.a
|
||||
$(SILENT)mkdir -p $(OBJDIR)/liba52
|
||||
$(SILENT)$(MAKE) -C liba52 OBJDIR=$(OBJDIR)/liba52 OUTPUT=$(BUILDDIR)/liba52.a
|
||||
|
||||
libffmpegFLAC:
|
||||
@echo "MAKE in libffmpegFLAC"
|
||||
@mkdir -p $(OBJDIR)/libffmpegFLAC
|
||||
@$(MAKE) -C libffmpegFLAC OBJDIR=$(OBJDIR)/libffmpegFLAC OUTPUT=$(BUILDDIR)/libffmpegFLAC.a
|
||||
$(SILENT)mkdir -p $(OBJDIR)/libffmpegFLAC
|
||||
$(SILENT)$(MAKE) -C libffmpegFLAC OBJDIR=$(OBJDIR)/libffmpegFLAC OUTPUT=$(BUILDDIR)/libffmpegFLAC.a
|
||||
|
||||
libTremor:
|
||||
@echo "MAKE in Tremor"
|
||||
@mkdir -p $(OBJDIR)/Tremor
|
||||
@$(MAKE) -C Tremor OBJDIR=$(OBJDIR)/Tremor OUTPUT=$(BUILDDIR)/libTremor.a
|
||||
$(SILENT)mkdir -p $(OBJDIR)/Tremor
|
||||
$(SILENT)$(MAKE) -C Tremor OBJDIR=$(OBJDIR)/Tremor OUTPUT=$(BUILDDIR)/libTremor.a
|
||||
|
||||
libwavpack:
|
||||
@echo "MAKE in libwavpack"
|
||||
@mkdir -p $(OBJDIR)/libwavpack
|
||||
@$(MAKE) -C libwavpack OBJDIR=$(OBJDIR)/libwavpack OUTPUT=$(BUILDDIR)/libwavpack.a
|
||||
$(SILENT)mkdir -p $(OBJDIR)/libwavpack
|
||||
$(SILENT)$(MAKE) -C libwavpack OBJDIR=$(OBJDIR)/libwavpack OUTPUT=$(BUILDDIR)/libwavpack.a
|
||||
|
||||
dumb:
|
||||
@echo "MAKE in dumb"
|
||||
@mkdir -p $(OBJDIR)/dumb
|
||||
@$(MAKE) -C dumb OBJDIR=$(OBJDIR)/dumb LIBDIR=$(BUILDDIR) OFLAGS="$(CFLAGS)"
|
||||
$(SILENT)mkdir -p $(OBJDIR)/dumb
|
||||
$(SILENT)$(MAKE) -C dumb OBJDIR=$(OBJDIR)/dumb LIBDIR=$(BUILDDIR) OFLAGS="$(CFLAGS)"
|
||||
|
||||
libmusepack:
|
||||
@echo "MAKE in libmusepack"
|
||||
@mkdir -p $(OBJDIR)/libmusepack
|
||||
@$(MAKE) -C libmusepack OBJDIR=$(OBJDIR)/libmusepack OUTPUT=$(BUILDDIR)/libmusepack.a
|
||||
$(SILENT)mkdir -p $(OBJDIR)/libmusepack
|
||||
$(SILENT)$(MAKE) -C libmusepack OBJDIR=$(OBJDIR)/libmusepack OUTPUT=$(BUILDDIR)/libmusepack.a
|
||||
|
||||
libalac:
|
||||
@echo "MAKE in libalac"
|
||||
@mkdir -p $(OBJDIR)/libalac
|
||||
@$(MAKE) -C libalac OBJDIR=$(OBJDIR)/libalac OUTPUT=$(BUILDDIR)/libalac.a
|
||||
$(SILENT)mkdir -p $(OBJDIR)/libalac
|
||||
$(SILENT)$(MAKE) -C libalac OBJDIR=$(OBJDIR)/libalac OUTPUT=$(BUILDDIR)/libalac.a
|
||||
|
||||
libm4a:
|
||||
@echo "MAKE in libm4a"
|
||||
@mkdir -p $(OBJDIR)/libm4a
|
||||
@$(MAKE) -C libm4a OBJDIR=$(OBJDIR)/libm4a OUTPUT=$(BUILDDIR)/libm4a.a
|
||||
$(SILENT)mkdir -p $(OBJDIR)/libm4a
|
||||
$(SILENT)$(MAKE) -C libm4a OBJDIR=$(OBJDIR)/libm4a OUTPUT=$(BUILDDIR)/libm4a.a
|
||||
|
||||
libfaad:
|
||||
@echo "MAKE in libfaad"
|
||||
@mkdir -p $(OBJDIR)/libfaad
|
||||
@$(MAKE) -C libfaad OBJDIR=$(OBJDIR)/libfaad OUTPUT=$(BUILDDIR)/libfaad.a
|
||||
$(SILENT)mkdir -p $(OBJDIR)/libfaad
|
||||
$(SILENT)$(MAKE) -C libfaad OBJDIR=$(OBJDIR)/libfaad OUTPUT=$(BUILDDIR)/libfaad.a
|
||||
|
||||
clean:
|
||||
@echo "cleaning codecs"
|
||||
$(SILENT)rm -fr $(OBJDIR)/libmad $(BUILDDIR)/libmad.a $(OBJDIR)/liba52 $(BUILDDIR)/liba52.a $(OBJDIR)/libffmpegFLAC $(BUILDDIR)/libffmpegFLAC.a $(OBJDIR)/Tremor $(BUILDDIR)/libTremor.a $(OBJDIR)/libwavpack $(BUILDDIR)/libwavpack.a $(OBJDIR)/dumb $(BUILDDIR)/libdumb.a $(BUILDDIR)/libdumbd.a $(OBJDIR)/libmusepack $(BUILDDIR)/libmusepack.a $(OBJDIR)/libalac $(BUILDDIR)/libalac.a $(OBJDIR)/libfaad $(BUILDDIR)/libfaad.a $(OBJDIR)/libm4a $(BUILDDIR)/libm4a.a
|
||||
@$(MAKE) -C libmad clean OBJDIR=$(OBJDIR)/libmad
|
||||
@$(MAKE) -C liba52 clean OBJDIR=$(OBJDIR)/liba52
|
||||
@$(MAKE) -C libffmpegFLAC clean OBJDIR=$(OBJDIR)/libffmpegFLAC
|
||||
@$(MAKE) -C Tremor clean OBJDIR=$(OBJDIR)/Tremor
|
||||
@$(MAKE) -C libwavpack clean OBJDIR=$(OBJDIR)/libwavpack
|
||||
@$(MAKE) -C libmusepack clean OBJDIR=$(OBJDIR)/libmusepack
|
||||
@$(MAKE) -C libalac clean OBJDIR=$(OBJDIR)/libalac
|
||||
@$(MAKE) -C libfaad clean OBJDIR=$(OBJDIR)/libfaad
|
||||
@$(MAKE) -C libm4a clean OBJDIR=$(OBJDIR)/libm4a
|
||||
@$(MAKE) -C dumb clean OBJDIR=$(OBJDIR)/dumb
|
||||
@$(MAKE) -C lib clean OBJDIR=$(OBJDIR)/lib
|
||||
$(SILENT)$(MAKE) -C libmad clean OBJDIR=$(OBJDIR)/libmad
|
||||
$(SILENT)$(MAKE) -C liba52 clean OBJDIR=$(OBJDIR)/liba52
|
||||
$(SILENT)$(MAKE) -C libffmpegFLAC clean OBJDIR=$(OBJDIR)/libffmpegFLAC
|
||||
$(SILENT)$(MAKE) -C Tremor clean OBJDIR=$(OBJDIR)/Tremor
|
||||
$(SILENT)$(MAKE) -C libwavpack clean OBJDIR=$(OBJDIR)/libwavpack
|
||||
$(SILENT)$(MAKE) -C libmusepack clean OBJDIR=$(OBJDIR)/libmusepack
|
||||
$(SILENT)$(MAKE) -C libalac clean OBJDIR=$(OBJDIR)/libalac
|
||||
$(SILENT)$(MAKE) -C libfaad clean OBJDIR=$(OBJDIR)/libfaad
|
||||
$(SILENT)$(MAKE) -C libm4a clean OBJDIR=$(OBJDIR)/libm4a
|
||||
$(SILENT)$(MAKE) -C dumb clean OBJDIR=$(OBJDIR)/dumb
|
||||
$(SILENT)$(MAKE) -C lib clean OBJDIR=$(OBJDIR)/lib
|
||||
|
||||
ifneq ($(MAKECMDGOALS),clean)
|
||||
-include $(DEPFILE)
|
||||
|
|
|
|||
|
|
@ -70,29 +70,30 @@ endif
|
|||
|
||||
|
||||
.PHONY: $(SUBDIRS)
|
||||
all: build-bitmaps $(BUILDDIR)/libplugin.a $(ROCKS) $(SUBDIRS) $(DEPFILE)
|
||||
all: $(BUILDDIR)/libplugin.a $(ROCKS) $(SUBDIRS) $(DEPFILE)
|
||||
|
||||
$(BUILDDIR)/credits.raw: $(DOCSDIR)/CREDITS
|
||||
@echo "create credits.raw"
|
||||
@perl credits.pl < $< > $@
|
||||
$(SILENT)perl credits.pl < $< > $@
|
||||
|
||||
$(OBJDIR)/credits.o: credits.c $(BUILDDIR)/credits.raw
|
||||
@mkdir -p `dirname $@`
|
||||
$(SILENT)mkdir -p $(dir $@)
|
||||
@echo "CC $<"
|
||||
@$(CC) $(CFLAGS) -I$(OBJDIR) -c $< -o $@
|
||||
$(SILENT)$(CC) $(CFLAGS) -I$(OBJDIR) -c $< -o $@
|
||||
|
||||
build-bitmaps:
|
||||
@$(MAKE) -C bitmaps OBJDIR=$(OBJDIR)/bitmaps
|
||||
$(SILENT)$(MAKE) -C bitmaps OBJDIR=$(OBJDIR)/bitmaps
|
||||
|
||||
$(BITMAPLIBS): build-bitmaps
|
||||
|
||||
ifndef SIMVER
|
||||
$(OBJDIR)/%.elf: $(OBJDIR)/%.o $(LINKFILE) $(BUILDDIR)/libplugin.a $(BITMAPLIBS)
|
||||
$(SILENT)(file=`basename $@`; \
|
||||
echo "LD $$file"; \
|
||||
$(CC) $(GCCOPTS) -O -nostdlib -o $@ $< -L$(BUILDDIR) $(CODECLIBS) -lplugin $(LINKBITMAPS) -lgcc -T$(LINKFILE) -Wl,--gc-sections -Wl,-Map,$(OBJDIR)/$*.map)
|
||||
@echo "LD $(notdir $@)"
|
||||
$(SILENT)$(CC) $(GCCOPTS) -O -nostdlib -o $@ $< -L$(BUILDDIR) $(CODECLIBS) -lplugin $(LINKBITMAPS) -lgcc -T$(LINKFILE) -Wl,--gc-sections -Wl,-Map,$(OBJDIR)/$*.map
|
||||
|
||||
$(OBJDIR)/%.rock : $(OBJDIR)/%.elf
|
||||
@echo "OBJCOPY "`basename $@`
|
||||
@$(OC) -O binary $< $@
|
||||
$(SILENT)$(OC) -O binary $< $@
|
||||
else
|
||||
|
||||
ifeq ($(SIMVER), x11)
|
||||
|
|
@ -101,13 +102,13 @@ ifeq ($(SIMVER), x11)
|
|||
|
||||
$(OBJDIR)/%.rock : $(OBJDIR)/%.o $(BUILDDIR)/libplugin.a
|
||||
@echo "LD "`basename $@`
|
||||
@$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR) $(CODECLIBS) -lplugin $(LINKBITMAPS) -o $@
|
||||
$(SILENT)$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR) $(CODECLIBS) -lplugin $(LINKBITMAPS) -o $@
|
||||
ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN)
|
||||
# 'x' must be kept or you'll have "Win32 error 5"
|
||||
# $ fgrep 5 /usr/include/w32api/winerror.h | head -1
|
||||
# #define ERROR_ACCESS_DENIED 5L
|
||||
else
|
||||
@chmod -x $@
|
||||
$(SILENT)chmod -x $@
|
||||
endif
|
||||
|
||||
else # end of x11-simulator
|
||||
|
|
@ -117,13 +118,13 @@ ifeq ($(SIMVER), sdl)
|
|||
|
||||
$(OBJDIR)/%.rock : $(OBJDIR)/%.o $(BUILDDIR)/libplugin.a
|
||||
@echo "LD "`basename $@`
|
||||
@$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR) $(CODECLIBS) -lplugin $(LINKBITMAPS) -o $@
|
||||
$(SILENT)$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR) $(CODECLIBS) -lplugin $(LINKBITMAPS) -o $@
|
||||
ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN)
|
||||
# 'x' must be kept or you'll have "Win32 error 5"
|
||||
# $ fgrep 5 /usr/include/w32api/winerror.h | head -1
|
||||
# #define ERROR_ACCESS_DENIED 5L
|
||||
else
|
||||
@chmod -x $@
|
||||
$(SILENT)chmod -x $@
|
||||
endif
|
||||
|
||||
else # end of sdl-simulator
|
||||
|
|
@ -134,15 +135,15 @@ DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin
|
|||
|
||||
$(OBJDIR)/%.rock : $(OBJDIR)/%.o $(BUILDDIR)/libplugin.a
|
||||
@echo "DLL "`basename $@`
|
||||
@$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $<
|
||||
@$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< $(BUILDDIR)/libplugin.a $(BITMAPLIBS) \
|
||||
$(SILENT)$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $<
|
||||
$(SILENT)$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< $(BUILDDIR)/libplugin.a $(BITMAPLIBS) \
|
||||
$(patsubst -l%,$(BUILDDIR)/lib%.a,$(CODECLIBS)) -o $@
|
||||
ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN)
|
||||
# 'x' must be kept or you'll have "Win32 error 5"
|
||||
# $ fgrep 5 /usr/include/w32api/winerror.h | head -1
|
||||
# #define ERROR_ACCESS_DENIED 5L
|
||||
else
|
||||
@chmod -x $@
|
||||
$(SILENT)chmod -x $@
|
||||
endif
|
||||
endif # end of win32-simulator
|
||||
endif
|
||||
|
|
@ -159,26 +160,26 @@ $(BUILDDIR)/libplugin.a:
|
|||
$(BUILDDIR)/libpluginbitmapsnative.a:
|
||||
@echo "MAKE in plugins/bitmaps/native"
|
||||
$(SILENT)mkdir -p $(OBJDIR)/bitmaps/native
|
||||
@$(MAKE) -C bitmaps/native OBJDIR=$(OBJDIR)/bitmaps/native
|
||||
$(SILENT)$(MAKE) -C bitmaps/native OBJDIR=$(OBJDIR)/bitmaps/native
|
||||
|
||||
$(BUILDDIR)/libpluginbitmapsmono.a:
|
||||
@echo "MAKE in plugins/bitmaps/mono"
|
||||
$(SILENT)mkdir -p $(OBJDIR)/bitmaps/mono
|
||||
@$(MAKE) -C bitmaps/mono OBJDIR=$(OBJDIR)/bitmaps/mono
|
||||
$(SILENT)$(MAKE) -C bitmaps/mono OBJDIR=$(OBJDIR)/bitmaps/mono
|
||||
|
||||
$(BUILDDIR)/libpluginbitmapsremotenative.a:
|
||||
@echo "MAKE in plugins/bitmaps/remote_native"
|
||||
$(SILENT)mkdir -p $(OBJDIR)/bitmaps/remote_native
|
||||
@$(MAKE) -C bitmaps/remote_native OBJDIR=$(OBJDIR)/bitmaps/remote_native
|
||||
$(SILENT)$(MAKE) -C bitmaps/remote_native OBJDIR=$(OBJDIR)/bitmaps/remote_native
|
||||
|
||||
$(BUILDDIR)/libpluginbitmapsremotemono.a:
|
||||
@echo "MAKE in plugins/bitmaps/remote_mono"
|
||||
$(SILENT)mkdir -p $(OBJDIR)/bitmaps/remote_mono
|
||||
@$(MAKE) -C bitmaps/remote_mono OBJDIR=$(OBJDIR)/bitmaps/remote_mono
|
||||
$(SILENT)$(MAKE) -C bitmaps/remote_mono OBJDIR=$(OBJDIR)/bitmaps/remote_mono
|
||||
|
||||
$(LINKFILE): $(LDS)
|
||||
@echo "build $@"
|
||||
@cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P - >$@
|
||||
$(SILENT)cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P - >$@
|
||||
|
||||
$(SUBDIRS):
|
||||
@echo "MAKE in $@"
|
||||
|
|
@ -187,14 +188,14 @@ $(SUBDIRS):
|
|||
|
||||
clean:
|
||||
@echo "cleaning plugins"
|
||||
@rm -f $(ROCKS) $(LINKFILE) $(OBJDIR)/*.rock $(DEPFILE) $(ELFS) \
|
||||
$(SILENT)rm -f $(ROCKS) $(LINKFILE) $(OBJDIR)/*.rock $(DEPFILE) $(ELFS) \
|
||||
$(BUILDDIR)/credits.raw $(OBJS) $(DEFS)
|
||||
@$(MAKE) -C lib clean OBJDIR=$(OBJDIR)/lib
|
||||
@$(MAKE) -C bitmaps/mono clean OBJDIR=$(OBJDIR)/bitmaps/mono
|
||||
@$(MAKE) -C bitmaps/native clean OBJDIR=$(OBJDIR)/bitmaps/native
|
||||
@$(MAKE) -C bitmaps/remote_mono clean OBJDIR=$(OBJDIR)/bitmaps/remote_mono
|
||||
@$(MAKE) -C bitmaps/remote_native clean OBJDIR=$(OBJDIR)/bitmaps/remote_native
|
||||
@$(MAKE) -C rockboy clean OBJDIR=$(OBJDIR)/rockboy
|
||||
@$(MAKE) -C searchengine clean OBJDIR=$(OBJDIR)/searchengine
|
||||
$(SILENT)$(MAKE) -C lib clean OBJDIR=$(OBJDIR)/lib
|
||||
$(SILENT)$(MAKE) -C bitmaps/mono clean OBJDIR=$(OBJDIR)/bitmaps/mono
|
||||
$(SILENT)$(MAKE) -C bitmaps/native clean OBJDIR=$(OBJDIR)/bitmaps/native
|
||||
$(SILENT)$(MAKE) -C bitmaps/remote_mono clean OBJDIR=$(OBJDIR)/bitmaps/remote_mono
|
||||
$(SILENT)$(MAKE) -C bitmaps/remote_native clean OBJDIR=$(OBJDIR)/bitmaps/remote_native
|
||||
$(SILENT)$(MAKE) -C rockboy clean OBJDIR=$(OBJDIR)/rockboy
|
||||
$(SILENT)$(MAKE) -C searchengine clean OBJDIR=$(OBJDIR)/searchengine
|
||||
|
||||
-include $(DEPFILE)
|
||||
|
|
|
|||
|
|
@ -28,15 +28,15 @@ dep: $(DEPFILE)
|
|||
|
||||
$(OUTPUT): $(OBJS) $(DEPFILE)
|
||||
@echo "AR+RANLIB $@"
|
||||
@$(AR) ruv $@ $(OBJS) >/dev/null 2>&1
|
||||
@$(RANLIB) $@
|
||||
$(SILENT)$(AR) ruv $@ $(OBJS) >/dev/null 2>&1
|
||||
$(SILENT)$(RANLIB) $@
|
||||
|
||||
include $(TOOLSDIR)/make.inc
|
||||
|
||||
clean:
|
||||
@echo "cleaning firmware"
|
||||
@rm -f $(OBJS) $(OUTPUT) $(OBJDIR)/sysfont.c $(DEPFILE)
|
||||
@rm -rf $(OBJDIR)/drivers $(OBJDIR)/common
|
||||
$(SILENT)rm -f $(OBJS) $(OUTPUT) $(OBJDIR)/sysfont.c $(DEPFILE)
|
||||
$(SILENT)rm -rf $(OBJDIR)/drivers $(OBJDIR)/common
|
||||
|
||||
# Special targets
|
||||
$(OBJDIR)/thread.o: thread.c export/thread.h
|
||||
|
|
|
|||
|
|
@ -27,30 +27,31 @@ iaudio.o: iaudio.c
|
|||
sh2d: sh2d.c
|
||||
|
||||
bmp2rb: bmp2rb.c
|
||||
$(CC) -DAPPLICATION_NAME=\"$@\" -g $+ -o $@
|
||||
$(SILENT)$(CC) -DAPPLICATION_NAME=\"$@\" -g $+ -o $@
|
||||
|
||||
rdf2binary: rdf2binary.c
|
||||
$(CC) -g $+ -o $@
|
||||
$(SILENT)$(CC) -g $+ -o $@
|
||||
|
||||
mkboot: mkboot.c
|
||||
$(CC) -g $+ -o $@
|
||||
$(SILENT)$(CC) -g $+ -o $@
|
||||
|
||||
ipod_fw: ipod_fw.c
|
||||
$(CC) -g $+ -o $@
|
||||
$(SILENT)$(CC) -g $+ -o $@
|
||||
|
||||
convbdf: convbdf.c
|
||||
$(CC) -g $+ -o $@
|
||||
$(SILENT)$(CC) -g $+ -o $@
|
||||
|
||||
codepages: codepages.c codepage_tables.c
|
||||
$(CC) -g $+ -o $@
|
||||
$(SILENT)$(CC) -g $+ -o $@
|
||||
|
||||
generate_rocklatin: generate_rocklatin.c ../firmware/drivers/lcd-player-charset.c
|
||||
$(CC) -DHAVE_LCD_CHARCELLS -D__CONFIG_H__ -I../firmware/export $+ -o $@
|
||||
$(SILENT)$(CC) -DHAVE_LCD_CHARCELLS -D__CONFIG_H__ -I../firmware/export $+ -o $@
|
||||
|
||||
uclpack:
|
||||
$(MAKE) -C ucl
|
||||
$(SILENT)$(MAKE) -C ucl
|
||||
|
||||
clean:
|
||||
rm -f $(CLEANALL) $(shell for f in $(CLEANALL) ; do echo $$f.exe $$f.o $$f.obj ; done) *.ajf *~
|
||||
$(MAKE) -C ucl clean
|
||||
@echo "Cleaning tools"
|
||||
$(SILENT)rm -f $(CLEANALL) $(shell for f in $(CLEANALL) ; do echo $$f.exe $$f.o $$f.obj ; done) *.ajf *~
|
||||
$(SILENT)$(MAKE) -C ucl clean
|
||||
|
||||
|
|
|
|||
34
tools/configure
vendored
34
tools/configure
vendored
|
|
@ -1073,6 +1073,10 @@ sed > Makefile \
|
|||
<<EOF
|
||||
## Automaticly generated. http://www.rockbox.org/
|
||||
|
||||
ifndef V
|
||||
SILENT=@
|
||||
endif
|
||||
|
||||
export ROOTDIR=@ROOTDIR@
|
||||
export FIRMDIR=@FIRMDIR@
|
||||
export APPSDIR=@APPSDIR@
|
||||
|
|
@ -1129,33 +1133,33 @@ MAKEFLAGS += --no-print-directory
|
|||
all: tools
|
||||
@SIMUL1@
|
||||
@SIMUL2@
|
||||
@\$(MAKE) -C \$(FIRMDIR) OBJDIR=\$(BUILDDIR)/firmware
|
||||
@\$(MAKE) -C \$(APPSDIR) OBJDIR=\$(BUILDDIR)/@APPS@
|
||||
\$(SILENT)\$(MAKE) -C \$(FIRMDIR) OBJDIR=\$(BUILDDIR)/firmware
|
||||
\$(SILENT)\$(MAKE) -C \$(APPSDIR) OBJDIR=\$(BUILDDIR)/@APPS@
|
||||
|
||||
clean:
|
||||
@\$(MAKE) -C \$(FIRMDIR) clean OBJDIR=\$(BUILDDIR)/firmware
|
||||
@\$(MAKE) -C \$(APPSDIR) clean OBJDIR=\$(BUILDDIR)/@APPS@
|
||||
@\$(MAKE) -C \$(TOOLSDIR) clean
|
||||
@rm -rf rockbox.zip TAGS @APPS@ firmware comsim sim lang.h manual *.pdf
|
||||
\$(SILENT)\$(MAKE) -C \$(FIRMDIR) clean OBJDIR=\$(BUILDDIR)/firmware
|
||||
\$(SILENT)\$(MAKE) -C \$(APPSDIR) clean OBJDIR=\$(BUILDDIR)/@APPS@
|
||||
\$(SILENT)\$(MAKE) -C \$(TOOLSDIR) clean
|
||||
\$(SILENT)rm -rf rockbox.zip TAGS @APPS@ firmware comsim sim lang.h manual *.pdf
|
||||
|
||||
tools:
|
||||
\$(MAKE) -C \$(TOOLSDIR) CC=\$(HOSTCC) @TOOLSET@
|
||||
\$(SILENT)\$(MAKE) -C \$(TOOLSDIR) CC=\$(HOSTCC) @TOOLSET@
|
||||
|
||||
tags:
|
||||
@rm -f TAGS
|
||||
\$(MAKE) -C \$(FIRMDIR) tags
|
||||
\$(MAKE) -C \$(APPSDIR) tags
|
||||
\$(MAKE) -C \$(APPSDIR)/plugins tags
|
||||
\$(MAKE) -C \$(APPSDIR)/plugins/lib tags
|
||||
\$(SILENT)rm -f TAGS
|
||||
\$(SILENT)\$(MAKE) -C \$(FIRMDIR) tags
|
||||
\$(SILENT)\$(MAKE) -C \$(APPSDIR) tags
|
||||
\$(SILENT)\$(MAKE) -C \$(APPSDIR)/plugins tags
|
||||
\$(SILENT)\$(MAKE) -C \$(APPSDIR)/plugins/lib tags
|
||||
|
||||
zip:
|
||||
@\$(TOOLSDIR)/buildzip.pl -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY)
|
||||
\$(SILENT)\$(TOOLSDIR)/buildzip.pl -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY)
|
||||
|
||||
7zip:
|
||||
@\$(TOOLSDIR)/buildzip.pl -o "rockbox.7z" -z "7za a" -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY)
|
||||
\$(SILENT)\$(TOOLSDIR)/buildzip.pl -o "rockbox.7z" -z "7za a" -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY)
|
||||
|
||||
manual:
|
||||
@\$(MAKE) -C \$(MANUALDIR) OBJDIR=\$(BUILDDIR)/manual buildmanual
|
||||
\$(SILENT)\$(MAKE) -C \$(MANUALDIR) OBJDIR=\$(BUILDDIR)/manual buildmanual
|
||||
|
||||
EOF
|
||||
|
||||
|
|
|
|||
|
|
@ -28,25 +28,21 @@ $(OBJDIR)/%.o: %.S
|
|||
$(DEPFILE): $(SOURCES)
|
||||
$(SILENT)mkdir -p `dirname $(DEPFILE)`
|
||||
$(SILENT)rm -f $(DEPFILE)
|
||||
$(SILENT)(if test ! -f $(BUILDDIR)/lang.h; then \
|
||||
del="$(BUILDDIR)/lang.h"; \
|
||||
touch $(BUILDDIR)/lang.h; \
|
||||
fi; \
|
||||
for each in $(SOURCES) x; do \
|
||||
if test "$$each" = "credits.c"; then \
|
||||
del="$$del$(BUILDDIR)/credits.raw"; \
|
||||
touch $(BUILDDIR)/credits.raw; \
|
||||
fi; \
|
||||
if test "x" != "$$each"; then \
|
||||
obj=`echo $$each | sed -e 's/\.[cS]/.o/'`; \
|
||||
$(CC) -MM -MT "$(OBJDIR)/$$obj" $(CFLAGS) $$each >> $(DEPFILE) 2>/dev/null; \
|
||||
fi; \
|
||||
if test -n "$$del"; then \
|
||||
rm $$del; \
|
||||
del=""; \
|
||||
fi \
|
||||
done; \
|
||||
echo "oo" >/dev/null )
|
||||
$(SILENT)(for each in $(SOURCES) x; do \
|
||||
if test "$$each" = "credits.c"; then \
|
||||
del="$$del$(BUILDDIR)/credits.raw"; \
|
||||
touch $(BUILDDIR)/credits.raw; \
|
||||
fi; \
|
||||
if test "x" != "$$each"; then \
|
||||
obj=`echo $$each | sed -e 's/\.[cS]/.o/'`; \
|
||||
$(CC) -MG -MM -MT "$(OBJDIR)/$$obj" $(CFLAGS) $$each 2>/dev/null; \
|
||||
fi; \
|
||||
if test -n "$$del"; then \
|
||||
rm $$del; \
|
||||
del=""; \
|
||||
fi \
|
||||
done | sed -e "s:[^[:space:]]*lang.h:$(OBJDIR)/lang.o:" > $(DEPFILE); \
|
||||
echo "oo" > /dev/null )
|
||||
|
||||
tags:
|
||||
$(SILENT)(for d in $(DIRS); do \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue