Skip to content

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

Merge branch 'uli42-pr/fix_rebuild' into 3.6.x

Attributes GH PR #845: https://github.com/ArcticaProject/nx-libs/pull/845
parents c68a579e b55c66e8
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
nx-X11/programs/Xserver/Imakefile
View file @ e721ba29
...@@ -304,7 +304,7 @@ TIRPC_LIB = $$(pkg-config --libs 'libtirpc') ...@@ -304,7 +304,7 @@ TIRPC_LIB = $$(pkg-config --libs 'libtirpc')
NXAGENT = hw/nxagent/LibraryTargetName(nxagent) NXAGENT = hw/nxagent/LibraryTargetName(nxagent)
NXCOMPEXT = hw/nxagent/compext/LibraryTargetName(compext) NXCOMPEXT = hw/nxagent/compext/LibraryTargetName(compext)
NXAGENTLIBS = PreFbLibs $(NXAGENT) FbPostFbLibs $(NXCOMPEXT) $(NXAGENT) $(MI) NXAGENTLIBS = PreFbLibs $(NXAGENT) FbPostFbLibs $(NXCOMPEXT) $(NXAGENT) $(MI)
NXAGENTSYSLIBS = $(LDPRELIBS) $(XLIB) $(SYSLIBS) $(XPMLIB) $(XMLLIB) $(PIXMANLIB) $(TIRPC_LIB) NXAGENTSYSLIBS = $(XLIB) $(SYSLIBS) $(XPMLIB) $(XMLLIB) $(PIXMANLIB) $(TIRPC_LIB)
NXCOMPEXTSYSLIBS = $(ZLIB) $(PNGLIB) $(JPEGLIB) NXCOMPEXTSYSLIBS = $(ZLIB) $(PNGLIB) $(JPEGLIB)
#if HasParallelMake #if HasParallelMake
MakeMutex($(NXAGENTDIRS) $(NXCOMPEXT) $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXCOMPEXTSYSLIBS) $(NXAGENTSYSLIBS)) MakeMutex($(NXAGENTDIRS) $(NXCOMPEXT) $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXCOMPEXTSYSLIBS) $(NXAGENTSYSLIBS))
......
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