qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pixman 0.9.6. Valery Masiutsin and other report that it fixes some

Browse Source 
X crashes on amd64. Bump major since one function was removed.
This commit is contained in:
matthieu 2007-12-10 21:30:21 +00:00
parent ae131499c7
commit b39707c5ac
7 changed files with 1344 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1184
lib/pixman/ChangeLog
View File

File diff suppressed because it is too large Load Diff

4
lib/pixman/Makefile.bsd-wrapper
View File

@ -1,5 +1,5 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2007/10/20 20:24:01 matthieu Exp $
# $OpenBSD: Makefile.bsd-wrapper,v 1.4 2007/12/10 21:30:21 matthieu Exp $
SHARED_LIBS= pixman-1 9.5
SHARED_LIBS= pixman-1 10.0
.include <bsd.xorg.mk>

2
lib/pixman/Makefile.in
View File

@ -145,6 +145,8 @@ SHELL = @SHELL@
STRIP = @STRIP@
USE_MMX_FALSE = @USE_MMX_FALSE@
USE_MMX_TRUE = @USE_MMX_TRUE@
USE_SSE_FALSE = @USE_SSE_FALSE@
USE_SSE_TRUE = @USE_SSE_TRUE@
VERSION = @VERSION@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@

119
lib/pixman/configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for pixman 0.9.5.
# Generated by GNU Autoconf 2.59 for pixman 0.9.6.
#
# Report bugs to <"sandmann@daimi.au.dk">.
#
@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='pixman'
PACKAGE_TARNAME='pixman'
PACKAGE_VERSION='0.9.5'
PACKAGE_STRING='pixman 0.9.5'
PACKAGE_VERSION='0.9.6'
PACKAGE_STRING='pixman 0.9.6'
PACKAGE_BUGREPORT='"sandmann@daimi.au.dk"'
# Factoring default headers for most tests.
@ -464,7 +464,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PIXMAN_MAJOR LT_VERSION_INFO MMX_CFLAGS USE_MMX_TRUE USE_MMX_FALSE HAVE_GTK_TRUE HAVE_GTK_FALSE GTK_CFLAGS GTK_LIBS DEP_CFLAGS DEP_LIBS LIBOBJS LTLIBOBJS'
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PIXMAN_MAJOR LT_VERSION_INFO USE_MMX_TRUE USE_MMX_FALSE USE_SSE_TRUE USE_SSE_FALSE MMX_CFLAGS HAVE_GTK_TRUE HAVE_GTK_FALSE GTK_CFLAGS GTK_LIBS DEP_CFLAGS DEP_LIBS LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@ -953,7 +953,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures pixman 0.9.5 to adapt to many kinds of systems.
\`configure' configures pixman 0.9.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1019,7 +1019,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of pixman 0.9.5:";;
short | recursive ) echo "Configuration of pixman 0.9.6:";;
esac
cat <<\_ACEOF
@ -1158,7 +1158,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
pixman configure 0.9.5
pixman configure 0.9.6
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@ -1172,7 +1172,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by pixman $as_me 0.9.5, which was
It was created by pixman $as_me 0.9.6, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@ -1815,7 +1815,7 @@ fi
# Define the identity of the package.
PACKAGE='pixman'
VERSION='0.9.5'
VERSION='0.9.6'
cat >>confdefs.h <<_ACEOF
@ -18871,7 +18871,7 @@ esac
LT_VERSION_INFO="9:5:9"
LT_VERSION_INFO="9:6:9"
PIXMAN_MAJOR=0
@ -18887,11 +18887,11 @@ if test "x$GCC" = "xyes"; then
*) CFLAGS="$CFLAGS -Wall" ;;
esac fi
MMX_CFLAGS="-mmmx -msse -Winline --param inline-unit-growth=10000 --param large-function-growth=10000"
MMX_CFLAGS="-mmmx -Winline --param inline-unit-growth=10000 --param large-function-growth=10000"
have_mmx_intrinsics=no
echo "$as_me:$LINENO: checking For MMX/SSE intrinsics in the compiler" >&5
echo $ECHO_N "checking For MMX/SSE intrinsics in the compiler... $ECHO_C" >&6
echo "$as_me:$LINENO: checking whether to use MMX intrinsics" >&5
echo $ECHO_N "checking whether to use MMX intrinsics... $ECHO_C" >&6
xserver_save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $MMX_CFLAGS"
cat >conftest.$ac_ext <<_ACEOF
@ -18900,10 +18900,8 @@ cat >conftest.$ac_ext <<_ACEOF
#error "Need GCC >= 3.4 for MMX intrinsics"
#endif
#include <mmintrin.h>
#include <xmmintrin.h>
int main () {
__m64 v = _mm_cvtsi32_si64 (1);
v = _mm_shuffle_pi16 (v, _MM_SHUFFLE(3, 3, 3, 3));
return _mm_cvtsi64_si32 (v);
}
_ACEOF
@ -18952,7 +18950,6 @@ fi
if test $have_mmx_intrinsics = yes; then
USE_MMX_TRUE=
USE_MMX_FALSE='#'
@ -18963,6 +18960,81 @@ fi
have_sse_intrinsics=no
echo "$as_me:$LINENO: checking whether to use SSE intrinsics" >&5
echo $ECHO_N "checking whether to use SSE intrinsics... $ECHO_C" >&6
xserver_save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -msse $MMX_CFLAGS"
cat >conftest.$ac_ext <<_ACEOF
#if !defined(__amd64__) && !defined(__x86_64__)
#error "Need x86-64 for SSE"
#endif
#include <mmintrin.h>
#include <xmmintrin.h>
int main () {
__m64 v = _mm_cvtsi32_si64 (1);
v = _mm_shuffle_pi16 (v, _MM_SHUFFLE(3, 3, 3, 3));
return _mm_cvtsi64_si32 (v);
}
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
have_sse_intrinsics=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS=$xserver_save_CFLAGS
echo "$as_me:$LINENO: result: $have_sse_intrinsics" >&5
echo "${ECHO_T}$have_sse_intrinsics" >&6
if test $have_sse_intrinsics = yes ; then
cat >>confdefs.h <<\_ACEOF
#define USE_SSE 1
_ACEOF
MMX_CFLAGS="-msse $MMX_CFLAGS"
fi
if test $have_sse_intrinsics = yes; then
USE_SSE_TRUE=
USE_SSE_FALSE='#'
else
USE_SSE_TRUE='#'
USE_SSE_FALSE=
fi
#PKG_CHECK_MODULES(GTK, [gtk+-2.0], [HAVE_GTK=yes], [HAVE_GTK=no])
HAVE_GTK=no
@ -19101,6 +19173,13 @@ echo "$as_me: error: conditional \"USE_MMX\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${USE_SSE_TRUE}" && test -z "${USE_SSE_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"USE_SSE\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
echo "$as_me: error: conditional \"USE_SSE\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${HAVE_GTK_TRUE}" && test -z "${HAVE_GTK_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"HAVE_GTK\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@ -19379,7 +19458,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
This file was extended by pixman $as_me 0.9.5, which was
This file was extended by pixman $as_me 0.9.6, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -19442,7 +19521,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
pixman config.status 0.9.5
pixman config.status 0.9.6
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@ -19710,9 +19789,11 @@ s,@ac_ct_F77@,$ac_ct_F77,;t t
s,@LIBTOOL@,$LIBTOOL,;t t
s,@PIXMAN_MAJOR@,$PIXMAN_MAJOR,;t t
s,@LT_VERSION_INFO@,$LT_VERSION_INFO,;t t
s,@MMX_CFLAGS@,$MMX_CFLAGS,;t t
s,@USE_MMX_TRUE@,$USE_MMX_TRUE,;t t
s,@USE_MMX_FALSE@,$USE_MMX_FALSE,;t t
s,@USE_SSE_TRUE@,$USE_SSE_TRUE,;t t
s,@USE_SSE_FALSE@,$USE_SSE_FALSE,;t t
s,@MMX_CFLAGS@,$MMX_CFLAGS,;t t
s,@HAVE_GTK_TRUE@,$HAVE_GTK_TRUE,;t t
s,@HAVE_GTK_FALSE@,$HAVE_GTK_FALSE,;t t
s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t

45
lib/pixman/configure.ac
View File

@ -42,7 +42,7 @@ AC_PREREQ([2.57])
m4_define([pixman_major], 0)
m4_define([pixman_minor], 9)
m4_define([pixman_micro], 5)
m4_define([pixman_micro], 6)
m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
@ -86,10 +86,10 @@ if test "x$GCC" = "xyes"; then
dnl ===========================================================================
dnl Check for MMX
MMX_CFLAGS="-mmmx -msse -Winline --param inline-unit-growth=10000 --param large-function-growth=10000"
MMX_CFLAGS="-mmmx -Winline --param inline-unit-growth=10000 --param large-function-growth=10000"
have_mmx_intrinsics=no
AC_MSG_CHECKING(For MMX/SSE intrinsics in the compiler)
AC_MSG_CHECKING(whether to use MMX intrinsics)
xserver_save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $MMX_CFLAGS"
AC_COMPILE_IFELSE([
@ -97,10 +97,8 @@ AC_COMPILE_IFELSE([
#error "Need GCC >= 3.4 for MMX intrinsics"
#endif
#include <mmintrin.h>
#include <xmmintrin.h>
int main () {
__m64 v = _mm_cvtsi32_si64 (1);
v = _mm_shuffle_pi16 (v, _MM_SHUFFLE(3, 3, 3, 3));
return _mm_cvtsi64_si32 (v);
}], have_mmx_intrinsics=yes)
CFLAGS=$xserver_save_CFLAGS
@ -111,11 +109,46 @@ if test $have_mmx_intrinsics = yes ; then
else
MMX_CFLAGS=
fi
AC_SUBST(MMX_CFLAGS)
AM_CONDITIONAL(USE_MMX, test $have_mmx_intrinsics = yes)
dnl =======================================================
dnl GCC 4.2 when compiling with -msse will generate SSE instructions
dnl on its own. This means anything compiled with -mss can only be
dnl run after a runtime check for SSE. Unfortunately, since we still
dnl need to support MMX-but-not-SSE (such as the OLPC), this means we
dnl can only use SSE when compiling for x86-64 (where SSE is always
dnl supported).
have_sse_intrinsics=no
AC_MSG_CHECKING(whether to use SSE intrinsics)
xserver_save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -msse $MMX_CFLAGS"
AC_COMPILE_IFELSE([
#if !defined(__amd64__) && !defined(__x86_64__)
#error "Need x86-64 for SSE"
#endif
#include <mmintrin.h>
#include <xmmintrin.h>
int main () {
__m64 v = _mm_cvtsi32_si64 (1);
v = _mm_shuffle_pi16 (v, _MM_SHUFFLE(3, 3, 3, 3));
return _mm_cvtsi64_si32 (v);
}], have_sse_intrinsics=yes)
CFLAGS=$xserver_save_CFLAGS
AC_MSG_RESULT($have_sse_intrinsics)
if test $have_sse_intrinsics = yes ; then
AC_DEFINE(USE_SSE, 1, [use SSE compiler intrinsics])
MMX_CFLAGS="-msse $MMX_CFLAGS"
fi
AM_CONDITIONAL(USE_SSE, test $have_sse_intrinsics = yes)
dnl ========================================================
AC_SUBST(MMX_CFLAGS)
#PKG_CHECK_MODULES(GTK, [gtk+-2.0], [HAVE_GTK=yes], [HAVE_GTK=no])
HAVE_GTK=no

59
lib/pixman/pixman/Makefile.in
View File

@ -37,10 +37,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
# mmx code
@USE_MMX_TRUE@am__append_1 = libpixman-mmx.la
@USE_MMX_TRUE@am__append_2 = libpixman-mmx.la
subdir = pixman
DIST_COMMON = $(libpixmaninclude_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
@ -62,12 +59,11 @@ am__installdirs = "$(DESTDIR)$(libdir)" \
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
@USE_MMX_TRUE@am__DEPENDENCIES_1 = libpixman-mmx.la
libpixman_1_la_DEPENDENCIES = libpixmanwrapper.la \
$(am__DEPENDENCIES_1)
libpixman_1_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_libpixman_1_la_OBJECTS = pixman-region.lo pixman-image.lo \
pixman-compose.lo pixman-pict.lo pixman-utils.lo \
pixman-edge.lo pixman-trap.lo pixman-compute-region.lo \
pixman-timer.lo
pixman-compose.lo pixman-compose-accessors.lo pixman-pict.lo \
pixman-utils.lo pixman-edge.lo pixman-edge-accessors.lo \
pixman-trap.lo pixman-compute-region.lo pixman-timer.lo
libpixman_1_la_OBJECTS = $(am_libpixman_1_la_OBJECTS)
am__DEPENDENCIES_2 =
@USE_MMX_TRUE@libpixman_mmx_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
@ -76,11 +72,6 @@ am__libpixman_mmx_la_SOURCES_DIST = pixman-mmx.c pixman-mmx.h
@USE_MMX_TRUE@ libpixman_mmx_la-pixman-mmx.lo
libpixman_mmx_la_OBJECTS = $(am_libpixman_mmx_la_OBJECTS)
@USE_MMX_TRUE@am_libpixman_mmx_la_rpath =
libpixmanwrapper_la_LIBADD =
am_libpixmanwrapper_la_OBJECTS = \
libpixmanwrapper_la-pixman-compose.lo \
libpixmanwrapper_la-pixman-edge.lo
libpixmanwrapper_la_OBJECTS = $(am_libpixmanwrapper_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@ -92,11 +83,9 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libpixman_1_la_SOURCES) $(libpixman_mmx_la_SOURCES) \
$(libpixmanwrapper_la_SOURCES)
SOURCES = $(libpixman_1_la_SOURCES) $(libpixman_mmx_la_SOURCES)
DIST_SOURCES = $(libpixman_1_la_SOURCES) \
$(am__libpixman_mmx_la_SOURCES_DIST) \
$(libpixmanwrapper_la_SOURCES)
$(am__libpixman_mmx_la_SOURCES_DIST)
libpixmanincludeHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(libpixmaninclude_HEADERS)
ETAGS = etags
@ -165,6 +154,8 @@ SHELL = @SHELL@
STRIP = @STRIP@
USE_MMX_FALSE = @USE_MMX_FALSE@
USE_MMX_TRUE = @USE_MMX_TRUE@
USE_SSE_FALSE = @USE_SSE_FALSE@
USE_SSE_TRUE = @USE_SSE_TRUE@
VERSION = @VERSION@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
@ -211,17 +202,18 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
lib_LTLIBRARIES = libpixman-1.la
libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO)
libpixman_1_la_LIBADD = @DEP_LIBS@ -lm libpixmanwrapper.la \
$(am__append_2)
libpixman_1_la_LIBADD = @DEP_LIBS@ -lm $(am__append_1)
libpixman_1_la_SOURCES = \
pixman.h \
pixman-region.c \
pixman-private.h \
pixman-image.c \
pixman-compose.c \
pixman-compose-accessors.c \
pixman-pict.c \
pixman-utils.c \
pixman-edge.c \
pixman-edge-accessors.c \
pixman-edge-imp.h \
pixman-trap.c \
pixman-compute-region.c \
@ -230,13 +222,8 @@ libpixman_1_la_SOURCES = \
libpixmanincludedir = $(includedir)/pixman-1/
libpixmaninclude_HEADERS = pixman.h
# wrapper library
noinst_LTLIBRARIES = libpixmanwrapper.la $(am__append_1)
libpixmanwrapper_la_SOURCES = \
pixman-compose.c \
pixman-edge.c
libpixmanwrapper_la_CFLAGS = $(DEP_CFLAGS) -DPIXMAN_FB_ACCESSORS
# mmx code
@USE_MMX_TRUE@noinst_LTLIBRARIES = libpixman-mmx.la
@USE_MMX_TRUE@libpixman_mmx_la_SOURCES = \
@USE_MMX_TRUE@ pixman-mmx.c \
@USE_MMX_TRUE@ pixman-mmx.h
@ -316,8 +303,6 @@ libpixman-1.la: $(libpixman_1_la_OBJECTS) $(libpixman_1_la_DEPENDENCIES)
$(LINK) -rpath $(libdir) $(libpixman_1_la_LDFLAGS) $(libpixman_1_la_OBJECTS) $(libpixman_1_la_LIBADD) $(LIBS)
libpixman-mmx.la: $(libpixman_mmx_la_OBJECTS) $(libpixman_mmx_la_DEPENDENCIES)
$(LINK) $(am_libpixman_mmx_la_rpath) $(libpixman_mmx_la_LDFLAGS) $(libpixman_mmx_la_OBJECTS) $(libpixman_mmx_la_LIBADD) $(LIBS)
libpixmanwrapper.la: $(libpixmanwrapper_la_OBJECTS) $(libpixmanwrapper_la_DEPENDENCIES)
$(LINK) $(libpixmanwrapper_la_LDFLAGS) $(libpixmanwrapper_la_OBJECTS) $(libpixmanwrapper_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@ -326,10 +311,10 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpixman_mmx_la-pixman-mmx.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpixmanwrapper_la-pixman-compose.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpixmanwrapper_la-pixman-edge.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixman-compose-accessors.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixman-compose.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixman-compute-region.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixman-edge-accessors.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixman-edge.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixman-image.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixman-pict.Plo@am__quote@
@ -366,20 +351,6 @@ libpixman_mmx_la-pixman-mmx.lo: pixman-mmx.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpixman_mmx_la_CFLAGS) $(CFLAGS) -c -o libpixman_mmx_la-pixman-mmx.lo `test -f 'pixman-mmx.c' || echo '$(srcdir)/'`pixman-mmx.c
libpixmanwrapper_la-pixman-compose.lo: pixman-compose.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpixmanwrapper_la_CFLAGS) $(CFLAGS) -MT libpixmanwrapper_la-pixman-compose.lo -MD -MP -MF "$(DEPDIR)/libpixmanwrapper_la-pixman-compose.Tpo" -c -o libpixmanwrapper_la-pixman-compose.lo `test -f 'pixman-compose.c' || echo '$(srcdir)/'`pixman-compose.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libpixmanwrapper_la-pixman-compose.Tpo" "$(DEPDIR)/libpixmanwrapper_la-pixman-compose.Plo"; else rm -f "$(DEPDIR)/libpixmanwrapper_la-pixman-compose.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pixman-compose.c' object='libpixmanwrapper_la-pixman-compose.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpixmanwrapper_la_CFLAGS) $(CFLAGS) -c -o libpixmanwrapper_la-pixman-compose.lo `test -f 'pixman-compose.c' || echo '$(srcdir)/'`pixman-compose.c
libpixmanwrapper_la-pixman-edge.lo: pixman-edge.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpixmanwrapper_la_CFLAGS) $(CFLAGS) -MT libpixmanwrapper_la-pixman-edge.lo -MD -MP -MF "$(DEPDIR)/libpixmanwrapper_la-pixman-edge.Tpo" -c -o libpixmanwrapper_la-pixman-edge.lo `test -f 'pixman-edge.c' || echo '$(srcdir)/'`pixman-edge.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libpixmanwrapper_la-pixman-edge.Tpo" "$(DEPDIR)/libpixmanwrapper_la-pixman-edge.Plo"; else rm -f "$(DEPDIR)/libpixmanwrapper_la-pixman-edge.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pixman-edge.c' object='libpixmanwrapper_la-pixman-edge.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpixmanwrapper_la_CFLAGS) $(CFLAGS) -c -o libpixmanwrapper_la-pixman-edge.lo `test -f 'pixman-edge.c' || echo '$(srcdir)/'`pixman-edge.c
mostlyclean-libtool:
-rm -f *.lo

2
lib/pixman/test/Makefile.in
View File

@ -139,6 +139,8 @@ SHELL = @SHELL@
STRIP = @STRIP@
USE_MMX_FALSE = @USE_MMX_FALSE@
USE_MMX_TRUE = @USE_MMX_TRUE@
USE_SSE_FALSE = @USE_SSE_FALSE@
USE_SSE_TRUE = @USE_SSE_TRUE@
VERSION = @VERSION@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@