From d63b4a5bafaabcb456f70aacda2c348d049d8ee8 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 10 Apr 2017 20:53:34 +0000 Subject: 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. --- nx-X11/programs/Xserver/hw/nxagent/Imakefile | 5 ----- 1 file changed, 5 deletions(-) (limited to 'nx-X11/programs/Xserver/hw') 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_)) -- cgit v1.2.3