[X2Go-Commits] [nx-libs] 05/14: silence imake compilation

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository nx-libs.

commit ffc723e730b06ca50202ea769fa81bcf3ec00ec8
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Sun Nov 11 11:02:07 2018 +0100

    silence imake compilation
    
    Suppress printing the rm and the cc call for every file.
    Only print the compiler call in case of error.
---
 nx-X11/config/cf/nxcompile.def | 25 +++++++++++++++++++++++++
 nx-X11/config/cf/xorg.cf       |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/nx-X11/config/cf/nxcompile.def b/nx-X11/config/cf/nxcompile.def
new file mode 100644
index 0000000..9fe0ab7
--- /dev/null
+++ b/nx-X11/config/cf/nxcompile.def
@@ -0,0 +1,25 @@
+/*
+  our own rules to have a much cleaner compilation output
+
+  derived from Imake.rules
+*/
+
+#define RemoveFileQuiet(file) @$(RM) -f file \&>/dev/null
+
+#define ObjectCompile(options) RemoveFileQuiet($@)				@@\
+	ClearmakeOSName \
+	@echo \ \ CC $*.c						@@\
+	@$(CC) -c $(CFLAGS) options $*.c || { echo \ \ CC failed: $(CC)·-c·$(CFLAGS)·options·$*.c; exit 1; }
+
+#define RunPrintIfFailed(cmd)	@cmd || { echo failed command: cmd; exit 1; }
+
+#define NormalLibraryTarget(libname,objlist)				@@\
+AllTarget(LibraryTargetName(libname))					@@\
+									@@\
+LibraryTargetName(libname): objlist $(EXTRALIBRARYDEPS)		@@\
+	@echo \ \ Creating lib: $@					@@\
+	RemoveFileQuiet($@)						@@\
+	RunPrintIfFailed(MakeLibrary($@,objlist))			@@\
+	RunPrintIfFailed(RanLibrary($@))				@@\
+	RunPrintIfFailed(_LinkBuildLibrary($@))
+
diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf
index 337c287..f9928b9 100644
--- a/nx-X11/config/cf/xorg.cf
+++ b/nx-X11/config/cf/xorg.cf
@@ -53,7 +53,7 @@ RELEASE_VERSION = ReleaseVersion
 
 #if NXAgentServer
 #include "nxconfig.def"
-
+#include "nxcompile.def"
 #include "nxversion.def"
 
 #if !defined(nxVersionString) && \

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