diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-07-21 12:31:09 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-08-25 10:06:49 +0200 |
| commit | c350873c7c977efe5210484f04160be45f84ba7e (patch) | |
| tree | 717d33eb315f4def1307d65108d14715696cd5cf /nx-X11/programs/Xserver | |
| parent | 1472e7e37838f17b7ed948fa206e8c3434a9d346 (diff) | |
| download | nx-libs-c350873c7c977efe5210484f04160be45f84ba7e.tar.gz nx-libs-c350873c7c977efe5210484f04160be45f84ba7e.tar.bz2 nx-libs-c350873c7c977efe5210484f04160be45f84ba7e.zip | |
Convert nx-X11/lib/ build flow from imake to autotools.
Diffstat (limited to 'nx-X11/programs/Xserver')
| -rw-r--r-- | nx-X11/programs/Xserver/Imakefile | 5 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Imakefile | 3 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/compext/Imakefile | 1 |
3 files changed, 8 insertions, 1 deletions
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` \ |