aboutsummaryrefslogtreecommitdiff
path: root/nxproxy/src/Makefile.am
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-04-07 21:36:05 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-04-07 21:36:05 +0200
commitcb5c042a181fba3540952991b48382fabedaf88c (patch)
tree9844249f3536956e627d24a46394b920655ce8ee /nxproxy/src/Makefile.am
parent59305c8b98d1046806e1cb80e2c7ba023c6f49cd (diff)
parentdd0d49c4ef08ddd0e6cb8e689f07ee84b51c2974 (diff)
downloadnx-libs-cb5c042a181fba3540952991b48382fabedaf88c.tar.gz
nx-libs-cb5c042a181fba3540952991b48382fabedaf88c.tar.bz2
nx-libs-cb5c042a181fba3540952991b48382fabedaf88c.zip
Merge branch 'Ionic-bugfix/libXcomp-pthread-underlinking' into 3.6.x
Attributes GH PR #791: https://github.com/ArcticaProject/nx-libs/pull/791
Diffstat (limited to 'nxproxy/src/Makefile.am')
-rw-r--r--nxproxy/src/Makefile.am3
1 files changed, 0 insertions, 3 deletions
diff --git a/nxproxy/src/Makefile.am b/nxproxy/src/Makefile.am
index fbe52cbf8..20ec7022e 100644
--- a/nxproxy/src/Makefile.am
+++ b/nxproxy/src/Makefile.am
@@ -9,12 +9,10 @@ nxproxy_SOURCES = \
$(NULL)
nxproxy_LDADD = \
- @PTHREAD_LIBS@ \
-L$(top_srcdir)/../nxcomp/src/.libs -lXcomp \
$(NULL)
nxproxy_LDFLAGS = \
- $(PTHREAD_LDFLAGS) \
$(NULL)
if TARGET_ELF
@@ -25,7 +23,6 @@ endif TARGET_ELF
nxproxy_CFLAGS = \
$(BASE_CFLAGS) \
- $(PTHREAD_CFLAGS) \
$(NULL)
AM_CPPFLAGS = \