[X2Go-Commits] [nx-libs] 03/11: nx-X11/programs/Xserver/Imakefile: drop system libraries out of target list for nxagent regeneration.

git-admin at x2go.org git-admin at x2go.org
Thu Mar 15 12:22:08 CET 2018


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x-rpm-debug
in repository nx-libs.

commit 63a359313874202f5beeb4dd9ec496088f83addc
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Mar 10 02:04:25 2018 +0100

    nx-X11/programs/Xserver/Imakefile: drop system libraries out of target list for nxagent regeneration.
    
    Updating timestamps on object files and libraries used to compose
    nxagent is only meaningful for actual files within the buildroot.
    External dependencies would be ignored anyway, and worse, cause older
    GNU Make versions to fail if they contain special characters like a
    percent sign, which is typically interpreted as a wild card character.
---
 nx-X11/programs/Xserver/Imakefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index 5d86a53..285b361 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -305,7 +305,7 @@ NXCOMPEXTSYSLIBS = $(PIXMANLIB) $(ZLIB) $(PNGLIB) $(JPEGLIB)
 MakeMutex($(NXAGENTDIRS) $(NXCOMPEXT) $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXCOMPEXTSYSLIBS) $(NXAGENTSYSLIBS))
 #endif
 #if ForceServerRemake
-$(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS):: $(NXAGENTDIRS)
+$(NXAGENTOBJS) $(NXAGENTLIBS):: $(NXAGENTDIRS)
 	@if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi
 #endif
 #if NXLibraries
@@ -485,7 +485,7 @@ MakeMutex($(NXWINDIRS) $(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS) $(NXWINSYSLIBS) $(N
 #endif
 
 #if ForceServerRemake
-$(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS) $(NXWINSYSLIBS) $(NXWINNXLIBS):: $(NXWINDIRS)
+$(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS):: $(NXWINDIRS)
 	@if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi
 #endif
 
@@ -542,7 +542,7 @@ MakeMutex($(NXWINDIRS) $(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS) $(NXWINSYSLIBS) $(N
 #endif
 
 #if ForceServerRemake
-$(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS) $(NXWINSYSLIBS) $(NXWINNXLIBS):: $(NXWINDIRS)
+$(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS):: $(NXWINDIRS)
 	@if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi
 #endif
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list