Skip to content

N
nx-libs
Commit 404e6634 authored by Mihai Moldovan's avatar Mihai Moldovan
Browse files
Options

zlib compatibility: whenever we want -I flags only, assume that the headers are directly available.

Especially don't add linking flags willy-nilly.
parent e37532ca
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
nx-X11/programs/Xserver/hw/nxagent/Imakefile
View file @ 404e6634
...@@ -175,7 +175,7 @@ INCLUDES = \ ...@@ -175,7 +175,7 @@ INCLUDES = \
$(VFBINCLUDES) \ $(VFBINCLUDES) \
`pkg-config --cflags-only-I libxml-2.0` \ `pkg-config --cflags-only-I libxml-2.0` \
`pkg-config --cflags-only-I pixman-1` \ `pkg-config --cflags-only-I pixman-1` \
$$(pkg-config --exists 'zlib' >/dev/null 2>&1 && pkg-config --libs 'zlib' || echo "-lz") \ $$(pkg-config --exists 'zlib' >/dev/null 2>&1 && pkg-config --cflags-only-I 'zlib') \
`pkg-config --cflags-only-I libpng` \ `pkg-config --cflags-only-I libpng` \
$(NULL) $(NULL)
#else #else
...@@ -199,7 +199,7 @@ INCLUDES = \ ...@@ -199,7 +199,7 @@ INCLUDES = \
$(VFBINCLUDES) \ $(VFBINCLUDES) \
`pkg-config --cflags-only-I libxml-2.0` \ `pkg-config --cflags-only-I libxml-2.0` \
`pkg-config --cflags-only-I pixman-1` \ `pkg-config --cflags-only-I pixman-1` \
$$(pkg-config --exists 'zlib' >/dev/null 2>&1 && pkg-config --libs 'zlib' || echo "-lz") \ $$(pkg-config --exists 'zlib' >/dev/null 2>&1 && pkg-config --cflags-only-I 'zlib') \
`pkg-config --cflags-only-I libpng` \ `pkg-config --cflags-only-I libpng` \
$(NULL) $(NULL)
#endif #endif
......
nx-X11/programs/Xserver/hw/nxagent/compext/Imakefile
View file @ 404e6634
...@@ -34,7 +34,7 @@ OBJS = \ ...@@ -34,7 +34,7 @@ OBJS = \
-I$(XBUILDINCDIR) \ -I$(XBUILDINCDIR) \
-I../../../../../lib/include/X11 \ -I../../../../../lib/include/X11 \
`pkg-config --cflags-only-I pixman-1` \ `pkg-config --cflags-only-I pixman-1` \
$$(pkg-config --exists 'zlib' >/dev/null 2>&1 && pkg-config --libs 'zlib' || echo "-lz") \ $$(pkg-config --exists 'zlib' >/dev/null 2>&1 && pkg-config --cflags-only-I 'zlib') \
`pkg-config --cflags-only-I libpng` \ `pkg-config --cflags-only-I libpng` \
$(NULL) $(NULL)
......
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