diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-10-27 11:12:00 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-10-27 11:12:00 +0200 |
commit | de3d9ff4ee51f3f9125d4a76cc21747c0613b8fd (patch) | |
tree | b2abe728e91199b50c25732da22b1e623b395b5b /nxcomp/src/Makefile.am | |
parent | 39ee56f5dbe968cddebf6e7891667a2cf8b5af76 (diff) | |
parent | ceac077637d147b54abeeb4f0154bf152ba13138 (diff) | |
download | nx-libs-de3d9ff4ee51f3f9125d4a76cc21747c0613b8fd.tar.gz nx-libs-de3d9ff4ee51f3f9125d4a76cc21747c0613b8fd.tar.bz2 nx-libs-de3d9ff4ee51f3f9125d4a76cc21747c0613b8fd.zip |
Merge branch 'theqvd-improved-logging' into 3.6.x
Attributes GH PR #193: https://github.com/ArcticaProject/nx-libs/pull/193
Diffstat (limited to 'nxcomp/src/Makefile.am')
-rw-r--r-- | nxcomp/src/Makefile.am | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/nxcomp/src/Makefile.am b/nxcomp/src/Makefile.am index 2264cb347..682ddbaca 100644 --- a/nxcomp/src/Makefile.am +++ b/nxcomp/src/Makefile.am @@ -114,12 +114,14 @@ libXcomp_la_SOURCES = \ WriteBuffer.cpp \ XidCache.cpp \ Z.cpp \ + Log.cpp \ $(NULL) libXcomp_la_LIBADD = \ @JPEG_LIBS@ \ @PNG_LIBS@ \ @Z_LIBS@ \ + @PTHREAD_LIBS@ \ $(NULL) AM_CXXFLAGS = \ @@ -127,13 +129,18 @@ AM_CXXFLAGS = \ $(JPEG_CFLAGS) \ $(PNG_CFLAGS) \ $(Z_CFLAGS) \ + $(PTHREAD_CFLAGS) \ $(NULL) AM_CPPFLAGS = \ -I$(top_srcdir)/include \ $(NULL) -libXcomp_la_LDFLAGS = -version-number @LT_COMP_VERSION@ -no-undefined +libXcomp_la_LDFLAGS = \ + -version-number @LT_COMP_VERSION@ \ + -no-undefined \ + $(PTHREAD_LDFLAGS) \ + $(NULL) libXcompincludedir = $(includedir)/nx libXcompinclude_HEADERS = \ |