aboutsummaryrefslogtreecommitdiff
path: root/pixman/pixman/Makefile.in
diff options
context:
space:
mode:
Diffstat (limited to 'pixman/pixman/Makefile.in')
-rw-r--r--pixman/pixman/Makefile.in24
1 files changed, 12 insertions, 12 deletions
diff --git a/pixman/pixman/Makefile.in b/pixman/pixman/Makefile.in
index 9b5d8aaf6..0f57d91a3 100644
--- a/pixman/pixman/Makefile.in
+++ b/pixman/pixman/Makefile.in
@@ -248,6 +248,7 @@ FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
+HAVE_PTHREAD_SETSPECIFIC = @HAVE_PTHREAD_SETSPECIFIC@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -277,6 +278,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
@@ -285,6 +287,7 @@ PIXMAN_VERSION_MAJOR = @PIXMAN_VERSION_MAJOR@
PIXMAN_VERSION_MICRO = @PIXMAN_VERSION_MICRO@
PIXMAN_VERSION_MINOR = @PIXMAN_VERSION_MINOR@
PKG_CONFIG = @PKG_CONFIG@
+PTHREAD_LDFLAGS = @PTHREAD_LDFLAGS@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
@@ -292,6 +295,7 @@ SHELL = @SHELL@
SSE2_CFLAGS = @SSE2_CFLAGS@
SSE2_LDFLAGS = @SSE2_LDFLAGS@
STRIP = @STRIP@
+TOOLCHAIN_SUPPORTS__THREAD = @TOOLCHAIN_SUPPORTS__THREAD@
VERSION = @VERSION@
VMX_CFLAGS = @VMX_CFLAGS@
abs_builddir = @abs_builddir@
@@ -348,7 +352,8 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
lib_LTLIBRARIES = libpixman-1.la
libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) \
- -no-undefined $(am__append_2) $(am__append_7)
+ -no-undefined @PTHREAD_LDFLAGS@ $(am__append_2) \
+ $(am__append_7)
libpixman_1_la_LIBADD = @DEP_LIBS@ -lm $(am__append_3) $(am__append_5) \
$(am__append_8) $(am__append_10) $(am__append_12)
libpixman_1_la_SOURCES = \
@@ -398,22 +403,26 @@ CLEANFILES = pixman-combine32.c pixman-combine64.c pixman-combine32.h pixman-com
@USE_MMX_TRUE@libpixman_mmx_la_CFLAGS = $(DEP_CFLAGS) $(MMX_CFLAGS)
@USE_MMX_TRUE@libpixman_mmx_la_LIBADD = $(DEP_LIBS)
+@USE_MMX_TRUE@ASM_CFLAGS_mmx = $(MMX_CFLAGS)
@USE_VMX_TRUE@libpixman_vmx_la_SOURCES = \
@USE_VMX_TRUE@ pixman-vmx.c \
@USE_VMX_TRUE@ pixman-combine32.h
@USE_VMX_TRUE@libpixman_vmx_la_CFLAGS = $(DEP_CFLAGS) $(VMX_CFLAGS)
@USE_VMX_TRUE@libpixman_vmx_la_LIBADD = $(DEP_LIBS)
+@USE_VMX_TRUE@ASM_CFLAGS_vmx = $(VMX_CFLAGS)
@USE_SSE2_TRUE@libpixman_sse2_la_SOURCES = \
@USE_SSE2_TRUE@ pixman-sse2.c
@USE_SSE2_TRUE@libpixman_sse2_la_CFLAGS = $(DEP_CFLAGS) $(SSE2_CFLAGS)
@USE_SSE2_TRUE@libpixman_sse2_la_LIBADD = $(DEP_LIBS)
+@USE_SSE2_TRUE@ASM_CFLAGS_sse2 = $(SSE2_CFLAGS)
@USE_ARM_SIMD_TRUE@libpixman_arm_simd_la_SOURCES = \
@USE_ARM_SIMD_TRUE@ pixman-arm-simd.c
@USE_ARM_SIMD_TRUE@libpixman_arm_simd_la_CFLAGS = $(DEP_CFLAGS) $(ARM_SIMD_CFLAGS)
@USE_ARM_SIMD_TRUE@libpixman_arm_simd_la_LIBADD = $(DEP_LIBS)
+@USE_ARM_SIMD_TRUE@ASM_CFLAGS_arm_simd = $(ARM_SIMD_CFLAGS)
@USE_ARM_NEON_TRUE@libpixman_arm_neon_la_SOURCES = \
@USE_ARM_NEON_TRUE@ pixman-arm-neon.c \
@USE_ARM_NEON_TRUE@ pixman-arm-neon-asm.S \
@@ -421,6 +430,7 @@ CLEANFILES = pixman-combine32.c pixman-combine64.c pixman-combine32.h pixman-com
@USE_ARM_NEON_TRUE@libpixman_arm_neon_la_CFLAGS = $(DEP_CFLAGS)
@USE_ARM_NEON_TRUE@libpixman_arm_neon_la_LIBADD = $(DEP_LIBS)
+@USE_ARM_NEON_TRUE@ASM_CFLAGS_arm_neon =
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -881,18 +891,8 @@ pixman-combine64.c : pixman-combine.c.template pixman-combine64.h make-combine.p
pixman-combine64.h : pixman-combine.h.template make-combine.pl
$(PERL) $(srcdir)/make-combine.pl 16 < $(srcdir)/pixman-combine.h.template > $@ || ($(RM) $@; exit 1)
-@USE_MMX_TRUE@$(libpixman_mmx_la_SOURCES:.c=.s) : ASM_CFLAGS=$(MMX_CFLAGS)
-
-@USE_VMX_TRUE@$(libpixman_vmx_la_SOURCES:.c=.s) : ASM_CFLAGS=$(VMX_CFLAGS)
-
-@USE_SSE2_TRUE@$(libpixman_sse2_la_SOURCES:.c=.s) : ASM_CFLAGS=$(SSE2_CFLAGS)
-
-@USE_ARM_SIMD_TRUE@$(libpixman_arm_simd_la_SOURCES:.c=.s) : ASM_CFLAGS=$(ARM_SIMD_CFLAGS)
-
-@USE_ARM_NEON_TRUE@$(libpixman_arm_neon_la_SOURCES:.c=.s) : ASM_CFLAGS=
-
.c.s : $(libpixmaninclude_HEADERS) $(BUILT_SOURCES)
- $(CC) $(CFLAGS) $(ASM_CFLAGS) -DHAVE_CONFIG_H -I$(srcdir) -I$(builddir) -I$(top_builddir) -S -o $@ $<
+ $(CC) $(CFLAGS) $(ASM_CFLAGS_$(@:pixman-%.s=%)) $(ASM_CFLAGS_$(@:pixman-arm-%.s=arm_%)) -DHAVE_CONFIG_H -I$(srcdir) -I$(builddir) -I$(top_builddir) -S -o $@ $<
# 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.