1 diff -Nur avifile0.7-0.7.7.orig/plugins/libac3pass/Makefile.am avifile0.7-0.7.7/plugins/libac3pass/Makefile.am
2 --- avifile0.7-0.7.7.orig/plugins/libac3pass/Makefile.am Fri Apr 26 13:12:13 2002
3 +++ avifile0.7-0.7.7/plugins/libac3pass/Makefile.am Wed Jun 12 14:12:56 2002
6 ac3pass_la_SOURCES = ac3-iec958.c libac3pass.cpp
7 ac3pass_la_LDFLAGS = -module -avoid-version -no-undefined
8 +ac3pass_la_LIBADD = ../../lib/libaviplay.la -lstdc++
9 #-release $(LT_RELEASE)
11 EXTRA_DIST = Makefile.emu README.ac3pass
12 diff -Nur avifile0.7-0.7.7.orig/plugins/libaudiodec/Makefile.am avifile0.7-0.7.7/plugins/libaudiodec/Makefile.am
13 --- avifile0.7-0.7.7.orig/plugins/libaudiodec/Makefile.am Mon Apr 29 18:17:42 2002
14 +++ avifile0.7-0.7.7/plugins/libaudiodec/Makefile.am Wed Jun 12 14:09:28 2002
16 gsm61dec.cpp pcm.cpp aulaw.cpp xa_gsm.c \
19 -audiodec_la_LIBADD = $(LIB_A52)
20 +audiodec_la_LIBADD = $(LIB_A52) ../../lib/libaviplay.la -lstdc++
22 noinst_HEADERS = adpcm.h adpcm_impl.h gsm61dec.h pcm.h xa_gsm.h \
23 xa_gsm_state.h aulaw.h fillplugins.h
24 diff -Nur avifile0.7-0.7.7.orig/plugins/libdivx4/Makefile.am avifile0.7-0.7.7/plugins/libdivx4/Makefile.am
25 --- avifile0.7-0.7.7.orig/plugins/libdivx4/Makefile.am Sat Apr 27 21:09:04 2002
26 +++ avifile0.7-0.7.7/plugins/libdivx4/Makefile.am Wed Jun 12 14:08:27 2002
28 pkglib_LTLIBRARIES = divx4.la
30 divx4_la_SOURCES = divx4.cpp
31 -divx4_la_LIBADD = $(DIVX4_LIBS)
32 +divx4_la_LIBADD = $(DIVX4_LIBS) ../../lib/libaviplay.la -lstdc++
33 divx4_la_LDFLAGS = -module -avoid-version
35 AM_CPPFLAGS = -DLINUX $(DIVX4_CFLAGS)
36 diff -Nur avifile0.7-0.7.7.orig/plugins/libffmpeg/Makefile.am avifile0.7-0.7.7/plugins/libffmpeg/Makefile.am
37 --- avifile0.7-0.7.7.orig/plugins/libffmpeg/Makefile.am Wed May 22 20:09:14 2002
38 +++ avifile0.7-0.7.7/plugins/libffmpeg/Makefile.am Wed Jun 12 14:14:11 2002
40 noinst_HEADERS = FFAudioDecoder.h FFVideoDecoder.h FFVideoEncoder.h fillplugins.h
41 ffmpeg_la_SOURCES = libffmpeg.cpp FFAudioDecoder.cpp FFVideoDecoder.cpp FFVideoEncoder.cpp
43 -ffmpeg_la_LIBADD = ../../ffmpeg/libavcodec/libavcodec.la
44 +ffmpeg_la_LIBADD = ../../ffmpeg/libavcodec/libavcodec.la ../../lib/libaviplay.la -lstdc++
45 #ffmpeg_la_LIBADD = ../../ffmpeg/libavcodec/libavcodec.a
46 ffmpeg_la_LDFLAGS = -module -avoid-version
48 diff -Nur avifile0.7-0.7.7.orig/plugins/libmad/Makefile.am avifile0.7-0.7.7/plugins/libmad/Makefile.am
49 --- avifile0.7-0.7.7.orig/plugins/libmad/Makefile.am Fri Apr 19 20:59:32 2002
50 +++ avifile0.7-0.7.7/plugins/libmad/Makefile.am Wed Jun 12 14:13:06 2002
52 pkglib_LTLIBRARIES = mad_audiodec.la
53 noinst_HEADERS = fillplugins.h
54 mad_audiodec_la_SOURCES = libmad.cpp
55 -mad_audiodec_la_LIBADD = $(CUSTOMLDADD)
56 +mad_audiodec_la_LIBADD = $(CUSTOMLDADD) ../../lib/libaviplay.la -lstdc++
57 mad_audiodec_la_LDFLAGS = -module -avoid-version
59 AM_CPPFLAGS = $(CUSTOMFLAGS)
60 diff -Nur avifile0.7-0.7.7.orig/plugins/libmp3lame_audioenc/Makefile.am avifile0.7-0.7.7/plugins/libmp3lame_audioenc/Makefile.am
61 --- avifile0.7-0.7.7.orig/plugins/libmp3lame_audioenc/Makefile.am Fri Apr 19 21:01:14 2002
62 +++ avifile0.7-0.7.7/plugins/libmp3lame_audioenc/Makefile.am Wed Jun 12 14:09:56 2002
64 pkglib_LTLIBRARIES = mp3lame_audioenc.la
65 noinst_HEADERS = mp3encoder.h fillplugins.h
66 mp3lame_audioenc_la_SOURCES = audioencoder.cpp mp3encoder.cpp
67 -mp3lame_audioenc_la_LIBADD = lame3.70/libmp3lame.la
68 +mp3lame_audioenc_la_LIBADD = lame3.70/libmp3lame.la ../../lib/libaviplay.la -lstdc++
69 mp3lame_audioenc_la_LDFLAGS = -module -avoid-version
70 MAINTAINERCLEANFILES = Makefile.in
71 diff -Nur avifile0.7-0.7.7.orig/plugins/libmp3lamebin_audioenc/Makefile.am avifile0.7-0.7.7/plugins/libmp3lamebin_audioenc/Makefile.am
72 --- avifile0.7-0.7.7.orig/plugins/libmp3lamebin_audioenc/Makefile.am Fri Apr 26 11:41:06 2002
73 +++ avifile0.7-0.7.7/plugins/libmp3lamebin_audioenc/Makefile.am Wed Jun 12 14:15:36 2002
75 pkglib_LTLIBRARIES = mp3lamebin_audioenc.la
76 noinst_HEADERS = fillplugins.h lame.h
77 mp3lamebin_audioenc_la_SOURCES = lameencoder.cpp
78 -mp3lamebin_audioenc_la_LIBADD = -lm
79 +mp3lamebin_audioenc_la_LIBADD = -lm ../../lib/libaviplay.la -lstdc++
80 mp3lamebin_audioenc_la_LDFLAGS = -module -avoid-version
81 MAINTAINERCLEANFILES = Makefile.in
83 diff -Nur avifile0.7-0.7.7.orig/plugins/libmpeg_audiodec/Makefile.am avifile0.7-0.7.7/plugins/libmpeg_audiodec/Makefile.am
84 --- avifile0.7-0.7.7.orig/plugins/libmpeg_audiodec/Makefile.am Fri Apr 19 21:04:11 2002
85 +++ avifile0.7-0.7.7/plugins/libmpeg_audiodec/Makefile.am Wed Jun 12 14:14:29 2002
87 huffmantable.cpp mpeglayer1.cpp mpeglayer2.cpp mpeglayer3.cpp \
88 mpegtable.cpp mpegtoraw.cpp
89 mpeg_audiodec_la_LDFLAGS = -module -avoid-version
90 +mpeg_audiodec_la_LIBADD = ../../lib/libaviplay.la -lstdc++
92 noinst_HEADERS = mpegsound.h mpegsound_locals.h fillplugins.h
95 OPTFLG = -O2 -ffast-math -fomit-frame-pointer -funroll-loops
96 #-D__NO_STRING_INLINES -DDEBUG
98 -AM_CXXFLAGS = $(OPTFLG)
99 +AM_CXXFLAGS = @CXXFLAGS@
100 MAINTAINERCLEANFILES = Makefile.in
101 diff -Nur avifile0.7-0.7.7.orig/plugins/libvorbis/Makefile.am avifile0.7-0.7.7/plugins/libvorbis/Makefile.am
102 --- avifile0.7-0.7.7.orig/plugins/libvorbis/Makefile.am Fri Apr 19 21:04:26 2002
103 +++ avifile0.7-0.7.7/plugins/libvorbis/Makefile.am Wed Jun 12 14:10:23 2002
105 pkglib_LTLIBRARIES = vorbis_audio.la
106 noinst_HEADERS = fillplugins.h
107 vorbis_audio_la_SOURCES = libvorbis.cpp
108 -vorbis_audio_la_LIBADD = -lvorbisfile -lvorbis
109 +vorbis_audio_la_LIBADD = -lvorbisfile -lvorbis ../../lib/libaviplay.la -lstdc++
110 vorbis_audio_la_LDFLAGS = -module -avoid-version
111 MAINTAINERCLEANFILES = Makefile.in
112 diff -Nur avifile0.7-0.7.7.orig/plugins/libwin32/Makefile.am avifile0.7-0.7.7/plugins/libwin32/Makefile.am
113 --- avifile0.7-0.7.7.orig/plugins/libwin32/Makefile.am Tue Apr 23 15:43:35 2002
114 +++ avifile0.7-0.7.7/plugins/libwin32/Makefile.am Wed Jun 12 14:06:15 2002
117 audiodec/libaudiodec.la \
118 loader/libloader.la \
119 - videocodec/libvideocodec.la
120 + videocodec/libvideocodec.la ../../lib/libaviplay.la -lstdc++
121 win32_la_LDFLAGS = -module -avoid-version
124 diff -Nur avifile0.7-0.7.7.orig/plugins/libxvid/Makefile.am avifile0.7-0.7.7/plugins/libxvid/Makefile.am
125 --- avifile0.7-0.7.7.orig/plugins/libxvid/Makefile.am Mon Apr 29 18:17:42 2002
126 +++ avifile0.7-0.7.7/plugins/libxvid/Makefile.am Wed Jun 12 14:13:36 2002
128 pkglib_LTLIBRARIES = xvid.la
130 xvid_la_SOURCES = xvid.cpp
131 -xvid_la_LIBADD = $(XVID_LIBS)
132 +xvid_la_LIBADD = $(XVID_LIBS) ../../lib/libaviplay.la -lstdc++
133 xvid_la_LDFLAGS = -module -avoid-version
135 AM_CPPFLAGS = $(XVID_CFLAGS)