]>
Commit | Line | Data |
---|---|---|
6f9608c5 | 1 | diff -urN avifile0.6-20011220.orig/configure.in avifile0.6-20011220/configure.in |
2 | --- avifile0.6-20011220.orig/configure.in Sun Jan 20 17:15:14 2002 | |
3 | +++ avifile0.6-20011220/configure.in Sun Jan 20 17:17:59 2002 | |
4 | @@ -83,6 +83,7 @@ | |
5 | dnl automatic updating of libtool configuration files | |
6 | dnl not needed with automake AC_SUBST(LIBTOOL_DEPS) | |
7 | dnl using rather hack for .lo creation AM_PROG_AS | |
d3c2c24a JB |
8 | +AM_PROG_AS |
9 | ||
6f9608c5 | 10 | |
11 | dnl | |
12 | diff -urN avifile0.6-20011220.orig/plugins/libwin32/loader/Makefile.am avifile0.6-20011220/plugins/libwin32/loader/Makefile.am | |
13 | --- avifile0.6-20011220.orig/plugins/libwin32/loader/Makefile.am Sun Jan 20 17:15:14 2002 | |
14 | +++ avifile0.6-20011220/plugins/libwin32/loader/Makefile.am Sun Jan 20 17:19:21 2002 | |
15 | @@ -1,7 +1,7 @@ | |
16 | SUBDIRS = dshow wine | |
d3c2c24a JB |
17 | noinst_LTLIBRARIES = libloader.la |
18 | libloader_la_SOURCES = afl.c driver.c elfdll.c ext.c module.c \ | |
6f9608c5 | 19 | - pe_image.c pe_resource.c registry.c resource.c win32.c ldt_keeper.c |
20 | + pe_image.c pe_resource.c registry.c resource.c win32.c ldt_keeper.c stubs.s | |
d3c2c24a JB |
21 | |
22 | # ldt_keeper.c is not used here !! this is not a bug | |
23 | # it's used in lib/common/ldt_keeper.cpp | |
11f4c5ea JB |
24 | --- avifile0.7-20020412/acinclude.m4.orig Thu Apr 11 20:59:08 2002 |
25 | +++ avifile0.7-20020412/acinclude.m4 Sun Apr 21 15:35:25 2002 | |
26 | @@ -1444,18 +1444,6 @@ | |
27 | ||
28 | ||
29 | ||
30 | -# as.m4 | |
31 | -# Figure out how to run the assembler. | |
32 | - | |
33 | -# AM_PROG_AS | |
34 | -AC_DEFUN([AM_PROG_AS], | |
35 | -[# By default we simply use the C compiler to build assembly code. | |
36 | -AC_REQUIRE([AC_PROG_CC]) | |
37 | -: ${AS='$(CC)'} | |
38 | -# Set ASFLAGS if not already set. | |
39 | -: ${ASFLAGS='$(CFLAGS)'} | |
40 | -AC_SUBST(AS) | |
41 | -AC_SUBST(ASFLAGS)]) | |
42 | ||
43 | ||
44 | ||
45 | --- avifile0.7-20020412/lib/aviplay/Makefile.am.orig Mon Jan 7 23:24:48 2002 | |
46 | +++ avifile0.7-20020412/lib/aviplay/Makefile.am Sun Apr 21 15:37:56 2002 | |
47 | @@ -38,7 +38,8 @@ | |
48 | ||
49 | # just for testing speed | |
50 | check_PROGRAMS = hqtest res | |
51 | -hqtest_SOURCES = AudioFpHQResampler.cpp hqtest.cpp | |
52 | +hqtest_SOURCES = hqtest.cpp | |
53 | +hqtest_LDADD = AudioFpHQResampler.lo | |
54 | hqtest_LDFLAGS = ../libaviplay.la $(SDL_LDADD) | |
55 | ||
56 | res_SOURCES = ResampleSinc.cpp | |
57 | --- avifile0.7-20020412/plugins/libac3pass/Makefile.am.orig Sun Apr 21 15:35:45 2002 | |
58 | +++ avifile0.7-20020412/plugins/libac3pass/Makefile.am Sun Apr 21 15:39:18 2002 | |
59 | @@ -9,7 +9,8 @@ | |
60 | EXTRA_DIST = Makefile.emu README.avifile | |
61 | ||
62 | check_PROGRAMS = play_ac3 | |
63 | -play_ac3_SOURCES = play-ac3.c ac3-iec958.c | |
64 | +play_ac3_SOURCES = play-ac3.c | |
65 | +play_ac3_LDADD = ac3-iec958.lo | |
66 | ||
67 | LINE1=Digital L | |
68 | LINE2=Digital R | |
69 | --- avifile0.7-20020412/plugins/libmad/libmad/configure.in.orig Sat Oct 27 03:28:47 2001 | |
70 | +++ avifile0.7-20020412/plugins/libmad/libmad/configure.in Sun Apr 21 15:41:42 2002 | |
71 | @@ -352,7 +352,5 @@ | |
72 | test -n "$optimize" && CFLAGS="$CFLAGS $optimize" | |
73 | test -n "$profile" && CFLAGS="$CFLAGS $profile" LDFLAGS="$LDFLAGS $profile" | |
74 | ||
75 | -LTLIBOBJS=`echo "$LIBOBJS" | sed -e 's/\.o/.lo/g'` | |
76 | -AC_SUBST(LTLIBOBJS) | |
77 | ||
78 | AC_OUTPUT(Makefile) |