Skip to content

N
nx-libs
Unverified Commit f0aac089 authored by Mihai Moldovan's avatar Mihai Moldovan
Browse files
Options

Merge branch 'sunweaver-pr/pthread-flags' into arctica-3.6.x

Attributes GH PR #790: https://github.com/ArcticaProject/nx-libs/pull/790
parents 1ff05c8e 80ecfad9
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
nxcomp/src/Makefile.am
View file @ f0aac089
...@@ -121,7 +121,6 @@ libXcomp_la_LIBADD = \ ...@@ -121,7 +121,6 @@ libXcomp_la_LIBADD = \
@JPEG_LIBS@ \ @JPEG_LIBS@ \
@PNG_LIBS@ \ @PNG_LIBS@ \
@Z_LIBS@ \ @Z_LIBS@ \
@PTHREAD_LIBS@ \
$(NULL) $(NULL)
AM_CXXFLAGS = \ AM_CXXFLAGS = \
...@@ -129,17 +128,18 @@ AM_CXXFLAGS = \ ...@@ -129,17 +128,18 @@ AM_CXXFLAGS = \
$(JPEG_CFLAGS) \ $(JPEG_CFLAGS) \
$(PNG_CFLAGS) \ $(PNG_CFLAGS) \
$(Z_CFLAGS) \ $(Z_CFLAGS) \
$(PTHREAD_CFLAGS) \
$(NULL) $(NULL)
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
$(PTHREAD_CFLAGS) \
$(NULL) $(NULL)
libXcomp_la_LDFLAGS = \ libXcomp_la_LDFLAGS = \
-version-number @LT_COMP_VERSION@ \ -version-number @LT_COMP_VERSION@ \
-no-undefined \ -no-undefined \
@PTHREAD_LIBS@ \ @PTHREAD_LIBS@ \
$(PTHREAD_CFLAGS) \
$(NULL) $(NULL)
libXcompincludedir = $(includedir)/nx libXcompincludedir = $(includedir)/nx
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment