diff options
| author | Anssi Hannula <anssi@xbmc.org> | 2011-02-06 02:04:50 +0200 |
|---|---|---|
| committer | Anssi Hannula <anssi@xbmc.org> | 2011-02-06 02:47:03 +0200 |
| commit | 6d77cd3a8ec03106bd55ecc04dae5b3bb2651f7c (patch) | |
| tree | bc10400d05aadcfdaedd09b5298b8f5741f8c8f9 /lib/Makefile.in | |
| parent | 748fab10f974dfb362b30c311f64288b07369e73 (diff) | |
removed: use of deprecated liba52
liba52 hasn't been used by default for a while. Remove the use of it
completely in favor of ffmpeg.
Diffstat (limited to 'lib/Makefile.in')
| -rw-r--r-- | lib/Makefile.in | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/lib/Makefile.in b/lib/Makefile.in index 063f2e553a..3cb090356c 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -10,9 +10,6 @@ DIRS= ifneq (@USE_EXTERNAL_FFMPEG@,1) DIRS+=ffmpeg endif -ifeq (@USE_INTERNAL_LIBA52@,1) - DIRS+=liba52 -endif ifeq (@USE_INTERNAL_LIBDTS@,1) DIRS+=libdts endif @@ -26,10 +23,6 @@ ifneq (@USE_EXTERNAL_FFMPEG@,1) postproc-51-$(ARCH).so \ swscale-0.6.1-$(ARCH).so endif -ifeq (@USE_INTERNAL_LIBA52@,1) - LIBS+=liba52-$(ARCH).so \ - libao-$(ARCH).so -endif ifeq (@USE_INTERNAL_LIBDTS@,1) LIBS+=libdts-$(ARCH).so endif @@ -126,16 +119,6 @@ $(SYSDIR)/libmad-$(ARCH).so: $(WRAPPER_OSX) libmad/libmad.la libmad/.libs/*.o $(BUNDLE1_O) $(WRAPPER_OSX) $@;mv output.so $@ -$(SYSDIR)/liba52-$(ARCH).so: $(WRAPPER_OSX) liba52/liba52/liba52.la - ld -bundle -flat_namespace -undefined suppress -o $@ \ - liba52/liba52/.libs/*.o $(BUNDLE1_O) - $(WRAPPER_OSX) $@;mv output.so $@ - -$(SYSDIR)/libao-$(ARCH).so: $(WRAPPER_OSX) liba52/libao/libao.a - ld -bundle -flat_namespace -undefined suppress -o $@ \ - liba52/libao/libao.a $(BUNDLE1_O) - #$(WRAPPER_OSX) $@;mv output.so $@ - libdts/libdts/libdts.a : libdts; libdts: $(MAKE) -C $@ @@ -148,11 +131,6 @@ libmad/libmad.la: libmad; libmad: $(MAKE) -C $@ -liba52/liba52/liba52.la: liba52 -liba52/libao/libao.a: liba52 -liba52: - $(MAKE) -C $@ - else $(SYSDIR)/avutil-50-$(ARCH).so: ffmpeg/libavutil/libavutil.so @@ -195,23 +173,10 @@ $(SYSDIR)/libdts-$(ARCH).so: $(WRAPPER) libdts/libdts/libdts.a libdts/libdts/downmix.o libdts/libdts/parse.o \ `cat $(WRAPPER:.o=.def)` $(WRAPPER) -$(SYSDIR)/liba52-$(ARCH).so: $(WRAPPER) liba52/liba52/liba52.la - $(CC) -o $@ $(LDFLAGS) --soname,$@ liba52/liba52/.libs/*.o \ - -Wl`cat $(WRAPPER:.o=.def)` $(WRAPPER) - -$(SYSDIR)/libao-$(ARCH).so: $(WRAPPER) liba52/libao/libao.a - $(CC) -o $@ $(LDFLAGS) --soname,$@ liba52/libao/libao.a \ - -Wl`cat $(WRAPPER:.o=.def)` $(WRAPPER) - libdts/libdts/libdts.a : libdts; libdts: $(MAKE) -C $@ -liba52/liba52/liba52.la: liba52 -liba52/libao/libao.a: liba52 -liba52: - $(MAKE) -C $@ - endif clean: |