aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/config/cf
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/config/cf
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/config/cf')
-rw-r--r--nx-X11/config/cf/Imake.tmpl11
-rw-r--r--nx-X11/config/cf/Server.tmpl8
2 files changed, 10 insertions, 9 deletions
diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl
index 9ca1f16d7..9deeb302d 100644
--- a/nx-X11/config/cf/Imake.tmpl
+++ b/nx-X11/config/cf/Imake.tmpl
@@ -1878,6 +1878,15 @@ SETITIMER_DEFINES = HasSetitimerDefines
POSTNOSTDLIB =
#endif
#endif
+
+#if HasXfont2
+FONT_DEFINES = -DHAS_XFONT2
+ XFONTLIB = -lXfont2
+#else
+FONT_DEFINES =
+ XFONTLIB = -lXfont
+#endif
+
/*
* Here we set up flags needed to produce position-independent code
* when doing C and C++ compilation. The default if you specify C
@@ -1976,7 +1985,7 @@ SETITIMER_DEFINES = HasSetitimerDefines
* LOCAL_LDFLAGS contains client-specific ld flags flags set in Imakefile
*/
ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
- ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(SETITIMER_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
+ ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(SETITIMER_DEFINES) $(FONT_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
LDPRELIB = LdPreLib $(INSTALLED_LIBS)
diff --git a/nx-X11/config/cf/Server.tmpl b/nx-X11/config/cf/Server.tmpl
index bae6f3b02..ffdca6811 100644
--- a/nx-X11/config/cf/Server.tmpl
+++ b/nx-X11/config/cf/Server.tmpl
@@ -70,11 +70,3 @@ GLX_DEFINES = GlxDefines
#ifdef XorgVersion
#include <xorg.tmpl>
#endif
-
-#if HasXfont2
-FONT_DEFINES = -DHAS_XFONT2
- XFONTLIB = -lXfont2
-#else
-FONT_DEFINES =
- XFONTLIB = -lXfont
-#endif