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. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index f2bf63264..8ea31cd63 100644 --- a/Makefile +++ b/Makefile @@ -70,7 +70,7 @@ build-full: > nx-X11/config/cf/nxversion.def # prepare Makefiles and the nx-X11 symlinking magic - cd nx-X11 && make BuildEnv + cd nx-X11 && make BuildEnv FONT_DEFINES=$(FONT_DEFINES) # build libNX_X11 and libNX_Xext prior to building # nxcomp{ext,shad}. -- cgit v1.2.3