Skip to content

N
nx-libs
Unverified Commit 1c621705 authored by Mihai Moldovan's avatar Mihai Moldovan
Browse files
Options

Merge branch 'sunweaver-pr/use-source-tree-nxcomp' into 3.6.x

Attributes GH PR #437: https://github.com/ArcticaProject/nx-libs/pull/437
parents 22b6ac72 e91132f3
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 4 deletions
nx-X11/programs/Xserver/Imakefile
View file @ 1c621705
......@@ -316,7 +316,6 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS):: $(NXAGENTDIRS)
#if defined(SunArchitecture)
NXAGENTNXLIBS = -L/usr/sfw/lib \
-L../../../nxcomp \
-L../../../nx-X11/exports/lib \
-L../../../nxcompshad \
-lrt \
-lXcomp \
......@@ -332,7 +331,6 @@ NXAGENTNXLIBS = -L/usr/sfw/lib \
$(NULL)
#elif defined(cygwinArchitecture)
NXAGENTNXLIBS = -L../../../nxcomp \
-L../../../nx-X11/exports/lib \
-L../../../nxcompshad \
-lXcomp \
-lXcompshad \
......@@ -362,7 +360,6 @@ NXAGENTNXLIBS = -L../../../nxcomp \
$(NULL)
#else
NXAGENTNXLIBS = -L../../../nxcomp \
-L../../../nx-X11/exports/lib \
-L../../../nxcompshad \
-lXcomp \
-lXcompshad \
......@@ -385,7 +382,7 @@ NX_XSHADOWLIBNAME = libXcompshad.so
#endif
ServerTarget(nxagent,$(NXAGENTDIRS),$(NXAGENTOBJS), \
$(LIBCWRAPPER) $(NXCOMPEXT) $(NXAGENTLIBS) $(LOADABLEEXTS),$(NXCOMPEXTSYSLIBS) $(NXAGENTSYSLIBS) $(NXAGENTNXLIBS))
$(LIBCWRAPPER) $(NXCOMPEXT) $(NXAGENTLIBS) $(LOADABLEEXTS),$(NXAGENTNXLIBS) $(NXAGENTSYSLIBS) $(NXCOMPEXTSYSLIBS))
/*
* Hard coded target to build a static nxagent server.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment