summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Arver <martin.arver@gmail.com>2006-12-11 21:00:14 +0000
committerMartin Arver <martin.arver@gmail.com>2006-12-11 21:00:14 +0000
commit440513ab6a51c5cc311ce8671180970279e4eaf9 (patch)
treec8e1341f3c1522168c31199e0bf829aec4407f06
parentfbb7cea9341971ea05364bfdf5cdef469a1e6b31 (diff)
downloadrockbox-440513ab6a51c5cc311ce8671180970279e4eaf9.zip
rockbox-440513ab6a51c5cc311ce8671180970279e4eaf9.tar.gz
rockbox-440513ab6a51c5cc311ce8671180970279e4eaf9.tar.bz2
rockbox-440513ab6a51c5cc311ce8671180970279e4eaf9.tar.xz
Stop building, and remove dumb as it has not changed state since its initial committed state
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11718 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/codecs/Makefile9
-rwxr-xr-xtools/configure34
2 files changed, 19 insertions, 24 deletions
diff --git a/apps/codecs/Makefile b/apps/codecs/Makefile
index e964bf7..56e5640 100644
--- a/apps/codecs/Makefile
+++ b/apps/codecs/Makefile
@@ -39,7 +39,7 @@ DIRS = .
CODECDEPS = $(LINKCODEC) $(BUILDDIR)/libcodec.a
-.PHONY: libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a
+.PHONY: libmad liba52 libffmpegFLAC libTremor libwavpack libmusepack libalac libfaad libm4a
OUTPUT = $(SOFTWARECODECS)
@@ -164,10 +164,6 @@ libwavpack:
$(SILENT)mkdir -p $(OBJDIR)/libwavpack
$(call PRINTS,MAKE in libwavpack)$(MAKE) -C libwavpack OBJDIR=$(OBJDIR)/libwavpack OUTPUT=$(BUILDDIR)/libwavpack.a
-dumb:
- $(SILENT)mkdir -p $(OBJDIR)/dumb
- $(call PRINTS,MAKE in dumb)$(MAKE) -C dumb OBJDIR=$(OBJDIR)/dumb LIBDIR=$(BUILDDIR) OFLAGS="$(CFLAGS)"
-
$(BUILDDIR)/libmusepack.a: libmusepack
libmusepack:
@@ -193,7 +189,7 @@ libfaad:
$(call PRINTS,MAKE in libfaad)$(MAKE) -C libfaad OBJDIR=$(OBJDIR)/libfaad OUTPUT=$(BUILDDIR)/libfaad.a
clean:
- $(call PRINTS,cleaning codecs)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
+ $(call PRINTS,cleaning codecs)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)/libmusepack $(BUILDDIR)/libmusepack.a $(OBJDIR)/libalac $(BUILDDIR)/libalac.a $(OBJDIR)/libfaad $(BUILDDIR)/libfaad.a $(OBJDIR)/libm4a $(BUILDDIR)/libm4a.a
$(SILENT)$(MAKE) -C libmad clean OBJDIR=$(OBJDIR)/libmad
$(SILENT)$(MAKE) -C liba52 clean OBJDIR=$(OBJDIR)/liba52
$(SILENT)$(MAKE) -C libffmpegFLAC clean OBJDIR=$(OBJDIR)/libffmpegFLAC
@@ -203,7 +199,6 @@ clean:
$(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)
diff --git a/tools/configure b/tools/configure
index 4c53612..efcd5d4 100755
--- a/tools/configure
+++ b/tools/configure
@@ -769,7 +769,7 @@ EOF
archosrom=""
flash=""
plugins="yes"
- codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
+ codecs="libmad liba52 libffmpegFLAC libTremor libwavpack libmusepack libalac libfaad libm4a"
# toolset is the tools within the tools directory that we build for
# this particular target.
toolset=$iriverbitmaptools
@@ -794,7 +794,7 @@ EOF
archosrom=""
flash=""
plugins="yes"
- codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
+ codecs="libmad liba52 libffmpegFLAC libTremor libwavpack libmusepack libalac libfaad libm4a"
# toolset is the tools within the tools directory that we build for
# this particular target.
toolset=$iriverbitmaptools
@@ -819,7 +819,7 @@ EOF
archosrom=""
flash=""
plugins="yes"
- codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
+ codecs="libmad liba52 libffmpegFLAC libTremor libwavpack libmusepack libalac libfaad libm4a"
# toolset is the tools within the tools directory that we build for
# this particular target.
toolset=$iriverbitmaptools
@@ -844,7 +844,7 @@ EOF
archosrom=""
flash=""
plugins="yes"
- codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
+ codecs="libmad liba52 libffmpegFLAC libTremor libwavpack libmusepack libalac libfaad libm4a"
# toolset is the tools within the tools directory that we build for
# this particular target.
toolset="$iaudiobitmaptools"
@@ -868,7 +868,7 @@ EOF
archosrom=""
flash=""
plugins="yes"
- codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
+ codecs="libmad liba52 libffmpegFLAC libTremor libwavpack libmusepack libalac libfaad libm4a"
boottool="$rootdir/tools/scramble -ipod4g"
bootoutput="bootloader.img"
# toolset is the tools within the tools directory that we build for
@@ -894,7 +894,7 @@ EOF
archosrom=""
flash=""
plugins="yes"
- codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
+ codecs="libmad liba52 libffmpegFLAC libTremor libwavpack libmusepack libalac libfaad libm4a"
boottool="$rootdir/tools/scramble -ipod4g"
bootoutput="bootloader.img"
# toolset is the tools within the tools directory that we build for
@@ -920,7 +920,7 @@ EOF
archosrom=""
flash=""
plugins="yes"
- codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
+ codecs="libmad liba52 libffmpegFLAC libTremor libwavpack libmusepack libalac libfaad libm4a"
boottool="$rootdir/tools/scramble -ipod5g"
bootoutput="bootloader.img"
# toolset is the tools within the tools directory that we build for
@@ -946,7 +946,7 @@ EOF
archosrom=""
flash=""
plugins="yes"
- codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
+ codecs="libmad liba52 libffmpegFLAC libTremor libwavpack libmusepack libalac libfaad libm4a"
boottool="$rootdir/tools/scramble -ipod3g"
bootoutput="bootloader.img"
# toolset is the tools within the tools directory that we build for
@@ -972,7 +972,7 @@ EOF
archosrom=""
flash=""
plugins="yes"
- codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
+ codecs="libmad liba52 libffmpegFLAC libTremor libwavpack libmusepack libalac libfaad libm4a"
boottool="$rootdir/tools/scramble -ipod4g"
bootoutput="bootloader.img"
# toolset is the tools within the tools directory that we build for
@@ -998,7 +998,7 @@ EOF
archosrom=""
flash=""
plugins="yes"
- codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
+ codecs="libmad liba52 libffmpegFLAC libTremor libwavpack libmusepack libalac libfaad libm4a"
boottool="$rootdir/tools/scramble -ipod4g"
bootoutput="bootloader.img"
# toolset is the tools within the tools directory that we build for
@@ -1024,7 +1024,7 @@ EOF
archosrom=""
flash=""
plugins="yes"
- codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
+ codecs="libmad liba52 libffmpegFLAC libTremor libwavpack libmusepack libalac libfaad libm4a"
# toolset is the tools within the tools directory that we build for
# this particular target.
toolset=$genericbitmaptools
@@ -1047,7 +1047,7 @@ EOF
archosrom=""
flash=""
plugins="yes"
- codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
+ codecs="libmad liba52 libffmpegFLAC libTremor libwavpack libmusepack libalac libfaad libm4a"
toolset=$gigabeatbitmaptools
boottool="$rootdir/tools/scramble -gigabeat"
bootoutput="FWIMG01.DAT"
@@ -1071,7 +1071,7 @@ EOF
archosrom=""
flash=""
plugins="yes"
- codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
+ codecs="libmad liba52 libffmpegFLAC libTremor libwavpack libmusepack libalac libfaad libm4a"
boottool="$rootdir/tools/scramble -ipod4g"
bootoutput="bootloader.img"
# toolset is the tools within the tools directory that we build for
@@ -1097,7 +1097,7 @@ EOF
archosrom=""
flash=""
plugins="yes"
- codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
+ codecs="libmad liba52 libffmpegFLAC libTremor libwavpack libmusepack libalac libfaad libm4a"
boottool="$rootdir/tools/scramble -mi4v3"
bootoutput="H10_20GC.mi4"
# toolset is the tools within the tools directory that we build for
@@ -1123,7 +1123,7 @@ EOF
archosrom=""
flash=""
plugins="yes"
- codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
+ codecs="libmad liba52 libffmpegFLAC libTremor libwavpack libmusepack libalac libfaad libm4a"
boottool="$rootdir/tools/scramble -mi4v3"
bootoutput="PP5022.mi4"
# toolset is the tools within the tools directory that we build for
@@ -1149,7 +1149,7 @@ EOF
archosrom=""
flash=""
plugins="yes"
- codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
+ codecs="libmad liba52 libffmpegFLAC libTremor libwavpack libmusepack libalac libfaad libm4a"
boottool="$rootdir/tools/scramble -mi4v2"
bootoutput="H10.mi4"
# toolset is the tools within the tools directory that we build for
@@ -1175,7 +1175,7 @@ EOF
archosrom=""
flash=""
plugins="yes"
- codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
+ codecs="libmad liba52 libffmpegFLAC libTremor libwavpack libmusepack libalac libfaad libm4a"
boottool="$rootdir/tools/scramble -mi4v2"
bootoutput="pp5020.mi4"
# toolset is the tools within the tools directory that we build for