improve port, from Jacob Meuser <jakemsr at jakemsr.com>

maintainer ok
This commit is contained in:
sturm 2004-06-24 19:27:00 +00:00
parent 4341d246db
commit 7ec648a2a8
21 changed files with 288 additions and 1513 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1.1.1 2004/06/18 18:56:42 sturm Exp $
# $OpenBSD: Makefile,v 1.2 2004/06/24 19:27:00 sturm Exp $
NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
@ -49,10 +49,7 @@ CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LIBFAME_CONFIG="no"
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/autotools
CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
--enable-liba52 --with-a52 \
--with-dvdread \
--with-lame \
--with-libjpeg-mods \
--enable-liba52 \
--with-ogg --with-vorbis \
--disable-altivec --disable-sse \
--disable-mjpeg \

View File

@ -1,57 +0,0 @@
$OpenBSD: patch-acinclude_m4,v 1.1.1.1 2004/06/18 18:56:46 sturm Exp $
--- acinclude.m4.orig 2003-12-20 15:22:32.000000000 -0800
+++ acinclude.m4 2004-04-28 09:28:51.000000000 -0700
@@ -460,11 +460,11 @@ if test x$with_vorbis = "x"yes ; then
AC_CHECK_LIB(vorbis, vorbis_info_init,
[VORBIS_CFLAGS="-I$with_vorbis_i -I/usr/local/include"
- VORBIS_LIBS="-L$with_vorbis_l -lvorbis -lm"
+ VORBIS_LIBS="-L$with_vorbis_l -lvorbis -logg -lm"
AC_DEFINE(HAVE_VORBIS)
hav_vorbis=yes
have_vorbis=yes], [have_vorbis=no],
- -L$with_vorbis_l -lvorbis)
+ -L$with_vorbis_l -lvorbis -logg -lm)
fi
AC_CHECK_FILE($with_vorbis_i/vorbis/codec.h, [vorbis_inc=yes])
if test x"$vorbis_inc" != xyes; then
@@ -666,8 +666,8 @@ AC_ARG_WITH(dv-libs,AC_HELP_STRING([--wi
dv_libs="$withval", dv_libs="")
-EXTRA_LIBS="$LIBS $GLIB_LIBS -ldl -lm"
-DV_EXTRA_LIBS="$GLIB_LIBS -ldl -lm"
+EXTRA_LIBS="$LIBS $GLIB_LIBS -lm"
+DV_EXTRA_LIBS="$GLIB_LIBS -lm"
if test x$with_dv = "x"yes ; then
@@ -734,8 +734,8 @@ AC_ARG_WITH(lzo-libs,AC_HELP_STRING([--w
lzo_libs="$withval", lzo_libs="")
-EXTRA_LIBS="$LIBS $GLIB_LIBS -ldl -lm"
-LZO_EXTRA_LIBS="$GLIB_LIBS -ldl -lm"
+EXTRA_LIBS="$LIBS $GLIB_LIBS -lm"
+LZO_EXTRA_LIBS="$GLIB_LIBS -lm"
if test x$with_lzo = "x"yes ; then
@@ -1011,7 +1011,7 @@ AC_ARG_WITH(qt-includes,AC_HELP_STRING([
AC_ARG_WITH(qt-libs,AC_HELP_STRING([--with-qt-libs=PFX],[prefix where local quicktime libs are installed (optional)]),
qt_libs="$withval", qt_libs="")
-EXTRA_LIBS="-lpng -lz -lpthread -lglib -ldl -lm -ldv"
+EXTRA_LIBS="-lpng -lz $pthread_lib -lglib -lm -ldv"
if test x$with_qt = "x"yes ; then
@@ -1065,7 +1065,7 @@ AC_ARG_WITH(openqt-includes,AC_HELP_STRI
AC_ARG_WITH(openqt-libs,AC_HELP_STRING([--with-openqt-libs=PFX],[prefix where local openquicktime libs are installed (optional)]),
openqt_libs="$withval", openqt_libs="")
-EXTRA_LIBS="-lpng -lz -lpthread -lglib -ldl -lm"
+EXTRA_LIBS="-lpng -lz $pthread_lib -lglib -lm"
if test x$with_openqt = "x"yes ; then

View File

@ -1,169 +1,37 @@
$OpenBSD: patch-aclib_Makefile_in,v 1.1.1.1 2004/06/18 18:56:46 sturm Exp $
--- aclib/Makefile.in.orig 2004-04-29 22:30:05.000000000 -0700
+++ aclib/Makefile.in 2004-04-29 22:32:07.000000000 -0700
@@ -196,7 +196,6 @@ LIBLVE_CFLAGS = @LIBLVE_CFLAGS@
LIBLVE_LIBS = @LIBLVE_LIBS@
LIBMPEG3_CFLAGS = @LIBMPEG3_CFLAGS@
LIBMPEG3_LIBS = @LIBMPEG3_LIBS@
-LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIBXML2CONFIG = @LIBXML2CONFIG@
@@ -315,11 +314,11 @@ x_libraries = @x_libraries@
$OpenBSD: patch-aclib_Makefile_in,v 1.2 2004/06/24 19:27:00 sturm Exp $
--- aclib/Makefile.in.orig 2004-01-06 12:39:08.000000000 -0800
+++ aclib/Makefile.in 2004-06-18 20:26:16.000000000 -0700
@@ -69,7 +69,7 @@ CCAS = @CCAS@
CCASFLAGS = @CCASFLAGS@
CCDEPMODE = @CCDEPMODE@
AUTOMAKE_OPTIONS = 1.3 foreign
-noinst_LIBRARIES = libac.a
+noinst_LTLIBRARIES = libac.la
@HAVE_ASM_NASM_TRUE@ASM_SRC = memcpy.s rescale.s average.s swap.s asm_io.s
-libac_a_SOURCES = cputest.c $(ASM_SRC)
+libac_la_SOURCES = cputest.c $(ASM_SRC)
EXTRA_DIST = \
ac.h \
@@ -334,28 +333,27 @@ EXTRA_DIST = \
ASM = @NASM@
-ASMFLAGS = @NASMFLAGS@ -g
+ASMFLAGS = @NASMFLAGS@
subdir = aclib
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
+LTLIBRARIES = $(noinst_LTLIBRARIES)
-libac_a_AR = $(AR) cru
-libac_a_LIBADD =
-am__libac_a_SOURCES_DIST = cputest.c memcpy.s rescale.s average.s swap.s \
- asm_io.s
-@HAVE_ASM_NASM_TRUE@am__objects_1 = memcpy.$(OBJEXT) rescale.$(OBJEXT) \
-@HAVE_ASM_NASM_TRUE@ average.$(OBJEXT) swap.$(OBJEXT) \
-@HAVE_ASM_NASM_TRUE@ asm_io.$(OBJEXT)
-am_libac_a_OBJECTS = cputest.$(OBJEXT) $(am__objects_1)
-libac_a_OBJECTS = $(am_libac_a_OBJECTS)
+libac_la_LDFLAGS =
+libac_la_LIBADD =
+am__libac_la_SOURCES_DIST = cputest.c memcpy.s rescale.s average.s \
+ swap.s asm_io.s
+@HAVE_ASM_NASM_TRUE@am__objects_1 = memcpy.lo rescale.lo average.lo \
+@HAVE_ASM_NASM_TRUE@ swap.lo asm_io.lo
+am_libac_la_OBJECTS = cputest.lo $(am__objects_1)
+libac_la_OBJECTS = $(am_libac_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/autotools/depcomp
am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cputest.Po
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cputest.Plo
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
@@ -366,9 +364,9 @@ LINK = $(LIBTOOL) --mode=link $(CCLD) $(
CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
LTCCASCOMPILE = $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) \
$(CCASFLAGS)
-DIST_SOURCES = $(am__libac_a_SOURCES_DIST)
+DIST_SOURCES = $(am__libac_la_SOURCES_DIST)
DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-SOURCES = $(libac_a_SOURCES)
+SOURCES = $(libac_la_SOURCES)
all: all-am
@@ -380,12 +378,16 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-clean-noinstLIBRARIES:
- -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libac.a: $(libac_a_OBJECTS) $(libac_a_DEPENDENCIES)
- -rm -f libac.a
- $(libac_a_AR) libac.a $(libac_a_OBJECTS) $(libac_a_LIBADD)
- $(RANLIB) libac.a
+clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ test "$$dir" = "$$p" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+libac.la: $(libac_la_OBJECTS) $(libac_la_DEPENDENCIES)
+ $(LINK) $(libac_la_LDFLAGS) $(libac_la_OBJECTS) $(libac_la_LIBADD) $(LIBS)
-CFLAGS = -funroll-loops -ffast-math -DLINUX @CFLAGS@
+CFLAGS = -fPIC -DPIC -funroll-loops -ffast-math -DLINUX @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
@@ -386,6 +386,7 @@ libac.a: $(libac_a_OBJECTS) $(libac_a_DE
-rm -f libac.a
$(libac_a_AR) libac.a $(libac_a_OBJECTS) $(libac_a_LIBADD)
$(RANLIB) libac.a
+ cp libac.a libac_pic.a
mostlyclean-compile:
-rm -f *.$(OBJEXT) core *.core
@@ -393,7 +395,7 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
@@ -429,7 +430,7 @@ distclean-compile:
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cputest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cputest.Plo@am__quote@
.s.o:
- $(CCASCOMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ $(ASM) $(ASMFLAGS) -o $@ $<
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@@ -434,9 +436,6 @@ distclean-compile:
.s.obj:
$(CCASCOMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-.s.lo:
- $(LTCCASCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
mostlyclean-libtool:
-rm -f *.lo
@@ -534,7 +533,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(LIBRARIES)
+all-am: Makefile $(LTLIBRARIES)
installdirs:
install: install-am
@@ -563,7 +562,7 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
mostlyclean-am
distclean: distclean-am
@@ -613,7 +612,7 @@ ps-am:
uninstall-am: uninstall-info-am
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-noinstLIBRARIES ctags distclean \
+ clean-libtool clean-noinstLTLIBRARIES ctags distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am info info-am install \
install-am install-data install-data-am install-exec \
@@ -624,7 +623,21 @@ uninstall-am: uninstall-info-am
@@ -624,7 +625,6 @@ uninstall-am: uninstall-info-am
pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am
-%.o: %.s ; $(ASM) $(ASMFLAGS) -o $@ $<
+.s.lo:
+ $(ASM) $(ASMFLAGS) -o $@ `test -f '$<' || echo '$(scrdir)/'`$<
+ @new_name=".libs/`echo $@ | sed -e 's,\.lo$$,\.o,'`" && \
+ mv $@ $$new_name && \
+ echo "# $@ - a libtool object file" >> $@ && \
+ echo "# Generated by ltmain.sh - GNU libtool 1.5 (1.1220 2003/04/05 19:32:58)" >> $@ && \
+ echo "#" >> $@ && \
+ echo "# Please DO NOT delete this file!" >> $@ && \
+ echo "# It is necessary for linking the library." >> $@ && \
+ echo "" >> $@ && \
+ echo "# Name of the PIC object." >> $@ && \
+ echo "pic_object='$$new_name'" >> $@ && \
+ echo "" >> $@ && \
+ echo "# Name of the non-PIC object." >> $@ && \
+ echo "non_pic_object=none" >> $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-aclocal_m4,v 1.1.1.1 2004/06/18 18:56:43 sturm Exp $
--- aclocal.m4.orig 2004-01-06 21:38:09.000000000 +0100
+++ aclocal.m4 2004-06-17 23:19:26.000000000 +0200
$OpenBSD: patch-aclocal_m4,v 1.2 2004/06/24 19:27:00 sturm Exp $
--- aclocal.m4.orig 2004-01-06 12:38:09.000000000 -0800
+++ aclocal.m4 2004-06-19 00:17:02.000000000 -0700
@@ -473,11 +473,11 @@ if test x$with_vorbis = "x"yes ; then
AC_CHECK_LIB(vorbis, vorbis_info_init,
@ -55,13 +55,67 @@ $OpenBSD: patch-aclocal_m4,v 1.1.1.1 2004/06/18 18:56:43 sturm Exp $
if test x$with_openqt = "x"yes ; then
@@ -7114,7 +7114,8 @@ predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
@@ -5023,7 +5023,10 @@ AC_CACHE_CHECK([if the linker ($LD) is G
[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
- lt_cv_prog_gnu_ld=yes
+ case "$host_os" in
+ openbsd*) lt_cv_prog_gnu_ld=no ;;
+ *) lt_cv_prog_gnu_ld=yes ;;
+ esac
;;
*)
lt_cv_prog_gnu_ld=no
@@ -5196,15 +5199,13 @@ nto-qnx)
lt_cv_deplibs_check_method=unknown
;;
# Dependencies to place after the objects being linked to create a
# shared library.
-postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
+#postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
+postdeps=
-openbsd*)
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
- else
- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
- fi
- ;;
+ openbsd*)
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+ else
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+ fi
+ ;;
# The library search path used internally by the compiler when linking
# a shared library.
osf3* | osf4* | osf5*)
# this will be overridden with pass_all, but let us keep it just in case
@@ -6165,6 +6166,20 @@ case $host_os in
# Workaround some broken pre-1.5 toolchains
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
;;
+ openbsd2*)
+ # C++ shared libraries are fairly broken
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ openbsd*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ fi
+ output_verbose_link_cmd='echo'
+ ;;
osf3*)
case $cc_basename in
KCC)
@@ -8486,6 +8501,7 @@ EOF
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
else

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-autotools_ltmain_sh,v 1.1.1.1 2004/06/18 18:56:51 sturm Exp $
--- autotools/ltmain.sh.orig 2004-06-13 11:08:28.000000000 +0200
+++ autotools/ltmain.sh 2004-06-13 11:10:13.000000000 +0200
$OpenBSD: patch-autotools_ltmain_sh,v 1.2 2004/06/24 19:27:00 sturm Exp $
--- autotools/ltmain.sh.orig 2003-12-20 03:49:10.000000000 -0800
+++ autotools/ltmain.sh 2004-06-18 18:09:03.000000000 -0700
@@ -2206,10 +2206,6 @@ EOF
link_static=no # Whether the deplib will be linked statically
if test -n "$library_names" &&
@ -12,6 +12,15 @@ $OpenBSD: patch-autotools_ltmain_sh,v 1.1.1.1 2004/06/18 18:56:51 sturm Exp $
# This is a shared library
# Warn about portability, can't link against -module's on some systems (darwin)
@@ -3334,7 +3330,7 @@ EOF
if test -n "$a_deplib" ; then
libname=`eval \\$echo \"$libname_spec\"`
for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
- potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+ potential_libs=`ls $i/$libname[.-]* $i/${libname}_pic.a 2>/dev/null`
for potent_lib in $potential_libs; do
potlib="$potent_lib" # see symlink-check above in file_magic test
if eval $echo \"$potent_lib\" 2>/dev/null \
@@ -5696,40 +5692,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit 0

View File

@ -1,4 +1,4 @@
$OpenBSD
$OpenBSD: patch-avilib_avilib_c,v 1.2 2004/06/24 19:27:00 sturm Exp $
--- avilib/avilib.c.orig Fri Apr 23 23:27:42 2004
+++ avilib/avilib.c Mon Apr 26 12:56:03 2004
@@ -25,8 +25,6 @@

View File

@ -1,242 +1,41 @@
$OpenBSD: patch-bbmpeg_Makefile_in,v 1.1.1.1 2004/06/18 18:56:42 sturm Exp $
--- bbmpeg/Makefile.in.orig 2004-04-29 22:31:01.000000000 -0700
+++ bbmpeg/Makefile.in 2004-04-29 22:32:07.000000000 -0700
@@ -194,7 +194,6 @@ LIBLVE_CFLAGS = @LIBLVE_CFLAGS@
LIBLVE_LIBS = @LIBLVE_LIBS@
LIBMPEG3_CFLAGS = @LIBMPEG3_CFLAGS@
LIBMPEG3_LIBS = @LIBMPEG3_LIBS@
-LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIBXML2CONFIG = @LIBXML2CONFIG@
@@ -315,7 +314,7 @@ x_libraries = @x_libraries@
AUTOMAKE_OPTIONS = 1.3 foreign
DEFAULT_INCLUDES = -I$(top_srcdir) -I$(srcdir) -I$(top_builddir) -I.
$OpenBSD: patch-bbmpeg_Makefile_in,v 1.2 2004/06/24 19:27:00 sturm Exp $
--- bbmpeg/Makefile.in.orig 2004-01-06 12:39:09.000000000 -0800
+++ bbmpeg/Makefile.in 2004-06-18 20:24:56.000000000 -0700
@@ -64,10 +64,10 @@ CAN_COMPILE_C_ALTIVEC_FALSE = @CAN_COMPI
CAN_COMPILE_C_ALTIVEC_TRUE = @CAN_COMPILE_C_ALTIVEC_TRUE@
CC = @CC@
CCAS = @CCAS@
-CCASFLAGS = @CCASFLAGS@
+CCASFLAGS = -fPIC -DPIC @CCASFLAGS@
CCDEPMODE = @CCDEPMODE@
-noinst_LIBRARIES = libbbmpeg.a
+noinst_LTLIBRARIES = libbbmpeg.la
@HAVE_ASM_NASM_TRUE@BB_SRC2 = fdct_mmx.s idct_mmx.s quant_mmx.s motion_mmx.s variance_mmx.s
@@ -324,7 +323,7 @@ noinst_LIBRARIES = libbbmpeg.a
@HAVE_SSE_TRUE@BB_SRC3 = predict_sse.S
-libbbmpeg_a_SOURCES = dovideo.c params.c bits.c puthdr.c putpic.c putmpg.c putvlc.c stats.c quantize.c predict.c ratectl.c idct.c motion.c transfrm.c fdctref.c resize.c $(BB_SRC1) $(BB_SRC2) $(BB_SRC3)
+libbbmpeg_la_SOURCES = dovideo.c params.c bits.c puthdr.c putpic.c putmpg.c putvlc.c stats.c quantize.c predict.c ratectl.c idct.c motion.c transfrm.c fdctref.c resize.c $(BB_SRC1) $(BB_SRC2) $(BB_SRC3)
noinst_HEADERS = mtable.h mplex.h mmx.h main.h imgresample.h gmo_read.h encaudio.h consts.h consts1.h common.h bbencode.h
@@ -369,42 +368,38 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
+LTLIBRARIES = $(noinst_LTLIBRARIES)
-libbbmpeg_a_AR = $(AR) cru
-libbbmpeg_a_LIBADD =
-am__libbbmpeg_a_SOURCES_DIST = dovideo.c params.c bits.c puthdr.c \
+libbbmpeg_la_LDFLAGS =
+libbbmpeg_la_LIBADD =
+am__libbbmpeg_la_SOURCES_DIST = dovideo.c params.c bits.c puthdr.c \
putpic.c putmpg.c putvlc.c stats.c quantize.c predict.c \
ratectl.c idct.c motion.c transfrm.c fdctref.c resize.c \
fdctdata.c idctdata.c quantdata.c predict_mmx.S fdct_mmx.s \
idct_mmx.s quant_mmx.s motion_mmx.s variance_mmx.s \
predict_sse.S
-@HAVE_MMX_TRUE@am__objects_1 = fdctdata.$(OBJEXT) idctdata.$(OBJEXT) \
-@HAVE_MMX_TRUE@ quantdata.$(OBJEXT) predict_mmx.$(OBJEXT)
-@HAVE_ASM_NASM_TRUE@am__objects_2 = fdct_mmx.$(OBJEXT) \
-@HAVE_ASM_NASM_TRUE@ idct_mmx.$(OBJEXT) quant_mmx.$(OBJEXT) \
-@HAVE_ASM_NASM_TRUE@ motion_mmx.$(OBJEXT) variance_mmx.$(OBJEXT)
-@HAVE_SSE_TRUE@am__objects_3 = predict_sse.$(OBJEXT)
-am_libbbmpeg_a_OBJECTS = dovideo.$(OBJEXT) params.$(OBJEXT) \
- bits.$(OBJEXT) puthdr.$(OBJEXT) putpic.$(OBJEXT) \
- putmpg.$(OBJEXT) putvlc.$(OBJEXT) stats.$(OBJEXT) \
- quantize.$(OBJEXT) predict.$(OBJEXT) ratectl.$(OBJEXT) \
- idct.$(OBJEXT) motion.$(OBJEXT) transfrm.$(OBJEXT) \
- fdctref.$(OBJEXT) resize.$(OBJEXT) $(am__objects_1) \
- $(am__objects_2) $(am__objects_3)
-libbbmpeg_a_OBJECTS = $(am_libbbmpeg_a_OBJECTS)
+@HAVE_MMX_TRUE@am__objects_1 = fdctdata.lo idctdata.lo quantdata.lo \
+@HAVE_MMX_TRUE@ predict_mmx.lo
+@HAVE_ASM_NASM_TRUE@am__objects_2 = fdct_mmx.lo idct_mmx.lo quant_mmx.lo \
+@HAVE_ASM_NASM_TRUE@ motion_mmx.lo variance_mmx.lo
+@HAVE_SSE_TRUE@am__objects_3 = predict_sse.lo
+am_libbbmpeg_la_OBJECTS = dovideo.lo params.lo bits.lo puthdr.lo \
+ putpic.lo putmpg.lo putvlc.lo stats.lo quantize.lo predict.lo \
+ ratectl.lo idct.lo motion.lo transfrm.lo fdctref.lo resize.lo \
+ $(am__objects_1) $(am__objects_2) $(am__objects_3)
+libbbmpeg_la_OBJECTS = $(am_libbbmpeg_la_OBJECTS)
depcomp = $(SHELL) $(top_srcdir)/autotools/depcomp
am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bits.Po ./$(DEPDIR)/dovideo.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/fdctdata.Po ./$(DEPDIR)/fdctref.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/idct.Po ./$(DEPDIR)/idctdata.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/motion.Po ./$(DEPDIR)/params.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/predict.Po ./$(DEPDIR)/puthdr.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/putmpg.Po ./$(DEPDIR)/putpic.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/putvlc.Po ./$(DEPDIR)/quantdata.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/quantize.Po ./$(DEPDIR)/ratectl.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/resize.Po ./$(DEPDIR)/stats.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/transfrm.Po
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bits.Plo ./$(DEPDIR)/dovideo.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/fdctdata.Plo ./$(DEPDIR)/fdctref.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/idct.Plo ./$(DEPDIR)/idctdata.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/motion.Plo ./$(DEPDIR)/params.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/predict.Plo ./$(DEPDIR)/puthdr.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/putmpg.Plo ./$(DEPDIR)/putpic.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/putvlc.Plo ./$(DEPDIR)/quantdata.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/quantize.Plo ./$(DEPDIR)/ratectl.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/resize.Plo ./$(DEPDIR)/stats.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/transfrm.Plo
CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
LTCCASCOMPILE = $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) \
$(CCASFLAGS)
@@ -415,7 +410,7 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(
CCLD = $(CC)
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(am__libbbmpeg_a_SOURCES_DIST)
+DIST_SOURCES = $(am__libbbmpeg_la_SOURCES_DIST)
HEADERS = $(noinst_HEADERS)
@@ -426,7 +421,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
check-recursive installcheck-recursive
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in Makefile.am
DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(libbbmpeg_a_SOURCES)
+SOURCES = $(libbbmpeg_la_SOURCES)
all: all-recursive
@@ -438,12 +433,16 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-clean-noinstLIBRARIES:
- -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libbbmpeg.a: $(libbbmpeg_a_OBJECTS) $(libbbmpeg_a_DEPENDENCIES)
- -rm -f libbbmpeg.a
- $(libbbmpeg_a_AR) libbbmpeg.a $(libbbmpeg_a_OBJECTS) $(libbbmpeg_a_LIBADD)
- $(RANLIB) libbbmpeg.a
+clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ test "$$dir" = "$$p" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+libbbmpeg.la: $(libbbmpeg_la_OBJECTS) $(libbbmpeg_la_DEPENDENCIES)
+ $(LINK) $(libbbmpeg_la_LDFLAGS) $(libbbmpeg_la_OBJECTS) $(libbbmpeg_la_LIBADD) $(LIBS)
-CFLAGS = -funroll-loops -ffast-math @CFLAGS@ $(MMX)
+CFLAGS = -fPIC -DPIC -funroll-loops -ffast-math @CFLAGS@ $(MMX)
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
@@ -444,6 +444,7 @@ libbbmpeg.a: $(libbbmpeg_a_OBJECTS) $(li
-rm -f libbbmpeg.a
$(libbbmpeg_a_AR) libbbmpeg.a $(libbbmpeg_a_OBJECTS) $(libbbmpeg_a_LIBADD)
$(RANLIB) libbbmpeg.a
+ cp libbbmpeg.a libbbmpeg_pic.a
mostlyclean-compile:
-rm -f *.$(OBJEXT) core *.core
@@ -451,25 +450,25 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
@@ -514,7 +515,7 @@ distclean-compile:
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bits.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dovideo.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdctdata.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdctref.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/idct.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/idctdata.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/motion.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/params.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/predict.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/puthdr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/putmpg.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/putpic.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/putvlc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quantdata.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quantize.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ratectl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resize.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stats.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/transfrm.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bits.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dovideo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdctdata.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdctref.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/idct.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/idctdata.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/motion.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/params.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/predict.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/puthdr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/putmpg.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/putpic.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/putvlc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quantdata.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quantize.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ratectl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resize.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stats.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/transfrm.Plo@am__quote@
.s.o:
- $(CCASCOMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ $(ASM) -g $(ASMFLAGS) -o $@ $<
.S.o:
$(CCASCOMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
@@ -519,9 +518,6 @@ distclean-compile:
.s.obj:
$(CCASCOMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-.s.lo:
- $(LTCCASCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
mostlyclean-libtool:
-rm -f *.lo
@@ -702,7 +698,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-recursive
-all-am: Makefile $(LIBRARIES) $(HEADERS)
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
installdirs: installdirs-recursive
installdirs-am:
@@ -732,7 +728,7 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild."
clean: clean-recursive
-clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
mostlyclean-am
distclean: distclean-recursive
@@ -784,7 +780,7 @@ uninstall-am: uninstall-info-am
uninstall-info: uninstall-info-recursive
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
- clean-generic clean-libtool clean-noinstLIBRARIES \
+ clean-generic clean-libtool clean-noinstLTLIBRARIES \
clean-recursive ctags ctags-recursive distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-recursive distclean-tags distdir dvi dvi-am \
@@ -802,7 +798,21 @@ uninstall-info: uninstall-info-recursive
@@ -802,7 +803,6 @@ uninstall-info: uninstall-info-recursive
uninstall-info-recursive uninstall-recursive
-%.o: %.s ; $(ASM) -g $(ASMFLAGS) -o $@ $<
+.s.lo:
+ $(ASM) $(ASMFLAGS) -o $@ `test -f '$<' || echo '$(scrdir)/'`$<
+ @new_name=".libs/`echo $@ | sed -e 's,\.lo$$,\.o,'`" && \
+ mv $@ $$new_name && \
+ echo "# $@ - a libtool object file" >> $@ && \
+ echo "# Generated by ltmain.sh - GNU libtool 1.5 (1.1220 2003/04/05 19:32:58)" >> $@ && \
+ echo "#" >> $@ && \
+ echo "# Please DO NOT delete this file!" >> $@ && \
+ echo "# It is necessary for linking the library." >> $@ && \
+ echo "" >> $@ && \
+ echo "# Name of the PIC object." >> $@ && \
+ echo "pic_object='$$new_name'" >> $@ && \
+ echo "" >> $@ && \
+ echo "# Name of the non-PIC object." >> $@ && \
+ echo "non_pic_object=none" >> $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-bbmpeg_tcmplex_Makefile_in,v 1.1.1.1 2004/06/18 18:56:51 sturm Exp $
--- bbmpeg/tcmplex/Makefile.in.orig 2004-06-11 14:55:20.000000000 +0200
+++ bbmpeg/tcmplex/Makefile.in 2004-06-11 15:02:04.000000000 +0200
$OpenBSD: patch-bbmpeg_tcmplex_Makefile_in,v 1.2 2004/06/24 19:27:00 sturm Exp $
--- bbmpeg/tcmplex/Makefile.in.orig 2004-01-06 12:39:09.000000000 -0800
+++ bbmpeg/tcmplex/Makefile.in 2004-06-18 19:18:34.000000000 -0700
@@ -67,7 +67,7 @@ CCAS = @CCAS@
CCASFLAGS = @CCASFLAGS@
CCDEPMODE = @CCDEPMODE@

View File

@ -1,33 +0,0 @@
$OpenBSD: patch-config_h_in,v 1.1.1.1 2004/06/18 18:56:51 sturm Exp $
--- config.h.in.orig 2004-01-06 12:38:37.000000000 -0800
+++ config.h.in 2004-04-27 19:15:44.000000000 -0700
@@ -145,6 +145,9 @@
/* Have libmpeg3 support */
#undef HAVE_LIBMPEG3
+/* Define if the lrint() function is in libm on your system */
+#undef HAVE_LIBM_LRINT
+
/* libxml2 support */
#undef HAVE_LIBXML2
@@ -256,6 +259,9 @@
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
+/* Define to 1 if you have the `strlcat' function. */
+#undef HAVE_STRLCAT
+
/* Define to 1 if you have the `strncasecmp' function. */
#undef HAVE_STRNCASECMP
@@ -369,6 +375,9 @@
/* Define if this is Darwin / MacOSX OS */
#undef SYSTEM_DARWIN
+/* Define if your system is modern BSD */
+#undef SYS_BSD
+
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
#undef TIME_WITH_SYS_TIME

View File

@ -1,12 +1,18 @@
$OpenBSD: patch-configure_in,v 1.1.1.1 2004/06/18 18:56:43 sturm Exp $
--- configure.in.orig 2004-01-06 21:38:03.000000000 +0100
+++ configure.in 2004-06-10 14:18:55.000000000 +0200
@@ -140,14 +140,24 @@ AC_FUNC_VPRINTF
AC_FUNC_STAT
$OpenBSD: patch-configure_in,v 1.2 2004/06/24 19:27:00 sturm Exp $
--- configure.in.orig 2004-01-06 12:38:03.000000000 -0800
+++ configure.in 2004-05-20 20:07:20.000000000 -0700
@@ -64,6 +64,7 @@ case "x${target_cpu}" in
;;
esac
+no_opt_cflags="$CFLAGS"
AM_CONDITIONAL([SYSTEM_DARWIN], test x"$is_osx" = x"true")
@@ -141,13 +142,23 @@ AC_FUNC_STAT
AC_FUNC_STRCOLL
AC_TYPE_SIGNAL
-AC_CHECK_FUNCS([strtol memalign ftruncate gettimeofday memset strerror strncasecmp stat floor atexit getpagesize memmove mkfifo vsscanf strptime])
+AC_CHECK_FUNCS([strtol memalign ftruncate gettimeofday memset strerror strncasecmp stat floor atexit getpagesize memmove mkfifo vsscanf strptime strlcat])
AC_CHECK_FUNCS([strtol memalign ftruncate gettimeofday memset strerror strncasecmp stat floor atexit getpagesize memmove mkfifo vsscanf strptime])
+AC_CHECK_LIB(m, lrint, AC_DEFINE(HAVE_LIBM_LRINT, 1, [Define if the lrint() function is in libm on your system]))
+
+case "$host_os" in
@ -28,95 +34,42 @@ $OpenBSD: patch-configure_in,v 1.1.1.1 2004/06/18 18:56:43 sturm Exp $
pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
pthread_lib="-pthread"
;;
@@ -214,7 +224,6 @@ if test "$enable_mmx_accel" != "no"; the
have_asm_mmx=yes, have_asm_mmx=no)])
if test "x${have_asm_mmx}" != "xno"; then
AC_DEFINE([HAVE_ASM_MMX], 1, [Define if your CPU understands ASM MMX instructions])
- AC_DEFINE([HAVE_MMX], 1, [Define if your CPU understands MMX instructions])
have_asm_mmx=true
AC_MSG_RESULT([yes])
else
@@ -416,16 +425,16 @@ if test x"$GCC" = x"yes"; then
dnl changequote([,])
OPT_CFLAGS=""
if test x${USE_MAINTAINER_MODE} != xno; then
- OPT_CFLAGS="$OPT_CFLAGS -O2 $CFLAGS"
+ OPT_CFLAGS="$OPT_CFLAGS $CFLAGS"
else
- OPT_CFLAGS="$OPT_CFLAGS -O3 $CFLAGS"
+ OPT_CFLAGS="$OPT_CFLAGS $CFLAGS"
fi
- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS])
+ dnl AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS])
dnl -fomit-frame-pointer
if test x${USE_MAINTAINER_MODE} = xno; then
OPT_CFLAGS="-fomit-frame-pointer $CFLAGS"
- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS])
+ dnl AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS])
fi
@@ -446,11 +455,11 @@ dnl
i686-*) OPT_CFLAGS="$CFLAGS -mcpu=pentiumpro";;
k6-*) OPT_CFLAGS="$CFLAGS -mcpu=k6";;
esac ;;
- esac
- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
+ esac ;;
+ dnl AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
sparc-*)
- OPT_CFLAGS="$CFLAGS -mcpu=ultrasparc -mvis"
- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
+ OPT_CFLAGS="$CFLAGS -mcpu=ultrasparc -mvis";;
+ dnl AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
mips-sgi-irix6.*) dnl do we need to be that specific ?
OPT_CFLAGS="$CFLAGS -mabi=64"
AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
@@ -476,7 +485,7 @@ AC_ARG_ENABLE([warnings],
if test x"$enable_warnings" = x"yes" -a x"$GCC" = x"yes"; then
dnl compiler warnings
OPT_CFLAGS="-Wall -Werror $CFLAGS"
- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS])
+ dnl AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS])
@@ -188,7 +199,7 @@ dnl code, not whether the host can
dnl at run time with the exception of the SSE code.
dnl
dnl
-have_asm_mmx=false
+dnl have_asm_mmx=false this is later checked with AC_CACHE_CHECK()
have_asm_sse=false
have_asm_3dnow=false
have_asm_nasm=false
@@ -350,7 +361,7 @@ if test x$have_x86cpu = xtrue ; then
AC_MSG_CHECKING(for CMOV support)
if test "$enable_cmov_extension" != "no" ; then
case "$host" in
- *-*-freebsd*)
+ *-*-freebsd*|*-*-openbsd*)
cpu_features=`grep -l CMOV /var/run/dmesg.boot`
if test X"$cpu_features" = X"/var/run/dmesg.boot" ; then
have_cmov=true
@@ -479,6 +490,9 @@ if test x"$enable_warnings" = x"yes" -a
AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS])
fi
+
+CFLAGS="$no_opt_cflags"
+
AC_SUBST(CFLAGS)
@@ -486,12 +495,12 @@ AC_SUBST(LTLIBOBJS)
OPT_CFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 $CFLAGS"
-AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS])
-AC_SUBST(CFLAGS)
+dnl AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS])
+dnl AC_SUBST(CFLAGS)
OPT_CXXFLAGS="$CXXFLAGS -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
-AC_TRY_CXXFLAGS([$OPT_CXXFLAGS],[CXXFLAGS=$OPT_CXXFLAGS])
-AC_SUBST(CXXFLAGS)
+dnl AC_TRY_CXXFLAGS([$OPT_CXXFLAGS],[CXXFLAGS=$OPT_CXXFLAGS])
+dnl AC_SUBST(CXXFLAGS)
LTLIBOBJS=`echo "$AC_LIBOBJ" | sed 's,.o ,.lo ,g;s,.o$,.lo,'`
@@ -938,13 +952,17 @@ AM_CONDITIONAL(HAVE_GTK, test x"$have_gt
dnl
dnl fast integers
@@ -939,12 +948,28 @@ dnl
dnl LIBFAME support
dnl
+# Check whether --with-libfame or --without-libfame was given.
+if test "${with_libfame+set}" = set; then
+ withval="$with_libfame"
+ case "${withval}" in
+ yes) ;;
+ no) ;;
+ *) { { echo "$as_me:$LINENO: error: bad value ${withval} for --with-libfame" >&5
+echo "$as_me: error: bad value ${withval} for --with-libfame" >&2;}
+ { (exit 1); exit 1; }; } ;;
+esac
+else
+ with_libfame=yes
+fi;
+
-
+AC_ARG_WITH(libfame,
+ AC_HELP_STRING([--with-libfame][use libfame (default is yes)]),
+ [], with_libfame=yes)
have_libfame=no
+if test x$with_libfame = "x"yes ; then
AM_PATH_LIBFAME(,

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-export_Makefile_in,v 1.1.1.1 2004/06/18 18:56:51 sturm Exp $
--- export/Makefile.in.orig 2004-06-14 02:25:57.000000000 +0200
+++ export/Makefile.in 2004-06-14 04:37:53.000000000 +0200
$OpenBSD: patch-export_Makefile_in,v 1.2 2004/06/24 19:27:00 sturm Exp $
--- export/Makefile.in.orig 2004-01-06 12:39:10.000000000 -0800
+++ export/Makefile.in 2004-06-18 18:28:36.000000000 -0700
@@ -323,7 +323,7 @@ INCLUDES = -I./ -I../ -I$(srcdir)/.. -I.
pkgdir = @MOD_PATH@

View File

@ -1,447 +1,29 @@
$OpenBSD: patch-ffmpeg_libavcodec_Makefile_in,v 1.1.1.1 2004/06/18 18:56:51 sturm Exp $
--- ffmpeg/libavcodec/Makefile.in.orig 2004-04-29 22:31:26.000000000 -0700
+++ ffmpeg/libavcodec/Makefile.in 2004-04-29 22:32:09.000000000 -0700
@@ -193,7 +193,6 @@ LIBLVE_CFLAGS = @LIBLVE_CFLAGS@
LIBLVE_LIBS = @LIBLVE_LIBS@
LIBMPEG3_CFLAGS = @LIBMPEG3_CFLAGS@
LIBMPEG3_LIBS = @LIBMPEG3_LIBS@
-LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIBXML2CONFIG = @LIBXML2CONFIG@
@@ -335,9 +334,9 @@ INCLUDES = -I../../
$OpenBSD: patch-ffmpeg_libavcodec_Makefile_in,v 1.2 2004/06/24 19:27:00 sturm Exp $
--- ffmpeg/libavcodec/Makefile.in.orig 2004-01-06 12:39:11.000000000 -0800
+++ ffmpeg/libavcodec/Makefile.in 2004-06-18 19:38:11.000000000 -0700
@@ -66,7 +66,7 @@ CC = @CC@
CCAS = @CCAS@
CCASFLAGS = @CCASFLAGS@
CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
+CFLAGS = -fPIC -DPIC @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
@@ -333,7 +333,7 @@ INCLUDES = -I../../
@CAN_COMPILE_C_ALTIVEC_TRUE@@SYSTEM_DARWIN_FALSE@ALTIVEC = -maltivec -mabi=altivec
@CAN_COMPILE_C_ALTIVEC_TRUE@@SYSTEM_DARWIN_TRUE@ALTIVEC = -faltivec
AM_CFLAGS = -O2 -g -Wall -ffast-math $(ALTIVEC) $(X86) $(MMX) -DHAVE_AV_CONFIG_H -D_GNU_SOURCE --include=$(top_srcdir)/ffmpeg/av_config.h
-AM_CFLAGS = -O2 -g -Wall -ffast-math $(ALTIVEC) $(X86) $(MMX) -DHAVE_AV_CONFIG_H -D_GNU_SOURCE --include=$(top_srcdir)/ffmpeg/av_config.h
+AM_CFLAGS = -O2 -Wall -ffast-math $(ALTIVEC) $(X86) $(MMX) -DHAVE_AV_CONFIG_H -D_GNU_SOURCE --include=$(top_srcdir)/ffmpeg/av_config.h
-noinst_LIBRARIES = libtcavcodec.a
+noinst_LTLIBRARIES = libtcavcodec.la
noinst_LIBRARIES = libtcavcodec.a
-libtcavcodec_a_SOURCES = \
+libtcavcodec_la_SOURCES = \
common.c utils.c mem.c allcodecs.c \
mpegvideo.c jrevdct.c jfdctfst.c jfdctint.c \
mpegaudio.c ac3enc.c mjpeg.c resample.c dsputil.c \
@@ -402,11 +401,11 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
+LTLIBRARIES = $(noinst_LTLIBRARIES)
-libtcavcodec_a_AR = $(AR) cru
-libtcavcodec_a_LIBADD =
-am__libtcavcodec_a_SOURCES_DIST = common.c utils.c mem.c allcodecs.c \
+libtcavcodec_la_LDFLAGS =
+libtcavcodec_la_LIBADD =
+am__libtcavcodec_la_SOURCES_DIST = common.c utils.c mem.c allcodecs.c \
mpegvideo.c jrevdct.c jfdctfst.c jfdctint.c mpegaudio.c \
ac3enc.c mjpeg.c resample.c dsputil.c motion_est.c imgconvert.c \
imgresample.c mpeg12.c mpegaudiodec.c pcm.c simple_idct.c \
@@ -423,92 +422,81 @@ am__libtcavcodec_a_SOURCES_DIST = common
ppc/mpegvideo_ppc.c ppc/dsputil_altivec.c \
ppc/mpegvideo_altivec.c ppc/idct_altivec.c ppc/fft_altivec.c \
ppc/gmc_altivec.c ppc/fdct_altivec.c
-@HAVE_MMX_TRUE@am__objects_1 = fdct_mmx.$(OBJEXT) cputest.$(OBJEXT) \
-@HAVE_MMX_TRUE@ dsputil_mmx.$(OBJEXT) mpegvideo_mmx.$(OBJEXT) \
-@HAVE_MMX_TRUE@ idct_mmx.$(OBJEXT) motion_est_mmx.$(OBJEXT) \
-@HAVE_MMX_TRUE@ simple_idct_mmx.$(OBJEXT) fft_sse.$(OBJEXT)
-@ARCH_PPC_TRUE@am__objects_2 = dsputil_ppc.$(OBJEXT) \
-@ARCH_PPC_TRUE@ mpegvideo_ppc.$(OBJEXT)
-@CAN_COMPILE_C_ALTIVEC_TRUE@am__objects_3 = dsputil_altivec.$(OBJEXT) \
-@CAN_COMPILE_C_ALTIVEC_TRUE@ mpegvideo_altivec.$(OBJEXT) \
-@CAN_COMPILE_C_ALTIVEC_TRUE@ idct_altivec.$(OBJEXT) \
-@CAN_COMPILE_C_ALTIVEC_TRUE@ fft_altivec.$(OBJEXT) \
-@CAN_COMPILE_C_ALTIVEC_TRUE@ gmc_altivec.$(OBJEXT) \
-@CAN_COMPILE_C_ALTIVEC_TRUE@ fdct_altivec.$(OBJEXT)
-am_libtcavcodec_a_OBJECTS = common.$(OBJEXT) utils.$(OBJEXT) \
- mem.$(OBJEXT) allcodecs.$(OBJEXT) mpegvideo.$(OBJEXT) \
- jrevdct.$(OBJEXT) jfdctfst.$(OBJEXT) jfdctint.$(OBJEXT) \
- mpegaudio.$(OBJEXT) ac3enc.$(OBJEXT) mjpeg.$(OBJEXT) \
- resample.$(OBJEXT) dsputil.$(OBJEXT) motion_est.$(OBJEXT) \
- imgconvert.$(OBJEXT) imgresample.$(OBJEXT) mpeg12.$(OBJEXT) \
- mpegaudiodec.$(OBJEXT) pcm.$(OBJEXT) simple_idct.$(OBJEXT) \
- ratecontrol.$(OBJEXT) adpcm.$(OBJEXT) eval.$(OBJEXT) \
- dv.$(OBJEXT) error_resilience.$(OBJEXT) fft.$(OBJEXT) \
- mdct.$(OBJEXT) mace.$(OBJEXT) huffyuv.$(OBJEXT) cyuv.$(OBJEXT) \
- opts.$(OBJEXT) raw.$(OBJEXT) h264.$(OBJEXT) golomb.$(OBJEXT) \
- vp3.$(OBJEXT) asv1.$(OBJEXT) 4xm.$(OBJEXT) cabac.$(OBJEXT) \
- ffv1.$(OBJEXT) ra144.$(OBJEXT) ra288.$(OBJEXT) vcr1.$(OBJEXT) \
- cljr.$(OBJEXT) roqvideo.$(OBJEXT) dpcm.$(OBJEXT) \
- interplayvideo.$(OBJEXT) xan.$(OBJEXT) rpza.$(OBJEXT) \
- cinepak.$(OBJEXT) msrle.$(OBJEXT) msvideo1.$(OBJEXT) \
- vqavideo.$(OBJEXT) adx.$(OBJEXT) rational.$(OBJEXT) \
- faandct.$(OBJEXT) 8bps.$(OBJEXT) h263.$(OBJEXT) \
- msmpeg4.$(OBJEXT) h263dec.$(OBJEXT) svq1.$(OBJEXT) \
- rv10.$(OBJEXT) wmadec.$(OBJEXT) indeo3.$(OBJEXT) smc.$(OBJEXT) \
- parser.$(OBJEXT) flicvideo.$(OBJEXT) truemotion1.$(OBJEXT) \
- idcinvideo.$(OBJEXT) $(am__objects_1) $(am__objects_2) \
+@HAVE_MMX_TRUE@am__objects_1 = fdct_mmx.lo cputest.lo dsputil_mmx.lo \
+@HAVE_MMX_TRUE@ mpegvideo_mmx.lo idct_mmx.lo motion_est_mmx.lo \
+@HAVE_MMX_TRUE@ simple_idct_mmx.lo fft_sse.lo
+@ARCH_PPC_TRUE@am__objects_2 = dsputil_ppc.lo mpegvideo_ppc.lo
+@CAN_COMPILE_C_ALTIVEC_TRUE@am__objects_3 = dsputil_altivec.lo \
+@CAN_COMPILE_C_ALTIVEC_TRUE@ mpegvideo_altivec.lo \
+@CAN_COMPILE_C_ALTIVEC_TRUE@ idct_altivec.lo fft_altivec.lo \
+@CAN_COMPILE_C_ALTIVEC_TRUE@ gmc_altivec.lo fdct_altivec.lo
+am_libtcavcodec_la_OBJECTS = common.lo utils.lo mem.lo allcodecs.lo \
+ mpegvideo.lo jrevdct.lo jfdctfst.lo jfdctint.lo mpegaudio.lo \
+ ac3enc.lo mjpeg.lo resample.lo dsputil.lo motion_est.lo \
+ imgconvert.lo imgresample.lo mpeg12.lo mpegaudiodec.lo pcm.lo \
+ simple_idct.lo ratecontrol.lo adpcm.lo eval.lo dv.lo \
+ error_resilience.lo fft.lo mdct.lo mace.lo huffyuv.lo cyuv.lo \
+ opts.lo raw.lo h264.lo golomb.lo vp3.lo asv1.lo 4xm.lo cabac.lo \
+ ffv1.lo ra144.lo ra288.lo vcr1.lo cljr.lo roqvideo.lo dpcm.lo \
+ interplayvideo.lo xan.lo rpza.lo cinepak.lo msrle.lo \
+ msvideo1.lo vqavideo.lo adx.lo rational.lo faandct.lo 8bps.lo \
+ h263.lo msmpeg4.lo h263dec.lo svq1.lo rv10.lo wmadec.lo \
+ indeo3.lo smc.lo parser.lo flicvideo.lo truemotion1.lo \
+ idcinvideo.lo $(am__objects_1) $(am__objects_2) \
$(am__objects_3)
-libtcavcodec_a_OBJECTS = $(am_libtcavcodec_a_OBJECTS)
+libtcavcodec_la_OBJECTS = $(am_libtcavcodec_la_OBJECTS)
depcomp = $(SHELL) $(top_srcdir)/autotools/depcomp
am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/4xm.Po ./$(DEPDIR)/8bps.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/ac3enc.Po ./$(DEPDIR)/adpcm.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/adx.Po ./$(DEPDIR)/allcodecs.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/asv1.Po ./$(DEPDIR)/cabac.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/cinepak.Po ./$(DEPDIR)/cljr.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/common.Po ./$(DEPDIR)/cputest.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/cyuv.Po ./$(DEPDIR)/dpcm.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/dsputil.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/dsputil_altivec.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/dsputil_mmx.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/dsputil_ppc.Po ./$(DEPDIR)/dv.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/error_resilience.Po ./$(DEPDIR)/eval.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/faandct.Po ./$(DEPDIR)/fdct_altivec.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/fdct_mmx.Po ./$(DEPDIR)/fft.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/fft_altivec.Po ./$(DEPDIR)/fft_sse.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/ffv1.Po ./$(DEPDIR)/flicvideo.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/gmc_altivec.Po ./$(DEPDIR)/golomb.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/h263.Po ./$(DEPDIR)/h263dec.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/h264.Po ./$(DEPDIR)/huffyuv.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/idcinvideo.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/idct_altivec.Po ./$(DEPDIR)/idct_mmx.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/imgconvert.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/imgresample.Po ./$(DEPDIR)/indeo3.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/interplayvideo.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/jfdctfst.Po ./$(DEPDIR)/jfdctint.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/jrevdct.Po ./$(DEPDIR)/mace.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/mdct.Po ./$(DEPDIR)/mem.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/mjpeg.Po ./$(DEPDIR)/motion_est.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/motion_est_mmx.Po ./$(DEPDIR)/mpeg12.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/mpegaudio.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/mpegaudiodec.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/mpegvideo.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/mpegvideo_altivec.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/mpegvideo_mmx.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/mpegvideo_ppc.Po ./$(DEPDIR)/msmpeg4.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/msrle.Po ./$(DEPDIR)/msvideo1.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/opts.Po ./$(DEPDIR)/parser.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/pcm.Po ./$(DEPDIR)/ra144.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/ra288.Po ./$(DEPDIR)/ratecontrol.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/rational.Po ./$(DEPDIR)/raw.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/resample.Po ./$(DEPDIR)/roqvideo.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/rpza.Po ./$(DEPDIR)/rv10.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/simple_idct.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/simple_idct_mmx.Po ./$(DEPDIR)/smc.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/svq1.Po ./$(DEPDIR)/truemotion1.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/utils.Po ./$(DEPDIR)/vcr1.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/vp3.Po ./$(DEPDIR)/vqavideo.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/wmadec.Po ./$(DEPDIR)/xan.Po
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/4xm.Plo ./$(DEPDIR)/8bps.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/ac3enc.Plo ./$(DEPDIR)/adpcm.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/adx.Plo ./$(DEPDIR)/allcodecs.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/asv1.Plo ./$(DEPDIR)/cabac.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/cinepak.Plo ./$(DEPDIR)/cljr.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/common.Plo ./$(DEPDIR)/cputest.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/cyuv.Plo ./$(DEPDIR)/dpcm.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/dsputil.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/dsputil_altivec.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/dsputil_mmx.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/dsputil_ppc.Plo ./$(DEPDIR)/dv.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/error_resilience.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/eval.Plo ./$(DEPDIR)/faandct.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/fdct_altivec.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/fdct_mmx.Plo ./$(DEPDIR)/fft.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/fft_altivec.Plo ./$(DEPDIR)/fft_sse.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/ffv1.Plo ./$(DEPDIR)/flicvideo.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/gmc_altivec.Plo ./$(DEPDIR)/golomb.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/h263.Plo ./$(DEPDIR)/h263dec.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/h264.Plo ./$(DEPDIR)/huffyuv.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/idcinvideo.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/idct_altivec.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/idct_mmx.Plo ./$(DEPDIR)/imgconvert.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/imgresample.Plo ./$(DEPDIR)/indeo3.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/interplayvideo.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/jfdctfst.Plo ./$(DEPDIR)/jfdctint.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/jrevdct.Plo ./$(DEPDIR)/mace.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/mdct.Plo ./$(DEPDIR)/mem.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/mjpeg.Plo ./$(DEPDIR)/motion_est.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/motion_est_mmx.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/mpeg12.Plo ./$(DEPDIR)/mpegaudio.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/mpegaudiodec.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/mpegvideo.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/mpegvideo_altivec.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/mpegvideo_mmx.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/mpegvideo_ppc.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/msmpeg4.Plo ./$(DEPDIR)/msrle.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/msvideo1.Plo ./$(DEPDIR)/opts.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/parser.Plo ./$(DEPDIR)/pcm.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/ra144.Plo ./$(DEPDIR)/ra288.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/ratecontrol.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/rational.Plo ./$(DEPDIR)/raw.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/resample.Plo ./$(DEPDIR)/roqvideo.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/rpza.Plo ./$(DEPDIR)/rv10.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/simple_idct.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/simple_idct_mmx.Plo ./$(DEPDIR)/smc.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/svq1.Plo ./$(DEPDIR)/truemotion1.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/utils.Plo ./$(DEPDIR)/vcr1.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/vp3.Plo ./$(DEPDIR)/vqavideo.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/wmadec.Plo ./$(DEPDIR)/xan.Plo
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
@@ -516,7 +504,7 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(
CCLD = $(CC)
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(am__libtcavcodec_a_SOURCES_DIST)
+DIST_SOURCES = $(am__libtcavcodec_la_SOURCES_DIST)
HEADERS = $(noinst_HEADERS)
@@ -527,7 +515,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
check-recursive installcheck-recursive
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in Makefile.am
DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(libtcavcodec_a_SOURCES)
+SOURCES = $(libtcavcodec_la_SOURCES)
all: all-recursive
@@ -539,12 +527,16 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-clean-noinstLIBRARIES:
- -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libtcavcodec.a: $(libtcavcodec_a_OBJECTS) $(libtcavcodec_a_DEPENDENCIES)
- -rm -f libtcavcodec.a
- $(libtcavcodec_a_AR) libtcavcodec.a $(libtcavcodec_a_OBJECTS) $(libtcavcodec_a_LIBADD)
- $(RANLIB) libtcavcodec.a
+clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ test "$$dir" = "$$p" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+libtcavcodec.la: $(libtcavcodec_la_OBJECTS) $(libtcavcodec_la_DEPENDENCIES)
+ $(LINK) $(libtcavcodec_la_LDFLAGS) $(libtcavcodec_la_OBJECTS) $(libtcavcodec_la_LIBADD) $(LIBS)
@@ -545,6 +545,7 @@ libtcavcodec.a: $(libtcavcodec_a_OBJECTS
-rm -f libtcavcodec.a
$(libtcavcodec_a_AR) libtcavcodec.a $(libtcavcodec_a_OBJECTS) $(libtcavcodec_a_LIBADD)
$(RANLIB) libtcavcodec.a
+ cp libtcavcodec.a libtcavcodec_pic.a
mostlyclean-compile:
-rm -f *.$(OBJEXT) core *.core
@@ -552,90 +544,90 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/4xm.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/8bps.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ac3enc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/adpcm.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/adx.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/allcodecs.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asv1.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cabac.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cinepak.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cljr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cputest.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cyuv.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dpcm.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsputil.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsputil_altivec.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsputil_mmx.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsputil_ppc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dv.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error_resilience.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eval.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/faandct.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdct_altivec.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdct_mmx.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fft.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fft_altivec.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fft_sse.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ffv1.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flicvideo.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmc_altivec.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/golomb.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/h263.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/h263dec.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/h264.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/huffyuv.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/idcinvideo.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/idct_altivec.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/idct_mmx.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imgconvert.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imgresample.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indeo3.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interplayvideo.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jfdctfst.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jfdctint.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jrevdct.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mace.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mdct.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mem.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mjpeg.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/motion_est.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/motion_est_mmx.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpeg12.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpegaudio.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpegaudiodec.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpegvideo.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpegvideo_altivec.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpegvideo_mmx.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpegvideo_ppc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msmpeg4.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msrle.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvideo1.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opts.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parser.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcm.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ra144.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ra288.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ratecontrol.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rational.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/raw.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resample.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/roqvideo.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpza.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rv10.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple_idct.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple_idct_mmx.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svq1.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/truemotion1.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcr1.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vp3.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vqavideo.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wmadec.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xan.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/4xm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/8bps.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ac3enc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/adpcm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/adx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/allcodecs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asv1.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cabac.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cinepak.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cljr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cputest.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cyuv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dpcm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsputil.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsputil_altivec.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsputil_mmx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsputil_ppc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error_resilience.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eval.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/faandct.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdct_altivec.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdct_mmx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fft.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fft_altivec.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fft_sse.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ffv1.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flicvideo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmc_altivec.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/golomb.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/h263.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/h263dec.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/h264.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/huffyuv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/idcinvideo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/idct_altivec.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/idct_mmx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imgconvert.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imgresample.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indeo3.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interplayvideo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jfdctfst.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jfdctint.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jrevdct.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mace.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mdct.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mem.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mjpeg.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/motion_est.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/motion_est_mmx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpeg12.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpegaudio.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpegaudiodec.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpegvideo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpegvideo_altivec.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpegvideo_mmx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpegvideo_ppc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msmpeg4.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msrle.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvideo1.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opts.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parser.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ra144.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ra288.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ratecontrol.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rational.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/raw.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resample.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/roqvideo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpza.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rv10.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple_idct.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple_idct_mmx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svq1.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/truemotion1.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcr1.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vp3.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vqavideo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wmadec.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xan.Plo@am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@@ -1378,7 +1370,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-recursive
-all-am: Makefile $(LIBRARIES) $(HEADERS)
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
installdirs: installdirs-recursive
installdirs-am:
@@ -1408,7 +1400,7 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild."
clean: clean-recursive
-clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
mostlyclean-am
distclean: distclean-recursive
@@ -1460,7 +1452,7 @@ uninstall-am: uninstall-info-am
uninstall-info: uninstall-info-recursive
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
- clean-generic clean-libtool clean-noinstLIBRARIES \
+ clean-generic clean-libtool clean-noinstLTLIBRARIES \
clean-recursive ctags ctags-recursive distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-recursive distclean-tags distdir dvi dvi-am \

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-filter_pp_postprocess_c,v 1.1.1.1 2004/06/18 18:56:46 sturm Exp $
--- filter/pp/postprocess.c.orig 2003-11-12 02:42:12.000000000 -0800
+++ filter/pp/postprocess.c 2004-04-27 19:16:19.000000000 -0700
$OpenBSD: patch-filter_pp_postprocess_c,v 1.2 2004/06/24 19:27:00 sturm Exp $
--- filter/pp/postprocess.c.orig 2003-11-12 02:42:34.000000000 -0800
+++ filter/pp/postprocess.c 2004-05-20 19:29:05.000000000 -0700
@@ -72,8 +72,10 @@ try to unroll inner for(x=0 ... loop to
#include <stdio.h>
#include <stdlib.h>
@ -14,3 +14,40 @@ $OpenBSD: patch-filter_pp_postprocess_c,v 1.1.1.1 2004/06/18 18:56:46 sturm Exp
#endif
//#undef HAVE_MMX2
//#define HAVE_3DNOW
@@ -103,14 +105,20 @@ try to unroll inner for(x=0 ... loop to
#define TEMP_STRIDE 8
//#define NUM_BLOCKS_AT_ONCE 16 //not used yet
+#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0)
+# define attribute_used __attribute__((used))
+#else
+# define attribute_used
+#endif
+
#ifdef ARCH_X86
-static uint64_t __attribute__((aligned(8))) w05= 0x0005000500050005LL;
-static uint64_t __attribute__((aligned(8))) w20= 0x0020002000200020LL;
-static uint64_t __attribute__((aligned(8))) b00= 0x0000000000000000LL;
-static uint64_t __attribute__((aligned(8))) b01= 0x0101010101010101LL;
-static uint64_t __attribute__((aligned(8))) b02= 0x0202020202020202LL;
-static uint64_t __attribute__((aligned(8))) b08= 0x0808080808080808LL;
-static uint64_t __attribute__((aligned(8))) b80= 0x8080808080808080LL;
+static uint64_t __attribute__((aligned(8))) attribute_used w05= 0x0005000500050005LL;
+static uint64_t __attribute__((aligned(8))) attribute_used w20= 0x0020002000200020LL;
+static uint64_t __attribute__((aligned(8))) attribute_used b00= 0x0000000000000000LL;
+static uint64_t __attribute__((aligned(8))) attribute_used b01= 0x0101010101010101LL;
+static uint64_t __attribute__((aligned(8))) attribute_used b02= 0x0202020202020202LL;
+static uint64_t __attribute__((aligned(8))) attribute_used b08= 0x0808080808080808LL;
+static uint64_t __attribute__((aligned(8))) attribute_used b80= 0x8080808080808080LL;
#endif
@@ -119,7 +127,7 @@ static uint8_t * const clip_tab= clip_ta
static int verbose= 0;
-static const int deringThreshold= 20;
+static const int attribute_used deringThreshold= 20;
static struct PPFilter filters[]=

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-import_ioaux_c,v 1.1.1.1 2004/06/18 18:56:43 sturm Exp $
$OpenBSD: patch-import_ioaux_c,v 1.2 2004/06/24 19:27:00 sturm Exp $
--- import/ioaux.c.orig 2003-12-20 03:48:54.000000000 -0800
+++ import/ioaux.c 2004-04-28 10:26:58.000000000 -0700
@@ -234,7 +234,7 @@ int probe_path(char *name)
@ -6,7 +6,7 @@ $OpenBSD: patch-import_ioaux_c,v 1.1.1.1 2004/06/18 18:56:43 sturm Exp $
// treat block device as absolute directory path
if(S_ISBLK(fbuf.st_mode)
-#ifdef __APPLE__ // accessing through the raw device (/dev/rdiskX)
+#if defined(__APPLE__) || defined(__OpenBSD__) // accessing through the raw device (/dev/rdiskX)
+#ifdef SYS_BSD // accessing through the raw device (/dev/rdiskX)
|| S_ISCHR(fbuf.st_mode)
#endif
)

View File

@ -1,16 +1,17 @@
$OpenBSD%
$OpenBSD: patch-import_nuv_rtjpeg_aud_plugin_c,v 1.2 2004/06/24 19:27:00 sturm Exp $
--- import/nuv/rtjpeg_aud_plugin.c.orig 2003-04-08 03:49:49.000000000 -0700
+++ import/nuv/rtjpeg_aud_plugin.c 2004-04-28 10:26:58.000000000 -0700
@@ -28,6 +28,8 @@
+++ import/nuv/rtjpeg_aud_plugin.c 2004-05-03 11:34:28.000000000 -0700
@@ -28,6 +28,9 @@
#endif
#endif
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+
+#endif
#ifdef __linux__
#include <features.h>
#endif
@@ -108,7 +110,7 @@ int rtjpeg_aud_open(char *tplorg)
@@ -108,7 +111,7 @@ int rtjpeg_aud_open(char *tplorg)
regions[0].end = -1;
}

View File

@ -1,16 +1,17 @@
$OpenBSD: patch-import_nuv_rtjpeg_vid_plugin_c,v 1.1.1.1 2004/06/18 18:56:43 sturm Exp $
$OpenBSD: patch-import_nuv_rtjpeg_vid_plugin_c,v 1.2 2004/06/24 19:27:00 sturm Exp $
--- import/nuv/rtjpeg_vid_plugin.c.orig 2003-04-08 03:49:49.000000000 -0700
+++ import/nuv/rtjpeg_vid_plugin.c 2004-04-28 10:26:59.000000000 -0700
@@ -28,6 +28,8 @@
+++ import/nuv/rtjpeg_vid_plugin.c 2004-05-03 11:34:28.000000000 -0700
@@ -28,6 +28,9 @@
#endif
#endif
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+
+#endif
#ifdef __linux__
#include <features.h>
#endif
@@ -108,7 +110,7 @@ int rtjpeg_vid_open(char *tplorg)
@@ -108,7 +111,7 @@ int rtjpeg_vid_open(char *tplorg)
regions[0].end = -1;
}

View File

@ -1,174 +1,20 @@
$OpenBSD: patch-libac3_Makefile_in,v 1.1.1.1 2004/06/18 18:56:48 sturm Exp $
--- libac3/Makefile.in.orig 2004-01-06 21:39:16.000000000 +0100
+++ libac3/Makefile.in 2004-06-10 14:29:01.000000000 +0200
$OpenBSD: patch-libac3_Makefile_in,v 1.2 2004/06/24 19:27:00 sturm Exp $
--- libac3/Makefile.in.orig 2004-06-18 17:33:17.000000000 -0700
+++ libac3/Makefile.in 2004-06-18 17:42:47.000000000 -0700
@@ -67,7 +67,7 @@ CCAS = @CCAS@
CCASFLAGS = @CCASFLAGS@
CCDEPMODE = @CCDEPMODE@
-CFLAGS = -O3 -funroll-loops -ffast-math -DLINUX -fPIC -DPIC @CFLAGS@
+CFLAGS = -funroll-loops -ffast-math -DLINUX @CFLAGS@
+CFLAGS = -funroll-loops -ffast-math -DLINUX -fPIC -DPIC @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
@@ -194,7 +194,6 @@ LIBLVE_CFLAGS = @LIBLVE_CFLAGS@
LIBLVE_LIBS = @LIBLVE_LIBS@
LIBMPEG3_CFLAGS = @LIBMPEG3_CFLAGS@
LIBMPEG3_LIBS = @LIBMPEG3_LIBS@
-LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIBXML2CONFIG = @LIBXML2CONFIG@
@@ -315,9 +314,9 @@ x_libraries = @x_libraries@
AUTOMAKE_OPTIONS = 1.3 foreign
DEFAULT_INCLUDES = -I$(top_srcdir) -I$(srcdir) -I$(top_builddir) -I.
-noinst_LIBRARIES = libac3_tc.a
+noinst_LTLIBRARIES = libac3_tc.la
-libac3_tc_a_SOURCES = bitstream.c decode.c imdct.c coeff.c exponent.c stats.c\
+libac3_tc_la_SOURCES = bitstream.c decode.c imdct.c coeff.c exponent.c stats.c\
bit_allocate.c parse.c crc.c debug.c rematrix.c downmix.c dither.c \
sanity_check.c
@@ -330,26 +329,24 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
+LTLIBRARIES = $(noinst_LTLIBRARIES)
-libac3_tc_a_AR = $(AR) cru
-libac3_tc_a_LIBADD =
-am_libac3_tc_a_OBJECTS = bitstream.$(OBJEXT) decode.$(OBJEXT) \
- imdct.$(OBJEXT) coeff.$(OBJEXT) exponent.$(OBJEXT) \
- stats.$(OBJEXT) bit_allocate.$(OBJEXT) parse.$(OBJEXT) \
- crc.$(OBJEXT) debug.$(OBJEXT) rematrix.$(OBJEXT) \
- downmix.$(OBJEXT) dither.$(OBJEXT) sanity_check.$(OBJEXT)
-libac3_tc_a_OBJECTS = $(am_libac3_tc_a_OBJECTS)
+libac3_tc_la_LDFLAGS =
+libac3_tc_la_LIBADD =
+am_libac3_tc_la_OBJECTS = bitstream.lo decode.lo imdct.lo coeff.lo \
+ exponent.lo stats.lo bit_allocate.lo parse.lo crc.lo debug.lo \
+ rematrix.lo downmix.lo dither.lo sanity_check.lo
+libac3_tc_la_OBJECTS = $(am_libac3_tc_la_OBJECTS)
depcomp = $(SHELL) $(top_srcdir)/autotools/depcomp
am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bit_allocate.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/bitstream.Po ./$(DEPDIR)/coeff.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/crc.Po ./$(DEPDIR)/debug.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/decode.Po ./$(DEPDIR)/dither.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/downmix.Po ./$(DEPDIR)/exponent.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/imdct.Po ./$(DEPDIR)/parse.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/rematrix.Po ./$(DEPDIR)/sanity_check.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/stats.Po
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bit_allocate.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/bitstream.Plo ./$(DEPDIR)/coeff.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/crc.Plo ./$(DEPDIR)/debug.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/decode.Plo ./$(DEPDIR)/dither.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/downmix.Plo ./$(DEPDIR)/exponent.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/imdct.Plo ./$(DEPDIR)/parse.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/rematrix.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/sanity_check.Plo ./$(DEPDIR)/stats.Plo
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
@@ -357,12 +354,12 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(
CCLD = $(CC)
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libac3_tc_a_SOURCES)
+DIST_SOURCES = $(libac3_tc_la_SOURCES)
HEADERS = $(noinst_HEADERS)
DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.in COPYING \
Makefile.am
-SOURCES = $(libac3_tc_a_SOURCES)
+SOURCES = $(libac3_tc_la_SOURCES)
all: all-am
@@ -374,12 +371,16 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-clean-noinstLIBRARIES:
- -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libac3_tc.a: $(libac3_tc_a_OBJECTS) $(libac3_tc_a_DEPENDENCIES)
- -rm -f libac3_tc.a
- $(libac3_tc_a_AR) libac3_tc.a $(libac3_tc_a_OBJECTS) $(libac3_tc_a_LIBADD)
- $(RANLIB) libac3_tc.a
+clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ test "$$dir" = "$$p" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+libac3_tc.la: $(libac3_tc_la_OBJECTS) $(libac3_tc_la_DEPENDENCIES)
+ $(LINK) $(libac3_tc_la_LDFLAGS) $(libac3_tc_la_OBJECTS) $(libac3_tc_la_LIBADD) $(LIBS)
@@ -380,6 +380,7 @@ libac3_tc.a: $(libac3_tc_a_OBJECTS) $(li
-rm -f libac3_tc.a
$(libac3_tc_a_AR) libac3_tc.a $(libac3_tc_a_OBJECTS) $(libac3_tc_a_LIBADD)
$(RANLIB) libac3_tc.a
+ cp libac3_tc.a libac3_tc_pic.a
mostlyclean-compile:
-rm -f *.$(OBJEXT) core *.core
@@ -387,20 +388,20 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bit_allocate.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bitstream.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coeff.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debug.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/decode.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dither.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/downmix.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exponent.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imdct.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rematrix.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sanity_check.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stats.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bit_allocate.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bitstream.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coeff.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debug.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/decode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dither.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/downmix.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exponent.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imdct.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rematrix.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sanity_check.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stats.Plo@am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@@ -532,7 +533,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(LIBRARIES) $(HEADERS)
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
installdirs:
install: install-am
@@ -561,7 +562,7 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
mostlyclean-am
distclean: distclean-am
@@ -611,7 +612,7 @@ ps-am:
uninstall-am: uninstall-info-am
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-noinstLIBRARIES ctags distclean \
+ clean-libtool clean-noinstLTLIBRARIES ctags distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am info info-am install \
install-am install-data install-data-am install-exec \

View File

@ -1,165 +1,20 @@
$OpenBSD: patch-libdvenc_Makefile_in,v 1.1.1.1 2004/06/18 18:56:48 sturm Exp $
--- libdvenc/Makefile.in.orig 2004-01-06 21:39:17.000000000 +0100
+++ libdvenc/Makefile.in 2004-06-11 15:06:21.000000000 +0200
$OpenBSD: patch-libdvenc_Makefile_in,v 1.2 2004/06/24 19:27:00 sturm Exp $
--- libdvenc/Makefile.in.orig 2004-06-18 18:44:13.000000000 -0700
+++ libdvenc/Makefile.in 2004-06-18 18:51:56.000000000 -0700
@@ -66,7 +66,7 @@ CC = @CC@
CCAS = @CCAS@
CCASFLAGS = @CCASFLAGS@
CCDEPMODE = @CCDEPMODE@
-CFLAGS = -O3 -g -funroll-loops -ffast-math -DLINUX @CFLAGS@ @DV_CFLAGS@
+CFLAGS = -g -funroll-loops -ffast-math -DLINUX @CFLAGS@ @DV_CFLAGS@
+CFLAGS = -fPIC -DPIC -funroll-loops -ffast-math -DLINUX @CFLAGS@ @DV_CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
@@ -193,7 +193,6 @@ LIBLVE_CFLAGS = @LIBLVE_CFLAGS@
LIBLVE_LIBS = @LIBLVE_LIBS@
LIBMPEG3_CFLAGS = @LIBMPEG3_CFLAGS@
LIBMPEG3_LIBS = @LIBMPEG3_LIBS@
-LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIBXML2CONFIG = @LIBXML2CONFIG@
@@ -316,14 +315,14 @@ DEFAULT_INCLUDES = -I$(top_srcdir) -I$(s
INCLUDES = -Wall -I./ -I../src -I$(srcdir)/../src
-noinst_LIBRARIES = libdvenc.a
+noinst_LTLIBRARIES = libdvenc.la
DVENC1 = dvenc.c
@HAVE_DV_TRUE@DVENC2 = enc_audio_input.c enc_input.c enc_output.c enc_output2.c
@HAVE_DV_TRUE@@HAVE_X86CPU_TRUE@DVENC3 = rgbtoyuv.S encode_x86.S transpose_x86.S
-libdvenc_a_SOURCES = $(DVENC1) $(DVENC2) $(DVENC3)
+libdvenc_la_SOURCES = $(DVENC1) $(DVENC2) $(DVENC3)
noinst_HEADERS = enc_output.h enc_input.h enc_audio_input.h dvenc.h
EXTRA_DIST = README.encoder COPYRIGHT AUTHORS \
@@ -348,29 +347,28 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
+LTLIBRARIES = $(noinst_LTLIBRARIES)
-libdvenc_a_AR = $(AR) cru
-libdvenc_a_LIBADD =
-am__libdvenc_a_SOURCES_DIST = dvenc.c enc_audio_input.c enc_input.c \
+libdvenc_la_LDFLAGS =
+libdvenc_la_LIBADD =
+am__libdvenc_la_SOURCES_DIST = dvenc.c enc_audio_input.c enc_input.c \
enc_output.c enc_output2.c rgbtoyuv.S encode_x86.S \
transpose_x86.S
-am__objects_1 = dvenc.$(OBJEXT)
-@HAVE_DV_TRUE@am__objects_2 = enc_audio_input.$(OBJEXT) \
-@HAVE_DV_TRUE@ enc_input.$(OBJEXT) enc_output.$(OBJEXT) \
-@HAVE_DV_TRUE@ enc_output2.$(OBJEXT)
-@HAVE_DV_TRUE@@HAVE_X86CPU_TRUE@am__objects_3 = rgbtoyuv.$(OBJEXT) \
-@HAVE_DV_TRUE@@HAVE_X86CPU_TRUE@ encode_x86.$(OBJEXT) \
-@HAVE_DV_TRUE@@HAVE_X86CPU_TRUE@ transpose_x86.$(OBJEXT)
-am_libdvenc_a_OBJECTS = $(am__objects_1) $(am__objects_2) \
+am__objects_1 = dvenc.lo
+@HAVE_DV_TRUE@am__objects_2 = enc_audio_input.lo enc_input.lo \
+@HAVE_DV_TRUE@ enc_output.lo enc_output2.lo
+@HAVE_DV_TRUE@@HAVE_X86CPU_TRUE@am__objects_3 = rgbtoyuv.lo \
+@HAVE_DV_TRUE@@HAVE_X86CPU_TRUE@ encode_x86.lo transpose_x86.lo
+am_libdvenc_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
$(am__objects_3)
-libdvenc_a_OBJECTS = $(am_libdvenc_a_OBJECTS)
+libdvenc_la_OBJECTS = $(am_libdvenc_la_OBJECTS)
depcomp = $(SHELL) $(top_srcdir)/autotools/depcomp
am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dvenc.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/enc_audio_input.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/enc_input.Po ./$(DEPDIR)/enc_output.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/enc_output2.Po
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dvenc.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/enc_audio_input.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/enc_input.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/enc_output.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/enc_output2.Plo
CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
LTCCASCOMPILE = $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) \
$(CCASFLAGS)
@@ -381,12 +379,12 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(
CCLD = $(CC)
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(am__libdvenc_a_SOURCES_DIST)
+DIST_SOURCES = $(am__libdvenc_la_SOURCES_DIST)
HEADERS = $(noinst_HEADERS)
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in AUTHORS \
Makefile.am
-SOURCES = $(libdvenc_a_SOURCES)
+SOURCES = $(libdvenc_la_SOURCES)
all: all-am
@@ -398,12 +396,16 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-clean-noinstLIBRARIES:
- -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libdvenc.a: $(libdvenc_a_OBJECTS) $(libdvenc_a_DEPENDENCIES)
- -rm -f libdvenc.a
- $(libdvenc_a_AR) libdvenc.a $(libdvenc_a_OBJECTS) $(libdvenc_a_LIBADD)
- $(RANLIB) libdvenc.a
+clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ test "$$dir" = "$$p" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+libdvenc.la: $(libdvenc_la_OBJECTS) $(libdvenc_la_DEPENDENCIES)
+ $(LINK) $(libdvenc_la_LDFLAGS) $(libdvenc_la_OBJECTS) $(libdvenc_la_LIBADD) $(LIBS)
@@ -404,6 +404,7 @@ libdvenc.a: $(libdvenc_a_OBJECTS) $(libd
-rm -f libdvenc.a
$(libdvenc_a_AR) libdvenc.a $(libdvenc_a_OBJECTS) $(libdvenc_a_LIBADD)
$(RANLIB) libdvenc.a
+ cp libdvenc.a libdvenc_pic.a
mostlyclean-compile:
-rm -f *.$(OBJEXT) core *.core
@@ -411,11 +413,11 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dvenc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enc_audio_input.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enc_input.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enc_output.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enc_output2.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dvenc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enc_audio_input.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enc_input.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enc_output.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enc_output2.Plo@am__quote@
.S.o:
$(CCASCOMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
@@ -556,7 +558,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(LIBRARIES) $(HEADERS)
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
installdirs:
install: install-am
@@ -585,7 +587,7 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
mostlyclean-am
distclean: distclean-am
@@ -635,7 +637,7 @@ ps-am:
uninstall-am: uninstall-info-am
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-noinstLIBRARIES ctags distclean \
+ clean-libtool clean-noinstLTLIBRARIES ctags distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am info info-am install \
install-am install-data install-data-am install-exec \

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-libioaux_Makefile_in,v 1.1.1.1 2004/06/18 18:56:51 sturm Exp $
--- libioaux/Makefile.in.orig 2004-06-10 14:23:56.000000000 +0200
+++ libioaux/Makefile.in 2004-06-10 14:28:27.000000000 +0200
$OpenBSD: patch-libioaux_Makefile_in,v 1.2 2004/06/24 19:27:00 sturm Exp $
--- libioaux/Makefile.in.orig 2004-01-06 12:39:17.000000000 -0800
+++ libioaux/Makefile.in 2004-06-18 19:26:28.000000000 -0700
@@ -69,7 +69,7 @@ CCAS = @CCAS@
CCASFLAGS = @CCASFLAGS@
CCDEPMODE = @CCDEPMODE@
-CFLAGS = -O3 -funroll-loops -ffast-math -DLINUX -Wall @CFLAGS@
+CFLAGS = -funroll-loops -ffast-math -DLINUX -Wall @CFLAGS@
+CFLAGS = -fPIC -DPIC -funroll-loops -ffast-math -DLINUX -Wall @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@

View File

@ -1,148 +1,11 @@
$OpenBSD: patch-libvo_Makefile_in,v 1.1.1.1 2004/06/18 18:56:51 sturm Exp $
--- libvo/Makefile.in.orig 2004-04-29 22:48:37.000000000 -0700
+++ libvo/Makefile.in 2004-04-29 22:51:27.000000000 -0700
@@ -194,7 +194,6 @@ LIBLVE_CFLAGS = @LIBLVE_CFLAGS@
LIBLVE_LIBS = @LIBLVE_LIBS@
LIBMPEG3_CFLAGS = @LIBMPEG3_CFLAGS@
LIBMPEG3_LIBS = @LIBMPEG3_LIBS@
-LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIBXML2CONFIG = @LIBXML2CONFIG@
@@ -313,9 +312,9 @@ x_libraries = @x_libraries@
AUTOMAKE_OPTIONS = 1.3 foreign
DEFAULT_INCLUDES = -I$(top_srcdir) -I$(srcdir) -I$(top_builddir) -I.
-noinst_LIBRARIES = libvout.a
+noinst_LTLIBRARIES = libvout.la
-libvout_a_SOURCES = video_out.c video_out_ppm.c video_out_yuv.c yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c cpu_accel.c rgb2yuv.c
+libvout_la_SOURCES = video_out.c video_out_ppm.c video_out_yuv.c yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c cpu_accel.c rgb2yuv.c
noinst_HEADERS = yuv2rgb.h video_out_internal.h video_out.h rgb2yuv.h mmx.h mm_accel.h
EXTRA_DIST = COPYING AUTHORS README
@@ -324,22 +323,23 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
+LTLIBRARIES = $(noinst_LTLIBRARIES)
-libvout_a_AR = $(AR) cru
-libvout_a_LIBADD =
-am_libvout_a_OBJECTS = video_out.$(OBJEXT) video_out_ppm.$(OBJEXT) \
- video_out_yuv.$(OBJEXT) yuv2rgb.$(OBJEXT) yuv2rgb_mmx.$(OBJEXT) \
- yuv2rgb_mlib.$(OBJEXT) cpu_accel.$(OBJEXT) rgb2yuv.$(OBJEXT)
-libvout_a_OBJECTS = $(am_libvout_a_OBJECTS)
+libvout_la_LDFLAGS =
+libvout_la_LIBADD =
+am_libvout_la_OBJECTS = video_out.lo video_out_ppm.lo video_out_yuv.lo \
+ yuv2rgb.lo yuv2rgb_mmx.lo yuv2rgb_mlib.lo cpu_accel.lo \
+ rgb2yuv.lo
+libvout_la_OBJECTS = $(am_libvout_la_OBJECTS)
depcomp = $(SHELL) $(top_srcdir)/autotools/depcomp
am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cpu_accel.Po ./$(DEPDIR)/rgb2yuv.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/video_out.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/video_out_ppm.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/video_out_yuv.Po ./$(DEPDIR)/yuv2rgb.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/yuv2rgb_mlib.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/yuv2rgb_mmx.Po
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cpu_accel.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/rgb2yuv.Plo ./$(DEPDIR)/video_out.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/video_out_ppm.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/video_out_yuv.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/yuv2rgb.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/yuv2rgb_mlib.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/yuv2rgb_mmx.Plo
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
@@ -347,12 +347,12 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(
CCLD = $(CC)
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libvout_a_SOURCES)
+DIST_SOURCES = $(libvout_la_SOURCES)
HEADERS = $(noinst_HEADERS)
DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.in AUTHORS \
COPYING Makefile.am
-SOURCES = $(libvout_a_SOURCES)
+SOURCES = $(libvout_la_SOURCES)
all: all-am
@@ -364,12 +364,16 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-clean-noinstLIBRARIES:
- -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libvout.a: $(libvout_a_OBJECTS) $(libvout_a_DEPENDENCIES)
- -rm -f libvout.a
- $(libvout_a_AR) libvout.a $(libvout_a_OBJECTS) $(libvout_a_LIBADD)
- $(RANLIB) libvout.a
+clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ test "$$dir" = "$$p" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+libvout.la: $(libvout_la_OBJECTS) $(libvout_la_DEPENDENCIES)
+ $(LINK) $(libvout_la_LDFLAGS) $(libvout_la_OBJECTS) $(libvout_la_LIBADD) $(LIBS)
$OpenBSD: patch-libvo_Makefile_in,v 1.2 2004/06/24 19:27:00 sturm Exp $
--- libvo/Makefile.in.orig 2004-06-18 17:43:03.000000000 -0700
+++ libvo/Makefile.in 2004-06-18 17:43:30.000000000 -0700
@@ -370,6 +370,7 @@ libvout.a: $(libvout_a_OBJECTS) $(libvou
-rm -f libvout.a
$(libvout_a_AR) libvout.a $(libvout_a_OBJECTS) $(libvout_a_LIBADD)
$(RANLIB) libvout.a
+ cp libvout.a libvout_pic.a
mostlyclean-compile:
-rm -f *.$(OBJEXT) core *.core
@@ -377,14 +381,14 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu_accel.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rgb2yuv.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_out.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_out_ppm.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_out_yuv.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yuv2rgb.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yuv2rgb_mlib.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yuv2rgb_mmx.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu_accel.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rgb2yuv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_out.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_out_ppm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_out_yuv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yuv2rgb.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yuv2rgb_mlib.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yuv2rgb_mmx.Plo@am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@@ -516,7 +520,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(LIBRARIES) $(HEADERS)
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
installdirs:
install: install-am
@@ -545,7 +549,7 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
mostlyclean-am
distclean: distclean-am
@@ -595,7 +599,7 @@ ps-am:
uninstall-am: uninstall-info-am
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-noinstLIBRARIES ctags distclean \
+ clean-libtool clean-noinstLTLIBRARIES ctags distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am info info-am install \
install-am install-data install-data-am install-exec \

View File

@ -1,5 +1,5 @@
%%i386%%
@comment $OpenBSD: PLIST,v 1.1.1.1 2004/06/18 18:56:51 sturm Exp $
@comment $OpenBSD: PLIST,v 1.2 2004/06/24 19:27:00 sturm Exp $
bin/avifix
bin/aviindex
bin/avimerge
@ -21,10 +21,10 @@ bin/transcode
@comment lib/transcode/a52_decore.la
lib/transcode/a52_decore.so
@comment lib/transcode/af6_decore.la
lib/transcode/af6_decore.so
@comment lib/transcode/af6_decore.so
@comment lib/transcode/export_ac3.la
lib/transcode/export_ac3.so
lib/transcode/export_af6.conf
@comment lib/transcode/export_af6.conf
@comment lib/transcode/export_debugppm.la
lib/transcode/export_debugppm.so
@comment lib/transcode/export_divx4.la
@ -247,7 +247,7 @@ man/man1/transcode.1
share/doc/transcode/ChangeLog
share/doc/transcode/OPTIMIZERS
share/doc/transcode/README.Inverse.Telecine.txt
@comment share/doc/transcode/README.cluster
share/doc/transcode/README.cluster
share/doc/transcode/README.filter.modfps
share/doc/transcode/README.rip
share/doc/transcode/README.sync
@ -289,7 +289,7 @@ share/doc/transcode/html/faq.html
share/doc/transcode/html/filter.html
share/doc/transcode/html/import_ac3.html
share/doc/transcode/html/import_avi.html
share/doc/transcode/html/import_dv.html
@comment share/doc/transcode/html/import_dv.html
share/doc/transcode/html/import_dvd.html
share/doc/transcode/html/import_mp3.html
share/doc/transcode/html/import_mpeg2.html