From c350873c7c977efe5210484f04160be45f84ba7e Mon Sep 17 00:00:00 2001 From: Mike Gabriel 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 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'nx-X11/programs/Xserver/Imakefile') 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 \ -- cgit v1.2.3 From 11fa0b1402e5134601c30c272fdef3556f16184a Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 11 Aug 2017 12:48:32 -0400 Subject: nx-X11/programs/Xserver/Imakefile: White-space fix. --- nx-X11/programs/Xserver/Imakefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nx-X11/programs/Xserver/Imakefile') diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index 3cfd5dcb0..86c5abf81 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -315,7 +315,7 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS):: $(NXAGENTDIRS) #if defined(SunArchitecture) NXAGENTNXLIBS = -L/usr/sfw/lib \ - -L../../../nxcomp/src/.libs \ + -L../../../nxcomp/src/.libs \ -L../../../nxcompshad/src/.libs \ -L../../lib/src/.libs \ -lrt \ @@ -345,7 +345,7 @@ NXAGENTNXLIBS = -L../../../nxcomp/src/.libs \ -lXext \ $(NULL) #elif defined(OpenBSDArchitecture) -NXAGENTNXLIBS = -L../../../nxcomp/src/.libs \ +NXAGENTNXLIBS = -L../../../nxcomp/src/.libs \ -L../../../nxcompshad/src/.libs \ -L../../lib/src/.libs \ -lkvm \ @@ -361,7 +361,7 @@ NXAGENTNXLIBS = -L../../../nxcomp/src/.libs \ -lXext \ $(NULL) #else -NXAGENTNXLIBS = -L../../../nxcomp/src/.libs \ +NXAGENTNXLIBS = -L../../../nxcomp/src/.libs \ -L../../../nxcompshad/src/.libs \ -L../../lib/src/.libs \ -lXcomp \ -- cgit v1.2.3