Skip to content

N
nx-libs
Commit d63b4a5b authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

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.
parent 2d700b14
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 24 deletions
Makefile
View file @ d63b4a5b
...@@ -70,7 +70,7 @@ build-full: ...@@ -70,7 +70,7 @@ build-full:
> nx-X11/config/cf/nxversion.def > nx-X11/config/cf/nxversion.def
# prepare Makefiles and the nx-X11 symlinking magic # 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 # build libNX_X11 and libNX_Xext prior to building
# nxcomp{ext,shad}. # nxcomp{ext,shad}.
......
nx-X11/config/cf/Imake.tmpl
View file @ d63b4a5b
...@@ -1878,6 +1878,15 @@ SETITIMER_DEFINES = HasSetitimerDefines ...@@ -1878,6 +1878,15 @@ SETITIMER_DEFINES = HasSetitimerDefines
POSTNOSTDLIB = POSTNOSTDLIB =
#endif #endif
#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 * Here we set up flags needed to produce position-independent code
* when doing C and C++ compilation. The default if you specify C * when doing C and C++ compilation. The default if you specify C
...@@ -1976,7 +1985,7 @@ SETITIMER_DEFINES = HasSetitimerDefines ...@@ -1976,7 +1985,7 @@ SETITIMER_DEFINES = HasSetitimerDefines
* LOCAL_LDFLAGS contains client-specific ld flags flags set in Imakefile * LOCAL_LDFLAGS contains client-specific ld flags flags set in Imakefile
*/ */
ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) 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) CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
LDPRELIB = LdPreLib $(INSTALLED_LIBS) LDPRELIB = LdPreLib $(INSTALLED_LIBS)
......
nx-X11/config/cf/Server.tmpl
View file @ d63b4a5b
...@@ -70,11 +70,3 @@ GLX_DEFINES = GlxDefines ...@@ -70,11 +70,3 @@ GLX_DEFINES = GlxDefines
#ifdef XorgVersion #ifdef XorgVersion
#include <xorg.tmpl> #include <xorg.tmpl>
#endif #endif
#if HasXfont2
FONT_DEFINES = -DHAS_XFONT2
XFONTLIB = -lXfont2
#else
FONT_DEFINES =
XFONTLIB = -lXfont
#endif
nx-X11/programs/Xserver/Xext/Imakefile
View file @ d63b4a5b
...@@ -119,7 +119,7 @@ LintLibraryTarget(ext,$(SRCS)) ...@@ -119,7 +119,7 @@ LintLibraryTarget(ext,$(SRCS))
NormalLintTarget($(SRCS)) NormalLintTarget($(SRCS))
#if BuildXF86BigfontExt #if BuildXF86BigfontExt
SpecialCObjectRule(xf86bigfont,$(ICONFIGFILES),$(SHM_DEFINES) $(FONT_DEFINES)) SpecialCObjectRule(xf86bigfont,$(ICONFIGFILES),$(SHM_DEFINES))
#endif #endif
#if BuildXCSecurity #if BuildXCSecurity
SpecialCObjectRule(security,$(ICONFIGFILES),$(POLICYFILEDEF)) SpecialCObjectRule(security,$(ICONFIGFILES),$(POLICYFILEDEF))
......
nx-X11/programs/Xserver/dix/Imakefile
View file @ d63b4a5b
...@@ -133,9 +133,7 @@ LintLibraryTarget(dix,$(SRCS) $(XPSRC)) ...@@ -133,9 +133,7 @@ LintLibraryTarget(dix,$(SRCS) $(XPSRC))
NormalLintTarget($(SRCS) $(XPSRC)) NormalLintTarget($(SRCS) $(XPSRC))
SpecialCObjectRule(globals,$(ICONFIGFILES),$(SITE_DEFINES)) SpecialCObjectRule(globals,$(ICONFIGFILES),$(SITE_DEFINES))
SpecialCObjectRule(main,$(ICONFIGFILES),$(VENDOR_DEFINES) $(FONT_DEFINES)) SpecialCObjectRule(main,$(ICONFIGFILES),$(VENDOR_DEFINES))
SpecialCObjectRule(dispatch,$(ICONFIGFILES),$(FONT_DEFINES))
SpecialCObjectRule(dixfonts,$(ICONFIGFILES),$(FONT_DEFINES))
SpecialCObjectRule(pixmap,$(ICONFIGFILES),$(_NOOP_)) SpecialCObjectRule(pixmap,$(ICONFIGFILES),$(_NOOP_))
SpecialCObjectRule(privates,$(ICONFIGFILES),$(_NOOP_)) SpecialCObjectRule(privates,$(ICONFIGFILES),$(_NOOP_))
SpecialCObjectRule(window,$(ICONFIGFILES),$(QUARTZ_DEFINES)) SpecialCObjectRule(window,$(ICONFIGFILES),$(QUARTZ_DEFINES))
......
nx-X11/programs/Xserver/hw/nxagent/Imakefile
View file @ d63b4a5b
...@@ -257,11 +257,6 @@ all:: $(OBJS) ...@@ -257,11 +257,6 @@ all:: $(OBJS)
LinkSourceFile(stubs.c,$(SERVERSRC)/Xi) LinkSourceFile(stubs.c,$(SERVERSRC)/Xi)
LinkSourceFile(xpstubs.c,$(SERVERSRC)/dix) 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) LinkSourceFile(miinitext.c,$(SERVERSRC)/mi)
SpecialCObjectRule(miinitext,$(ICONFIGFILES), $(_NOOP_)) SpecialCObjectRule(miinitext,$(ICONFIGFILES), $(_NOOP_))
......
nx-X11/programs/Xserver/mi/Imakefile
View file @ d63b4a5b
...@@ -179,8 +179,6 @@ NormalLibraryTarget(cbrt,cbrt.o) ...@@ -179,8 +179,6 @@ NormalLibraryTarget(cbrt,cbrt.o)
SpecialCObjectRule(miinitext,$(ICONFIGFILES),$(EXT_DEFINES)) SpecialCObjectRule(miinitext,$(ICONFIGFILES),$(EXT_DEFINES))
SpecialCObjectRule(miscrinit,$(ICONFIGFILES),$(EXT_DEFINES)) SpecialCObjectRule(miscrinit,$(ICONFIGFILES),$(EXT_DEFINES))
SpecialCObjectRule(miglblt,$(ICONFIGFILES),$(FONT_DEFINES))
SpecialCObjectRule(mipolytext,$(ICONFIGFILES),$(FONT_DEFINES))
#ifdef ItsyCompilerBug #ifdef ItsyCompilerBug
SpecialCObjectRule(mipolycon,$(_NOOP_),-O0) SpecialCObjectRule(mipolycon,$(_NOOP_),-O0)
......
nx-X11/programs/Xserver/miext/damage/Imakefile
View file @ d63b4a5b
...@@ -22,8 +22,6 @@ NormalLibraryTarget(damage,$(OBJS)) ...@@ -22,8 +22,6 @@ NormalLibraryTarget(damage,$(OBJS))
LintLibraryTarget(damage,$(SRCS)) LintLibraryTarget(damage,$(SRCS))
NormalLintTarget($(SRCS)) NormalLintTarget($(SRCS))
SpecialCObjectRule(damage,$(ICONFIGFILES),$(FONT_DEFINES))
#endif #endif
DependTarget() DependTarget()
......
nx-X11/programs/Xserver/os/Imakefile
View file @ d63b4a5b
...@@ -248,7 +248,7 @@ SpecialCObjectRule(connection,$(ICONFIGFILES),$(SOCK_DEFINES) $(XDMCP_DEFINES)) ...@@ -248,7 +248,7 @@ SpecialCObjectRule(connection,$(ICONFIGFILES),$(SOCK_DEFINES) $(XDMCP_DEFINES))
SpecialCObjectRule(osinit,$(ICONFIGFILES),$(ADM_DEFINES)) SpecialCObjectRule(osinit,$(ICONFIGFILES),$(ADM_DEFINES))
SpecialCObjectRule(WaitFor,$(ICONFIGFILES),$(EXT_DEFINES)) SpecialCObjectRule(WaitFor,$(ICONFIGFILES),$(EXT_DEFINES))
SpecialCObjectRule(io,$(ICONFIGFILES),$(EXT_DEFINES)) SpecialCObjectRule(io,$(ICONFIGFILES),$(EXT_DEFINES))
SpecialCObjectRule(utils,$(ICONFIGFILES),$(XDMCP_DEFINES) $(EXT_DEFINES) $(ERROR_DEFINES) $(PAM_DEFINES) $(FONT_DEFINES)) SpecialCObjectRule(utils,$(ICONFIGFILES),$(XDMCP_DEFINES) $(EXT_DEFINES) $(ERROR_DEFINES) $(PAM_DEFINES))
#if defined(SparcArchitecture) && HasGcc && !HasGcc2 #if defined(SparcArchitecture) && HasGcc && !HasGcc2
oscolor.o: oscolor.c $(ICONFIGFILES) oscolor.o: oscolor.c $(ICONFIGFILES)
$(RM) $@ $(RM) $@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment