diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-10-03 18:30:05 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-10-03 18:30:05 +0000 |
| commit | 519bd19882b18b3cfcccca5fe8e0e6ab6eb3b937 (patch) | |
| tree | 1ed8f61276ba41eeaf1ffa509465cd2f767cc3aa /lib/pixman/Makefile.in | |
| parent | 9b631ded21a25e9a701bb5c1be5a29597ce2e3c9 (diff) | |
Update to pixman 0.18.4.
Tweak build to use libpthread-stubs for TLS emulation instead of forcing
every application using pixman to use -pthread.
Tested by jasper@ and landry@ on a bulk ports build.
Diffstat (limited to 'lib/pixman/Makefile.in')
| -rw-r--r-- | lib/pixman/Makefile.in | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/lib/pixman/Makefile.in b/lib/pixman/Makefile.in index d51ee56ad..a49f36c9f 100644 --- a/lib/pixman/Makefile.in +++ b/lib/pixman/Makefile.in @@ -88,13 +88,13 @@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ -ARM_NEON_CFLAGS = @ARM_NEON_CFLAGS@ -ARM_SIMD_CFLAGS = @ARM_SIMD_CFLAGS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ +CCAS = @CCAS@ +CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ @@ -122,6 +122,7 @@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ HAVE_GTK_FALSE = @HAVE_GTK_FALSE@ HAVE_GTK_TRUE = @HAVE_GTK_TRUE@ +HAVE_PTHREAD_SETSPECIFIC = @HAVE_PTHREAD_SETSPECIFIC@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -151,6 +152,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@ @@ -158,6 +160,9 @@ SHELL = @SHELL@ SSE2_CFLAGS = @SSE2_CFLAGS@ SSE2_LDFLAGS = @SSE2_LDFLAGS@ STRIP = @STRIP@ +STUBS_CFLAGS = @STUBS_CFLAGS@ +STUBS_LIBS = @STUBS_LIBS@ +TOOLCHAIN_SUPPORTS__THREAD = @TOOLCHAIN_SUPPORTS__THREAD@ USE_ARM_NEON_FALSE = @USE_ARM_NEON_FALSE@ USE_ARM_NEON_TRUE = @USE_ARM_NEON_TRUE@ USE_ARM_SIMD_FALSE = @USE_ARM_SIMD_FALSE@ @@ -250,15 +255,15 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ - cd $(srcdir) && $(AUTOMAKE) --gnu \ + echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ + cd $(srcdir) && $(AUTOMAKE) --foreign \ && exit 0; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile + $(AUTOMAKE) --foreign Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ |