diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2015-06-21 10:50:31 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2015-06-21 10:50:31 +0200 |
| commit | fb2a4e4c510a80630722834f2cf408f8b731b4ef (patch) | |
| tree | 3418ca9ac7561a45bae51c45dc272b61de0c5015 /nx-X11/programs/Xserver/xkb | |
| parent | cc92f77e9a3f20516de4276ecf8e178974ca1593 (diff) | |
| parent | 26091f4bd6b975eaabafc042c7af50b22042e508 (diff) | |
| download | nx-libs-fb2a4e4c510a80630722834f2cf408f8b731b4ef.tar.gz nx-libs-fb2a4e4c510a80630722834f2cf408f8b731b4ef.tar.bz2 nx-libs-fb2a4e4c510a80630722834f2cf408f8b731b4ef.zip | |
Merge branch 'sunweaver-pr/hw-driver-cleanup' into arctica-3.6.x
Attributes GH PR #41: https://github.com/ArcticaProject/nx-libs/pull/41
Diffstat (limited to 'nx-X11/programs/Xserver/xkb')
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/Imakefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/xkb/Imakefile b/nx-X11/programs/Xserver/xkb/Imakefile index a718545b1..2ac6fe32d 100644 --- a/nx-X11/programs/Xserver/xkb/Imakefile +++ b/nx-X11/programs/Xserver/xkb/Imakefile @@ -29,7 +29,7 @@ XKB_DDXDEFS = XkbServerDefines NX_DEFINES = -DNXAGENT_SERVER #endif -#if (defined(XF86Server) && XF86Server) || (defined(XorgServer) && XorgServer) +#if (defined(XorgServer) && XorgServer) XF86INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) XF86_OBJS = xf86KillSrv.o xf86VT.o xf86Private.o #endif @@ -62,7 +62,7 @@ NormalLibraryTarget(xkb,$(OBJS)) LintLibraryTarget(xkb,$(SRCS)) NormalLintTarget($(SRCS)) -#if (defined(XF86Server) && XF86Server) || (defined(XorgServer) && XorgServer) +#if (defined(XorgServer) && XorgServer) ObjectFromSpecialSource(xf86KillSrv,ddxKillSrv,-DXF86DDXACTIONS) ObjectFromSpecialSource(xf86VT,ddxVT,-DXF86DDXACTIONS) ObjectFromSpecialSource(xf86Private,ddxPrivate,-DXF86DDXACTIONS) |