]>
Commit | Line | Data |
---|---|---|
906111ee AM |
1 | diff -urN avifile-0.6.0.org/Makefile.am avifile-0.6.0/Makefile.am |
2 | --- avifile-0.6.0.org/Makefile.am Fri Feb 23 14:42:33 2001 | |
3 | +++ avifile-0.6.0/Makefile.am Fri Feb 23 16:36:30 2001 | |
4 | @@ -1,8 +1,8 @@ | |
5 | BASE_SUBDIRS = | |
6 | if AM_USE_QT | |
7 | -EXTRA_SUBDIRS = include plugins lib player samples bin doc | |
8 | +EXTRA_SUBDIRS = include lib plugins player samples bin doc | |
9 | else | |
10 | -EXTRA_SUBDIRS = include plugins lib samples bin doc | |
11 | +EXTRA_SUBDIRS = include lib plugins samples bin doc | |
12 | endif | |
13 | SUBDIRS=$(BASE_SUBDIRS) $(EXTRA_SUBDIRS) | |
14 | ||
15 | diff -urN avifile-0.6.0.org/plugins/libaudiodec/Makefile.am avifile-0.6.0/plugins/libaudiodec/Makefile.am | |
16 | --- avifile-0.6.0.org/plugins/libaudiodec/Makefile.am Fri Feb 23 14:42:33 2001 | |
17 | +++ avifile-0.6.0/plugins/libaudiodec/Makefile.am Fri Feb 23 17:06:39 2001 | |
18 | @@ -7,4 +7,4 @@ | |
19 | libaudiodec_la_LDFLAGS=@AC3_LIBS@ @AC3_LDADD@ -module | |
20 | CXXFLAGS=-I../../include @AC3_CFLAGS@ | |
21 | ||
22 | -LIBS= | |
23 | +LIBS=-L../../lib/.libs -laviplay -lstdc++ | |
24 | diff -urN avifile-0.6.0.org/plugins/libmp3lame_audioenc/Makefile.am avifile-0.6.0/plugins/libmp3lame_audioenc/Makefile.am | |
25 | --- avifile-0.6.0.org/plugins/libmp3lame_audioenc/Makefile.am Fri Feb 23 14:42:33 2001 | |
26 | +++ avifile-0.6.0/plugins/libmp3lame_audioenc/Makefile.am Fri Feb 23 17:06:30 2001 | |
27 | @@ -5,4 +5,4 @@ | |
28 | libmp3lame_audioenc_la_LDFLAGS=-module | |
29 | CXXFLAGS=-I../../include | |
30 | ||
31 | -LIBS= | |
32 | +LIBS=-L../../lib/.libs -laviplay -lstdc++ | |
33 | diff -urN avifile-0.6.0.org/plugins/libmpeg_audiodec/Makefile.am avifile-0.6.0/plugins/libmpeg_audiodec/Makefile.am | |
34 | --- avifile-0.6.0.org/plugins/libmpeg_audiodec/Makefile.am Fri Feb 23 14:42:33 2001 | |
35 | +++ avifile-0.6.0/plugins/libmpeg_audiodec/Makefile.am Fri Feb 23 17:06:23 2001 | |
36 | @@ -6,4 +6,4 @@ | |
37 | noinst_HEADERS=mpegsound.h mpegsound_locals.h fillplugins.h | |
38 | CXXFLAGS=-I../../include -fno-exceptions | |
39 | ||
40 | -LIBS= | |
41 | +LIBS=-L../../lib/.libs -laviplay -lstdc++ | |
42 | diff -urN avifile-0.6.0.org/plugins/libwin32/Makefile.am avifile-0.6.0/plugins/libwin32/Makefile.am | |
43 | --- avifile-0.6.0.org/plugins/libwin32/Makefile.am Fri Feb 23 14:42:33 2001 | |
44 | +++ avifile-0.6.0/plugins/libwin32/Makefile.am Fri Feb 23 17:06:13 2001 | |
45 | @@ -6,4 +6,4 @@ | |
46 | audiodec/libaudiodec.la DirectShow/libds_filter.la | |
47 | libwin32_la_LDFLAGS = -module -version-info 0:0:0 | |
48 | CXXFLAGS=-I- -I. -I../../include -Iloader -Iloader/wine -Ivideocodec -Iaudiodec -IDirectShow | |
49 | -LIBS= @AVILIBDEPLIB@ | |
50 | +LIBS= -L../../lib/.libs -laviplay @AVILIBDEPLIB@ -lstdc++ |