$NetBSD: patch-ax,v 1.2 2005/06/19 10:39:23 hira Exp $

--- export/Makefile.am.orig	2003-12-20 20:49:11.000000000 +0900
+++ export/Makefile.am	2004-08-29 09:25:46.000000000 +0900
@@ -3,7 +3,6 @@
 AUTOMAKE_OPTIONS = 1.3 foreign
 DEFAULT_INCLUDES = -I$(top_srcdir) -I$(srcdir) -I$(top_builddir) -I.
 
-AC3_LIB=-L../libac3 -lac3_tc
 AC3_INC=-I../libac3 -I$(srcdir)/../libac3
 
 INCLUDES = -I./ -I../ -I$(srcdir)/.. -I../src -I$(srcdir)/../src -I../avilib -I$(srcdir)/../avilib @AVIFILE_CFLAGS@ @LAME_CFLAGS@ $(AC3_INC) @QT_CFLAGS@ -Wall @DV_CFLAGS@ -I../libvo -I$(srcdir)/../libvo @MJPEG_CFLAGS@ @LIBFAME_CFLAGS@ @MAGICK_CFLAGS@ @LIBJPEG_CFLAGS@ -I../libioaux -I$(srcdir)/../libioaux @LZO_CFLAGS@ @PVM3_CFLAGS@ -I../pvm3
@@ -106,7 +105,7 @@
 
 export_mp1e_la_SOURCES = export_mp1e.c vid_aux.c
 export_mp1e_la_LDFLAGS =  -module -avoid-version 
-export_mp1e_la_LIBADD  = -L../libvo -lvout -lm
+export_mp1e_la_LIBADD  = -lm
 
 export_ogg_la_SOURCES = export_ogg.c
 export_ogg_la_LDFLAGS =  -module -avoid-version 
@@ -129,7 +128,7 @@
 
 export_fame_la_SOURCES = export_fame.c aud_aux.c
 export_fame_la_LDFLAGS =  -module -avoid-version 
-export_fame_la_LIBADD = @LAME_LIBS@ @LIBFAME_LIBS@ $(AC3_LIB) -lm
+export_fame_la_LIBADD = @LAME_LIBS@ @LIBFAME_LIBS@ -lm
 
 export_lame_la_SOURCES = export_lame.c
 export_lame_la_LDFLAGS =  -module -avoid-version 
@@ -137,55 +136,55 @@
 
 export_af6_la_SOURCES = export_af6.cpp af6_aux.cpp aud_aux.c
 export_af6_la_LDFLAGS =  -module -avoid-version 
-export_af6_la_LIBADD = @LAME_LIBS@ @AVIFILE_LIBS@ -lstdc++ $(AC3_LIB) -lm 
+export_af6_la_LIBADD = @LAME_LIBS@ @AVIFILE_LIBS@ -lstdc++ -lm 
 
 export_divx4_la_SOURCES = export_divx4.c aud_aux.c divx4_vbr.c
 export_divx4_la_LDFLAGS =  -module -avoid-version 
-export_divx4_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -lm
+export_divx4_la_LIBADD = @LAME_LIBS@ -lm
 
 export_divx5_la_SOURCES = export_divx5.c aud_aux.c divx4_vbr.c
 export_divx5_la_LDFLAGS =  -module -avoid-version 
-export_divx5_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -lm
+export_divx5_la_LIBADD = @LAME_LIBS@ -lm
 
 export_divx5raw_la_SOURCES = export_divx5raw.c aud_aux.c divx4_vbr.c
 export_divx5raw_la_LDFLAGS =  -module -avoid-version 
-export_divx5raw_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -lm
+export_divx5raw_la_LIBADD = @LAME_LIBS@ -lm
 
 export_ffmpeg_la_SOURCES = export_ffmpeg.c aud_aux.c ffmpeg_cfg.c vid_aux.c
 export_ffmpeg_la_LDFLAGS =  -module -avoid-version 
-export_ffmpeg_la_LIBADD = @LAME_LIBS@ -L../libvo -lvout $(AC3_LIB) -lm
+export_ffmpeg_la_LIBADD = @LAME_LIBS@ -lm
 
 export_divx4raw_la_SOURCES = export_divx4raw.c aud_aux.c divx4_vbr.c
 export_divx4raw_la_LDFLAGS =  -module -avoid-version 
-export_divx4raw_la_LIBADD =  @LAME_LIBS@ $(AC3_LIB) -lm
+export_divx4raw_la_LIBADD =  @LAME_LIBS@ -lm
 
 export_xvid2_la_SOURCES = export_xvid2.c aud_aux.c xvid_vbr.c
 export_xvid2_la_LDFLAGS =  -module -avoid-version 
-export_xvid2_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -lm
+export_xvid2_la_LIBADD = @LAME_LIBS@ -lm
 
 export_xvid3_la_SOURCES = export_xvid3.c aud_aux.c xvid_vbr.c
 export_xvid3_la_LDFLAGS =  -module -avoid-version 
-export_xvid3_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -lm
+export_xvid3_la_LIBADD = @LAME_LIBS@ -lm
 
 export_xvid4_la_SOURCES = export_xvid4.c aud_aux.c
 export_xvid4_la_LDFLAGS =  -module -avoid-version 
-export_xvid4_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -lm
+export_xvid4_la_LIBADD = @LAME_LIBS@ -lm
 
 export_raw_la_SOURCES = export_raw.c aud_aux.c
 export_raw_la_LDFLAGS =  -module -avoid-version 
-export_raw_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -lm
+export_raw_la_LIBADD = @LAME_LIBS@ -lm
 
 export_lzo_la_SOURCES = export_lzo.c aud_aux.c
 export_lzo_la_LDFLAGS =  -module -avoid-version 
-export_lzo_la_LIBADD = @LAME_LIBS@ @LZO_LIBS@ $(AC3_LIB) -lm
+export_lzo_la_LIBADD = @LAME_LIBS@ @LZO_LIBS@ -lm
 
 export_debugppm_la_SOURCES = export_debugppm.c aud_aux.c
 export_debugppm_la_LDFLAGS =  -module -avoid-version 
-export_debugppm_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -L../libvo -lvout -lm
+export_debugppm_la_LIBADD = @LAME_LIBS@ -lm
 
 export_ppm_la_SOURCES = export_ppm.c aud_aux.c
 export_ppm_la_LDFLAGS =  -module -avoid-version 
-export_ppm_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -L../libvo -lvout -lm
+export_ppm_la_LIBADD = @LAME_LIBS@ -lm
 
 export_mov_la_SOURCES = export_mov.c 
 export_mov_la_LDFLAGS =  -module -avoid-version 
@@ -193,34 +192,34 @@
 
 export_dvraw_la_SOURCES = export_dvraw.c vid_aux.c
 export_dvraw_la_LDFLAGS =  -module -avoid-version 
-export_dvraw_la_LIBADD = -L../libdvenc -ldvenc @DV_LIBS@ -L../libvo -lvout -lm
+export_dvraw_la_LIBADD = -L../libdvenc -ldvenc @DV_LIBS@ -lm
 
 export_dv_la_SOURCES = export_dv.c aud_aux.c vid_aux.c
 export_dv_la_LDFLAGS =  -module -avoid-version 
-export_dv_la_LIBADD = @LAME_LIBS@ -L../libdvenc -ldvenc @DV_LIBS@ $(AC3_LIB)  -L../libvo -lvout -lm 
+export_dv_la_LIBADD = @LAME_LIBS@ -L../libdvenc -ldvenc @DV_LIBS@ -lm 
 
 export_yuv4mpeg_la_SOURCES = export_yuv4mpeg.c aud_aux.c vid_aux.c
 export_yuv4mpeg_la_LDFLAGS =  -module -avoid-version 
-export_yuv4mpeg_la_LIBADD = @LAME_LIBS@ @MJPEG_LIBS@ -L../libvo -lvout $(AC3_LIB) -lm
+export_yuv4mpeg_la_LIBADD = @LAME_LIBS@ @MJPEG_LIBS@ -lm
 
 export_mpeg_la_SOURCES = export_mpeg.c vid_aux.c
 export_mpeg_la_LDFLAGS =  -module -avoid-version 
-export_mpeg_la_LIBADD = -L../bbmpeg -lbbmpeg -L../ffmpeg/libavcodec/ -ltcavcodec -L../libvo -lvout -lm
+export_mpeg_la_LIBADD = -L../bbmpeg -lbbmpeg -L../ffmpeg/libavcodec/ -ltcavcodec -lm
 
 export_pvm_la_SOURCES = export_pvm.c ../pvm3/pvm_interface.c ../pvm3/pvm_parser.c ../pvm3/external_codec.c ../pvm3/vob_pack_unpack.c
 export_pvm_la_LDFLAGS =  -module -avoid-version
 
 export_mjpeg_la_SOURCES = export_mjpeg.c vid_aux.c aud_aux.c 
 export_mjpeg_la_LDFLAGS =  -module -avoid-version 
-export_mjpeg_la_LIBADD = @LIBJPEG_LIBS@ @LAME_LIBS@ -L../libvo -lvout $(AC3_LIB) -lm
+export_mjpeg_la_LIBADD = @LIBJPEG_LIBS@ @LAME_LIBS@ -lm
 
 export_mpeg2enc_la_SOURCES = export_mpeg2enc.c vid_aux.c
 export_mpeg2enc_la_LDFLAGS =  -module -avoid-version 
-export_mpeg2enc_la_LIBADD = @MJPEG_LIBS@ -L../libvo -lvout -lm
+export_mpeg2enc_la_LIBADD = @MJPEG_LIBS@ -lm
 
 export_im_la_SOURCES = export_im.c vid_aux.c
 export_im_la_LDFLAGS =  -module -avoid-version 
-export_im_la_LIBADD = @MAGICK_LIBS@ -L../libvo -lvout -lm 
+export_im_la_LIBADD = @MAGICK_LIBS@ -lm 
 
 pkg_DATA = export_af6.conf xvid2.cfg xvid3.cfg xvid4.cfg