diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-04-25 15:27:17 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-07-13 11:38:42 +0200 |
| commit | 76b48676844bc7aa0511b8371ef6347b2e8ad545 (patch) | |
| tree | 6c81a895407116ca2e3f1522c81e5d1d7122fd01 /nx-X11 | |
| parent | 622360ea2ec9cde354aece445e4b9fb4b7664eea (diff) | |
| download | nx-libs-76b48676844bc7aa0511b8371ef6347b2e8ad545.tar.gz nx-libs-76b48676844bc7aa0511b8371ef6347b2e8ad545.tar.bz2 nx-libs-76b48676844bc7aa0511b8371ef6347b2e8ad545.zip | |
nxcompshad: Switch to autoreconf.
Diffstat (limited to 'nx-X11')
| -rw-r--r-- | nx-X11/lib/X11/Imakefile | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/Imakefile | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile index 055cbec33..5b289fae8 100644 --- a/nx-X11/lib/X11/Imakefile +++ b/nx-X11/lib/X11/Imakefile @@ -87,7 +87,7 @@ NX_XCOMPLIBTARGET = $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME) NX_REQUIREDLIBS = -L$(NX_XCOMPLIBDIR) -l$(NX_XCOMPLIBLINK) NX_XCOMPCONFIGTARGET = $(NX_XCOMPLIBDIR)/config.status -NX_XCOMPEXTLIBDIR = $(XTOP)/../nxcompext +NX_XCOMPEXTLIBDIR = $(XTOP)/../nxcompext/src/.libs NX_XCOMPEXTLIBTARGET = $(NX_XCOMPEXTLIBDIR)/$(NX_XCOMPEXTLIBNAME) NX_XCOMPEXTCONFIGTARGET = $(NX_XCOMPEXTLIBDIR)/config.status diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index c5bbbeb75..ed49313ee 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -221,8 +221,8 @@ NX_XCOMP_HEADERS = \ ../../../nxcomp/NXvars.h \ $(NULL) -NX_XCOMPSHAD_HEADERS = \ - ../../../nxcompshad/Shadow.h \ +NX_XCOMPSHAD_HEADERS = \ + ../../../nxcompshad/include/Shadow.h \ $(NULL) NX_HEADERS = \ @@ -316,7 +316,7 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS):: $(NXAGENTDIRS) #if defined(SunArchitecture) NXAGENTNXLIBS = -L/usr/sfw/lib \ -L../../../nxcomp \ - -L../../../nxcompshad \ + -L../../../nxcompshad/src/.libs \ -lrt \ -lXcomp \ -lXcompshad \ @@ -331,7 +331,7 @@ NXAGENTNXLIBS = -L/usr/sfw/lib \ $(NULL) #elif defined(cygwinArchitecture) NXAGENTNXLIBS = -L../../../nxcomp \ - -L../../../nxcompshad \ + -L../../../nxcompshad/src/.libs \ -lXcomp \ -lXcompshad \ -lXrender \ @@ -345,7 +345,7 @@ NXAGENTNXLIBS = -L../../../nxcomp \ #elif defined(OpenBSDArchitecture) NXAGENTNXLIBS = -L../../../nxcomp \ -L../../../nx-X11/exports/lib \ - -L../../../nxcompshad \ + -L../../../nxcompshad/src/.libs \ -lkvm \ -lXcomp \ -lXcompshad \ @@ -360,7 +360,7 @@ NXAGENTNXLIBS = -L../../../nxcomp \ $(NULL) #else NXAGENTNXLIBS = -L../../../nxcomp \ - -L../../../nxcompshad \ + -L../../../nxcompshad/src/.libs \ -lXcomp \ -lXcompshad \ -lXrender \ |