From: Andre Noll <maan@systemlinux.org>
Date: Mon, 1 Dec 2008 14:02:26 +0000 (+0100)
Subject: Merge commit 'meins/next'
X-Git-Tag: v0.3.4~91^2~1
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=d9e608504d9d0e71380907559546e211c4f0ce55;hp=-c

Merge commit 'meins/next'
---

d9e608504d9d0e71380907559546e211c4f0ce55
diff --combined Makefile.in
index 2f903d0c,8ac8b65b..9e60b0df
--- a/Makefile.in
+++ b/Makefile.in
@@@ -12,7 -12,7 +12,7 @@@ build_date := $(shell date
  uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
  uname_rs := $(shell uname -rs)
  cc_version := $(shell $(CC) --version | head -n 1)
 -codename := axiomatic perspectivity
 +codename := elliptic inheritance
  
  DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
  DEBUG_CPPFLAGS += -Wredundant-decls
@@@ -161,15 -161,15 +161,15 @@@ ortp_recv.o: ortp_recv.
  ortp_send.o: ortp_send.c
  	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ortp_cppflags@ $<
  
- oggdec.o: oggdec.c
+ oggdec_filter.o: oggdec_filter.c
  	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @oggvorbis_cppflags@ $<
  ogg_afh.o: ogg_afh.c
  	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @oggvorbis_cppflags@ $<
  
- mp3dec.o: mp3dec.c
+ mp3dec_filter.o: mp3dec_filter.c
  	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @mad_cppflags@ $<
  
- aacdec.o: aacdec.c
+ aacdec_filter.o: aacdec_filter.c
  	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
  
  aac_common.o: aac_common.c