diff options
author | marha <marha@users.sourceforge.net> | 2011-09-28 15:25:22 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-09-28 15:25:22 +0200 |
commit | c958cf29a8265091c4f68bb842a1d07c47e181fa (patch) | |
tree | 9cdba0da6a601cd16a9c34c544c51be1aa7075fc /pixman/test | |
parent | 756ccf7af09d35176962e44587244580c2cd0f22 (diff) | |
parent | 18a8f9f6839dfd899814a76a971e720c1e622236 (diff) | |
download | vcxsrv-c958cf29a8265091c4f68bb842a1d07c47e181fa.tar.gz vcxsrv-c958cf29a8265091c4f68bb842a1d07c47e181fa.tar.bz2 vcxsrv-c958cf29a8265091c4f68bb842a1d07c47e181fa.zip |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'pixman/test')
-rw-r--r-- | pixman/test/Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pixman/test/Makefile.am b/pixman/test/Makefile.am index 802d3f4fc..eeb3679f0 100644 --- a/pixman/test/Makefile.am +++ b/pixman/test/Makefile.am @@ -1,9 +1,9 @@ include $(top_srcdir)/test/Makefile.sources -AM_CFLAGS = @OPENMP_CFLAGS@ -AM_LDFLAGS = @OPENMP_CFLAGS@ @TESTPROGS_EXTRA_LDFLAGS@ -LDADD = libutils.la $(top_builddir)/pixman/libpixman-1.la -lm @PNG_LIBS@ -INCLUDES = -I$(top_srcdir)/pixman -I$(top_builddir)/pixman @PNG_CFLAGS@ +AM_CFLAGS = $(OPENMP_CFLAGS) +AM_LDFLAGS = $(OPENMP_CFLAGS) $(TESTPROGS_EXTRA_LDFLAGS) +LDADD = libutils.la $(top_builddir)/pixman/libpixman-1.la -lm $(PNG_LIBS) +INCLUDES = -I$(top_srcdir)/pixman -I$(top_builddir)/pixman $(PNG_CFLAGS) libutils_la_SOURCES = $(libutils_sources) $(libutils_headers) |