aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nx-X11/config/cf/nxcompile.def25
-rw-r--r--nx-X11/config/cf/xorg.cf2
2 files changed, 26 insertions, 1 deletions
diff --git a/nx-X11/config/cf/nxcompile.def b/nx-X11/config/cf/nxcompile.def
new file mode 100644
index 000000000..9fe0ab7b6
--- /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 337c28751..f9928b928 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) && \