diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-11-11 15:50:21 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-11-11 15:50:21 +0100 |
| commit | 1a429016cfea09abe0255dd85a3cff4c7811c287 (patch) | |
| tree | 497238577dbeb74273b1289d9a290116202ddb2c /nx-X11 | |
| parent | 93c9b8862e68a5be51852dbaaf8d2e005c0b2b54 (diff) | |
| parent | f78a8b3ebe524403a8e055d1dc7a5863e44bc886 (diff) | |
| download | nx-libs-1a429016cfea09abe0255dd85a3cff4c7811c287.tar.gz nx-libs-1a429016cfea09abe0255dd85a3cff4c7811c287.tar.bz2 nx-libs-1a429016cfea09abe0255dd85a3cff4c7811c287.zip | |
Merge branch 'uli42-pr/fix_font_defines_once_more2' into 3.6.x
Attributes GH PR #736: https://github.com/ArcticaProject/nx-libs/pull/736
Diffstat (limited to 'nx-X11')
| -rw-r--r-- | nx-X11/config/cf/nxcompile.def | 30 | ||||
| -rw-r--r-- | nx-X11/config/cf/xorg.cf | 2 |
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) && \ |