[X2Go-Commits] [nx-libs] 04/05: nxcomp/src/Makefile.am: Correct usage of PTHREAD_CFLAGS and PTHREAD_LIBS. PTHREAD_CFLAGS is also supposed to be used when linking. See comments in m4/ax_pthread.m4.

git-admin at x2go.org git-admin at x2go.org
Mon Apr 8 11:52:17 CEST 2019


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository nx-libs.

commit 80ecfad957d8107b8103a47ea69a8762fcea829b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Mar 1 23:16:49 2019 +0100

    nxcomp/src/Makefile.am: Correct usage of PTHREAD_CFLAGS and PTHREAD_LIBS. PTHREAD_CFLAGS is also supposed to be used when linking. See comments in m4/ax_pthread.m4.
---
 nxcomp/src/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nxcomp/src/Makefile.am b/nxcomp/src/Makefile.am
index 9cecae8..e062f08 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

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list