diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-09-24 23:59:02 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-09-24 23:59:02 +0200 |
| commit | 049bf681e79171323246a49a4b0df8e9872dd022 (patch) | |
| tree | 86e4cadef8478f8acb20a9f8c96e0dc0002827c7 | |
| parent | a906bf0f24c540d5d17d89d5292d2bcfe7f52468 (diff) | |
| parent | 97a5cec70b176956b36c5f76e9c741b60ff9ba59 (diff) | |
| download | nx-libs-049bf681e79171323246a49a4b0df8e9872dd022.tar.gz nx-libs-049bf681e79171323246a49a4b0df8e9872dd022.tar.bz2 nx-libs-049bf681e79171323246a49a4b0df8e9872dd022.zip | |
Merge branch 'uli42-pr/improve_include_path_handling' into 3.6.x
Attributes GH PR #201: https://github.com/ArcticaProject/nx-libs/pull/201
| -rw-r--r-- | nx-X11/include/Imakefile | 10 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Agent.h | 7 |
2 files changed, 5 insertions, 12 deletions
diff --git a/nx-X11/include/Imakefile b/nx-X11/include/Imakefile index 7e05f4354..8b5bd356f 100644 --- a/nx-X11/include/Imakefile +++ b/nx-X11/include/Imakefile @@ -1,8 +1,4 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 04:05:43 coskrey Exp $ - - - - XCOMM $XFree86: xc/include/Imakefile,v 3.28 2001/04/28 23:52:31 dawes Exp $ NULL = @@ -56,6 +52,10 @@ all:: BuildIncludes($(HEADERS),nx-X11,..) +includes:: + -$(RM) $(BUILDINCDIR)/X11 + -$(LN) nx-X11 $(BUILDINCDIR)/X11 + #if BuildLibraries InstallMultipleFlags($(HEADERS),$(INCDIR)/nx-X11,$(INSTINCFLAGS)) #endif @@ -77,7 +77,7 @@ InstallDriverSDKNonExecFile(keysym.h,$(DRIVERSDKINCLUDEDIR)) /* _XOPEN_SOURCE is defined where needed to move __fds_bits to fds_bits. */ USE_FDS_BITS = fds_bits - + Xpoll.h: Xpoll.h.in sed -e "s/@USE_FDS_BITS@/$(USE_FDS_BITS)/;" < Xpoll.h.in > Xpoll.h diff --git a/nx-X11/programs/Xserver/hw/nxagent/Agent.h b/nx-X11/programs/Xserver/hw/nxagent/Agent.h index e74f15777..8577865a2 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Agent.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Agent.h @@ -112,13 +112,6 @@ typedef XID KeySym64; #define NX_TRANS_SOCKET #define GC XlibGC #include <nx-X11/Xlib.h> -/* - <X11/extension/shape.h> includes <X11/Xutil.h> but we need - <nx-X11/Xutil.h>. As both use the same header guard we can first - include <nx-X11/Xutil.h> and be ok. -*/ -#include <nx-X11/Xutil.h> - #include <X11/extensions/shape.h> #undef GC |