aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-04-10 20:53:34 +0000
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-04-10 23:41:49 +0200
commitd63b4a5bafaabcb456f70aacda2c348d049d8ee8 (patch)
treebd2fecf9cbdaaab05ac4453b675737e0b54c4e3d /nx-X11/programs/Xserver/hw/nxagent
parent2d700b147a94fbb92ad9ad90b265a3bc1ceca6e3 (diff)
downloadnx-libs-d63b4a5bafaabcb456f70aacda2c348d049d8ee8.tar.gz
nx-libs-d63b4a5bafaabcb456f70aacda2c348d049d8ee8.tar.bz2
nx-libs-d63b4a5bafaabcb456f70aacda2c348d049d8ee8.zip
Regression fix for added libXfont2 API support:
- Move FONT_DEFINES and XLIBFONT definition to from Server.tmpl to Imake.tmpl. - Add FONT_DEFINES to ALLDEFINES. - Drop SpecialCObjectRules with FONT_DEFINES from various Imakefiles again, FONT_DEFINES is now set "globally". - Hand over FONT_DEFINES from main Makefile to nx-X11's make BuildEnv to make gccmakedep happy.
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Imakefile5
1 files changed, 0 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
index e9175df72..a1b059cae 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile
+++ b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
@@ -257,11 +257,6 @@ all:: $(OBJS)
LinkSourceFile(stubs.c,$(SERVERSRC)/Xi)
LinkSourceFile(xpstubs.c,$(SERVERSRC)/dix)
-SpecialCObjectRule(Init,$(ICONFIGFILES),$(FONT_DEFINES))
-SpecialCObjectRule(Font,$(ICONFIGFILES),$(FONT_DEFINES))
-SpecialCObjectRule(NXdamage,$(ICONFIGFILES),$(FONT_DEFINES))
-SpecialCObjectRule(NXdispatch,$(ICONFIGFILES),$(FONT_DEFINES))
-SpecialCObjectRule(NXdixfonts,$(ICONFIGFILES),$(FONT_DEFINES))
LinkSourceFile(miinitext.c,$(SERVERSRC)/mi)
SpecialCObjectRule(miinitext,$(ICONFIGFILES), $(_NOOP_))