aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-06-30 20:13:51 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-07-26 10:12:43 +0200
commitf76c82403888bb498973ec974dbfd20e4edb02fe (patch)
treebe0cb6c112d9d9fb46387fbd114727510197ddec /nx-X11
parent9193d11eeeea933e293acd5e0f03fa4e9887186b (diff)
downloadnx-libs-f76c82403888bb498973ec974dbfd20e4edb02fe.tar.gz
nx-libs-f76c82403888bb498973ec974dbfd20e4edb02fe.tar.bz2
nx-libs-f76c82403888bb498973ec974dbfd20e4edb02fe.zip
nxcomp: Switch to autoreconf.
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/lib/X11/Imakefile6
-rw-r--r--nx-X11/programs/Xserver/Imakefile20
2 files changed, 13 insertions, 13 deletions
diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile
index 5b289fae8..a6471bff1 100644
--- a/nx-X11/lib/X11/Imakefile
+++ b/nx-X11/lib/X11/Imakefile
@@ -36,9 +36,9 @@ BuildIncludes($(HEADERS),IncSubdir,..)
#if NXLibraries
#ifdef SunArchitecture
-NX_INCLUDES = -I../../../nxcomp -I/usr/sfw/include
+NX_INCLUDES = -I../../../nxcomp/include -I/usr/sfw/include
#else
-NX_INCLUDES = -I../../../nxcomp
+NX_INCLUDES = -I../../../nxcomp/include
#endif
NX_DEFINES = -DNX_TRANS_SOCKET \
@@ -81,7 +81,7 @@ NX_XCOMPLIBNAME = libXcomp.so
NX_XCOMPEXTLIBNAME = libXcompext.so
#endif
-NX_XCOMPLIBDIR = $(XTOP)/../nxcomp
+NX_XCOMPLIBDIR = $(XTOP)/../nxcomp/src/.libs
NX_XCOMPLIBLINK = Xcomp
NX_XCOMPLIBTARGET = $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME)
NX_REQUIREDLIBS = -L$(NX_XCOMPLIBDIR) -l$(NX_XCOMPLIBLINK)
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index ed49313ee..3c7e68597 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -213,12 +213,12 @@ NXAGENTDDXDIR = hw
NXAGENTDIRS = $(STDDIRS) $(FBDIR) $(MIDAMAGEDIR) $(NXAGENTDDXDIR) $(DEPDIRS)
NX_XCOMP_HEADERS = \
- ../../../nxcomp/MD5.h \
- ../../../nxcomp/NXalert.h \
- ../../../nxcomp/NX.h \
- ../../../nxcomp/NXpack.h \
- ../../../nxcomp/NXproto.h \
- ../../../nxcomp/NXvars.h \
+ ../../../nxcomp/include/MD5.h \
+ ../../../nxcomp/include/NXalert.h \
+ ../../../nxcomp/include/NX.h \
+ ../../../nxcomp/include/NXpack.h \
+ ../../../nxcomp/include/NXproto.h \
+ ../../../nxcomp/include/NXvars.h \
$(NULL)
NX_XCOMPSHAD_HEADERS = \
@@ -315,7 +315,7 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS):: $(NXAGENTDIRS)
#if defined(SunArchitecture)
NXAGENTNXLIBS = -L/usr/sfw/lib \
- -L../../../nxcomp \
+ -L../../../nxcomp/src/.libs \
-L../../../nxcompshad/src/.libs \
-lrt \
-lXcomp \
@@ -330,7 +330,7 @@ NXAGENTNXLIBS = -L/usr/sfw/lib \
-lXext \
$(NULL)
#elif defined(cygwinArchitecture)
-NXAGENTNXLIBS = -L../../../nxcomp \
+NXAGENTNXLIBS = -L../../../nxcomp/src/.libs \
-L../../../nxcompshad/src/.libs \
-lXcomp \
-lXcompshad \
@@ -343,7 +343,7 @@ NXAGENTNXLIBS = -L../../../nxcomp \
-lXext \
$(NULL)
#elif defined(OpenBSDArchitecture)
-NXAGENTNXLIBS = -L../../../nxcomp \
+NXAGENTNXLIBS = -L../../../nxcomp/src/.libs \
-L../../../nx-X11/exports/lib \
-L../../../nxcompshad/src/.libs \
-lkvm \
@@ -359,7 +359,7 @@ NXAGENTNXLIBS = -L../../../nxcomp \
-lXext \
$(NULL)
#else
-NXAGENTNXLIBS = -L../../../nxcomp \
+NXAGENTNXLIBS = -L../../../nxcomp/src/.libs \
-L../../../nxcompshad/src/.libs \
-lXcomp \
-lXcompshad \