aboutsummaryrefslogtreecommitdiff
path: root/Makefile
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 /Makefile
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 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
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}.