diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-04-14 09:42:35 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-04-16 17:59:18 +0200 |
| commit | a5f71f084e9f32e947a04da69edb7aae96d61697 (patch) | |
| tree | 03acc5d7d7bb0d35152bfc597eb788b938f09647 /nx-X11/programs/Xserver/hw/nxagent/Imakefile | |
| parent | fad840cfe558601a8ec02414f1235824bc9f3168 (diff) | |
| download | nx-libs-a5f71f084e9f32e947a04da69edb7aae96d61697.tar.gz nx-libs-a5f71f084e9f32e947a04da69edb7aae96d61697.tar.bz2 nx-libs-a5f71f084e9f32e947a04da69edb7aae96d61697.zip | |
NXAGENT_UPGRADE code cleanup:
NX agent contains/ed two build trees. An old one (probably pre-3.x.y)
and a "newer" one. The "newer" code tree used to become enabled by
setting NXUpgradeAgentServer in nx-X11/config/cf/host.def to YES.
As building the NXUpgradeAgentServer has been the default for
years now, we drop all code that does not get used at build time
for NXUpgradeAgentServer == YES (i.e., the code that belongs to the
pre-3.x.y phase of NX agent).
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Imakefile')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Imakefile | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/Imakefile index 874e82565..3d4331c78 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile +++ b/nx-X11/programs/Xserver/hw/nxagent/Imakefile @@ -185,18 +185,12 @@ INCLUDES = -I. -I$(XBUILDINCDIR) -I$(FONTINCSRC) \ # NXAGENT FULLSCREEN Fullscreen mode # -#if NXUpgradeAgentServer -UPG_DEFINES=-DNXAGENT_UPGRADE -#else -UPG_DEFINES= -#endif - #if nxVersion NX_DEFINES=-DNX_VERSION_CURRENT="$(NX_VERSION_CURRENT)" \ -DNX_VERSION_CURRENT_STRING="\"$(NX_VERSION_CURRENT_STRING)\"" #endif -DEFINES = -g $(OS_DEFINES) $(EXT_DEFINES) $(UPG_DEFINES) $(NX_DEFINES) \ +DEFINES = -g $(OS_DEFINES) $(EXT_DEFINES) $(NX_DEFINES) \ -UXF86VIDMODE -UXFreeXDGA -UXF86MISC -UXF86DRI -UXFree86LOADER \ -DNXAGENT_SERVER \ -DNXAGENT_CONSTRAINCURSOR \ |