aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/config/cf/nxcompile.def30
-rw-r--r--nx-X11/config/cf/xorg.cf2
2 files changed, 32 insertions, 0 deletions
diff --git a/nx-X11/config/cf/nxcompile.def b/nx-X11/config/cf/nxcompile.def
new file mode 100644
index 000000000..ff11b5962
--- /dev/null
+++ b/nx-X11/config/cf/nxcompile.def
@@ -0,0 +1,30 @@
+/*
+ Rules to have a much cleaner compilation output
+
+ derived from Imake.rules
+*/
+
+#define RemoveFileQuiet(file) @$(RM) -f file \&>/dev/null
+
+#define RunPrintIfFailed(cmd) @cmd || { echo failed command: cmd; exit 1; }
+
+#define ObjectCompile(options) RemoveFileQuiet($@) @@\
+ ClearmakeOSName \
+ @echo \ \ CC $*.c @@\
+ RunPrintIfFailed($(CC) -c $(CFLAGS) options $*.c)
+
+#define NormalLibraryTarget(libname,objlist) @@\
+AllTarget(LibraryTargetName(libname)) @@\
+ @@\
+LibraryTargetName(libname): objlist $(EXTRALIBRARYDEPS) @@\
+ @echo \ \ CCLD $@ @@\
+ RemoveFileQuiet($@) @@\
+ RunPrintIfFailed(MakeLibrary($@,objlist)) @@\
+ RunPrintIfFailed(RanLibrary($@)) @@\
+ RunPrintIfFailed(_LinkBuildLibrary($@))
+
+#define DependTarget() @@\
+DependDependency() @@\
+ @@\
+depend:: @@\
+ RunPrintIfFailed($(DEPEND) $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- $(SRCS))
diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf
index 6f1f43018..f9928b928 100644
--- a/nx-X11/config/cf/xorg.cf
+++ b/nx-X11/config/cf/xorg.cf
@@ -52,6 +52,8 @@ XORG_VERSION_CURRENT = XorgVersion
RELEASE_VERSION = ReleaseVersion
#if NXAgentServer
+#include "nxconfig.def"
+#include "nxcompile.def"
#include "nxversion.def"
#if !defined(nxVersionString) && \