From c350873c7c977efe5210484f04160be45f84ba7e Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Fri, 21 Jul 2017 12:31:09 +0200
Subject: Convert nx-X11/lib/ build flow from imake to autotools.

---
 nx-X11/programs/Xserver/Imakefile                    | 5 ++++-
 nx-X11/programs/Xserver/hw/nxagent/Imakefile         | 3 +++
 nx-X11/programs/Xserver/hw/nxagent/compext/Imakefile | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'nx-X11/programs/Xserver')

diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index 3c7e68597..3cfd5dcb0 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -317,6 +317,7 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS):: $(NXAGENTDIRS)
 NXAGENTNXLIBS = -L/usr/sfw/lib \
                 -L../../../nxcomp/src/.libs  \
                 -L../../../nxcompshad/src/.libs \
+                -L../../lib/src/.libs \
                 -lrt \
                 -lXcomp \
                 -lXcompshad \
@@ -332,6 +333,7 @@ NXAGENTNXLIBS = -L/usr/sfw/lib \
 #elif defined(cygwinArchitecture)
 NXAGENTNXLIBS = -L../../../nxcomp/src/.libs \
                 -L../../../nxcompshad/src/.libs \
+                -L../../lib/src/.libs \
                 -lXcomp \
                 -lXcompshad \
                 -lXrender \
@@ -344,8 +346,8 @@ NXAGENTNXLIBS = -L../../../nxcomp/src/.libs \
                 $(NULL)
 #elif defined(OpenBSDArchitecture)
 NXAGENTNXLIBS = -L../../../nxcomp/src/.libs  \
-                -L../../../nx-X11/exports/lib \
                 -L../../../nxcompshad/src/.libs \
+                -L../../lib/src/.libs \
                 -lkvm \
                 -lXcomp \
                 -lXcompshad \
@@ -361,6 +363,7 @@ NXAGENTNXLIBS = -L../../../nxcomp/src/.libs  \
 #else
 NXAGENTNXLIBS = -L../../../nxcomp/src/.libs  \
                 -L../../../nxcompshad/src/.libs \
+                -L../../lib/src/.libs \
                 -lXcomp \
                 -lXcompshad \
                 -lXrender \
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
index a1b059cae..43dace09e 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile
+++ b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
@@ -149,6 +149,7 @@ INCLUDES = \
 	-I../../GL/include \
 	-I../../../../lib/GL/include \
 	-I../../Xext \
+	-I../../../../lib/include/X11 \
 	-I$(EXTINCSRC) -I$(XINCLUDESRC) \
 	$(VFBINCLUDES) \
 	`pkg-config --cflags-only-I libxml-2.0` \
@@ -169,6 +170,7 @@ INCLUDES = \
 	-I../../Xext \
 	-I../../miext/damage \
 	-I../../miext/cw \
+	-I../../../../lib/include/X11 \
 	-I$(EXTINCSRC) -I$(XINCLUDESRC) \
 	$(VFBINCLUDES) \
 	`pkg-config --cflags-only-I libxml-2.0` \
@@ -192,6 +194,7 @@ INCLUDES = \
 	-I../../../../../nxcomp \
 	-I../../../../../nxcompshad \
 	-I../../../../extras/Mesa/include \
+	-I../../../../lib/include/X11 \
 	-I$(EXTINCSRC) -I$(XINCLUDESRC) \
 	$(VFBINCLUDES) \
 	`pkg-config --cflags-only-I libxml-2.0` \
diff --git a/nx-X11/programs/Xserver/hw/nxagent/compext/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/compext/Imakefile
index 8f0f17d1e..d364370ac 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/compext/Imakefile
+++ b/nx-X11/programs/Xserver/hw/nxagent/compext/Imakefile
@@ -32,6 +32,7 @@ OBJS =	\
 
    INCLUDES = -I$(SERVERSRC)/include \
               -I$(XBUILDINCDIR) \
+              -I../../../../../lib/include/X11 \
               `pkg-config --cflags-only-I pixman-1` \
               `pkg-config --cflags-only-I zlib` \
               `pkg-config --cflags-only-I libpng` \
-- 
cgit v1.2.3