aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2019-04-08 11:50:08 +0200
committerMihai Moldovan <ionic@ionic.de>2019-04-08 11:50:08 +0200
commitf0aac0897238ca1e019cefa47f7ce24c63a8f549 (patch)
treeac0f9c3e2069caf342cd5a559c2f722e9e7eb2a2
parent1ff05c8e23cb9ae911cb8bdd9e4f7b8a2c1f5180 (diff)
parent80ecfad957d8107b8103a47ea69a8762fcea829b (diff)
downloadnx-libs-f0aac0897238ca1e019cefa47f7ce24c63a8f549.tar.gz
nx-libs-f0aac0897238ca1e019cefa47f7ce24c63a8f549.tar.bz2
nx-libs-f0aac0897238ca1e019cefa47f7ce24c63a8f549.zip
Merge branch 'sunweaver-pr/pthread-flags' into arctica-3.6.x
Attributes GH PR #790: https://github.com/ArcticaProject/nx-libs/pull/790
-rw-r--r--nxcomp/src/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/nxcomp/src/Makefile.am b/nxcomp/src/Makefile.am
index 9cecae88e..e062f08b8 100644
--- a/nxcomp/src/Makefile.am
+++ b/nxcomp/src/Makefile.am
@@ -121,7 +121,6 @@ libXcomp_la_LIBADD = \
@JPEG_LIBS@ \
@PNG_LIBS@ \
@Z_LIBS@ \
- @PTHREAD_LIBS@ \
$(NULL)
AM_CXXFLAGS = \
@@ -129,17 +128,18 @@ AM_CXXFLAGS = \
$(JPEG_CFLAGS) \
$(PNG_CFLAGS) \
$(Z_CFLAGS) \
- $(PTHREAD_CFLAGS) \
$(NULL)
AM_CPPFLAGS = \
-I$(top_srcdir)/include \
+ $(PTHREAD_CFLAGS) \
$(NULL)
libXcomp_la_LDFLAGS = \
-version-number @LT_COMP_VERSION@ \
-no-undefined \
@PTHREAD_LIBS@ \
+ $(PTHREAD_CFLAGS) \
$(NULL)
libXcompincludedir = $(includedir)/nx