Skip to content

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

nx-X11/config/cf: Drop unnecessary xf86site.def, xf86.tmpl, xfree86.cf.

parent 8dd6d2fe
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 160 deletions
nx-X11/config/Imakefile
View file @ 17334df9
...@@ -15,16 +15,14 @@ BOOTSTRAPSUBDIRS = \ ...@@ -15,16 +15,14 @@ BOOTSTRAPSUBDIRS = \
SUBDIRS = cf $(BOOTSTRAPSUBDIRS) SUBDIRS = cf $(BOOTSTRAPSUBDIRS)
#if (defined(XFree86VersionString) || defined(XorgVersionString)) \ #if defined(XorgVersionString) \
&& defined(ProjectRoot) && \ && defined(ProjectRoot) && \
defined(BuildBindist) defined(BuildBindist)
all:: version all:: version
version: cf/version.def version: cf/version.def
RemoveFile(version) RemoveFile(version)
#if defined (XFree86VersionString) #if defined (XorgVersionString)
echo XFree86VersionString > version
#elif defined (XorgVersionString)
echo XorgVersionString > version echo XorgVersionString > version
#endif #endif
......
nx-X11/config/cf/Imakefile
View file @ 17334df9
...@@ -15,14 +15,13 @@ HOSTDEFFILES = \ ...@@ -15,14 +15,13 @@ HOSTDEFFILES = \
host.def host.def
#endif #endif
#if defined(XFree86Version) || defined(XorgVersion) #if defined(XorgVersion)
VERSIONDEFFILES = \ VERSIONDEFFILES = \
date.def \ date.def \
version.def version.def
#endif #endif
DEFFILES = \ DEFFILES = \
xf86site.def \
xorgsite.def \ xorgsite.def \
$(VERSIONDEFFILES) \ $(VERSIONDEFFILES) \
$(HOSTDEFFILES) \ $(HOSTDEFFILES) \
...@@ -45,13 +44,11 @@ ServerLib.tmpl \ ...@@ -45,13 +44,11 @@ ServerLib.tmpl \
Threads.tmpl \ Threads.tmpl \
X11.tmpl \ X11.tmpl \
lnxLib.tmpl \ lnxLib.tmpl \
xf86.tmpl \
xorg.tmpl xorg.tmpl
CFFILES = \ CFFILES = \
Imake.cf \ Imake.cf \
linux.cf \ linux.cf \
xfree86.cf \
xorg.cf xorg.cf
INSTFILES = $(RULEFILES) $(TMPLFILES) $(DEFFILES) $(CFFILES) $(LOCALFILES) INSTFILES = $(RULEFILES) $(TMPLFILES) $(DEFFILES) $(CFFILES) $(LOCALFILES)
...@@ -73,7 +70,7 @@ install:: ...@@ -73,7 +70,7 @@ install::
$(DESTDIR)$(CONFIGDIR)/host.def; \ $(DESTDIR)$(CONFIGDIR)/host.def; \
RemoveFile($${TMP})) RemoveFile($${TMP}))
#if defined(XFree86Version) || defined(XorgVersion) #if defined(XorgVersion)
install.sdk:: install.sdk::
@(TMP=/tmp/tmp.$$$$; \ @(TMP=/tmp/tmp.$$$$; \
RemoveFile($${TMP}); \ RemoveFile($${TMP}); \
......
nx-X11/config/cf/Server.tmpl
View file @ 17334df9
...@@ -70,10 +70,6 @@ GLX_DEFINES = GlxDefines ...@@ -70,10 +70,6 @@ GLX_DEFINES = GlxDefines
#define GlxUseSGISI NO #define GlxUseSGISI NO
#endif #endif
#ifdef XFree86Version
#include <xf86.tmpl>
#endif
#ifdef XorgVersion #ifdef XorgVersion
#include <xorg.tmpl> #include <xorg.tmpl>
#endif #endif
nx-X11/config/cf/xf86.tmpl deleted 100644 → 0
View file @ 8dd6d2fe
XCOMM $Xorg: xf86.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
XCOMM $XFree86: xc/config/cf/xf86.tmpl,v 3.32 2002/11/14 21:01:14 tsi Exp $
#ifdef BuilderEMailAddr
BUILDERADDR = BuilderEMailAddr
#else
BUILDERADDR = "xorg@freedesktop.org"
#endif
BUGMSG = -DBUILDERADDR='$(BUILDERADDR)'
#if defined(XF86DriverSDK)
BUILDMODULEDIR = $(DRIVERSDKMODULEDIR)
BUILDMODULETOP = ..
TOP_INCLUDES = TopIncludes
IMAKE_DEFINES = -DXF86DriverSDK=1
#ifdef UseInstalled
IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(TOP) -I$(IRULESRC) \
$(IMAKE_DEFINES) $(IMAKE_WARNINGS)
#else
IMAKE_CMD = $(IMAKE) -I$(TOP) -I$(IRULESRC) \
$(IMAKE_DEFINES) $(IMAKE_WARNINGS)
#endif
#undef ImakeSubCmdHelper
#ifdef UseInstalled
#define ImakeSubCmdHelper $(IMAKE) -DUseInstalled -I$(IMAKETOP) \
-I$(IRULESRC) $(IMAKE_DEFINES) $(IMAKE_WARNINGS)
#else
#define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKETOP) \
$(IMAKE_DEFINES) $(IMAKE_WARNINGS) \
-I$(IMAKEPREFIX)$(IRULESRC)
#endif
#endif
#ifndef JoystickSupport
#define JoystickSupport NO
#endif
/*
* Module support: These overrides must be here, not in xf86.rules,
* because they will replace rules after having seen the first lines
* of Imakefile (include <Server.tmpl>)
*/
#ifndef HasGccMergeConstants
#define HasGccMergeConstants NO
#endif
#if HasGccMergeConstants && DoLoadableServer && !MakeDllModules
MODULE_GCC_FLAGS = -fno-merge-constants
#endif
#if defined(IHaveModules) && MakeDllModules
MODULE_PIC_FLAGS = $(PICFLAGS)
#endif
MODULE_CFLAGS = $(MODULE_PIC_FLAGS) $(MODULE_GCC_FLAGS)
#if defined(IHaveModules)
# if DoLoadableServer
MODULE_DEFINES = -DIN_MODULE -DXFree86Module
# else
MODULE_DEFINES = -DXFree86Module
# endif
#endif
#if defined(IHaveModules) && DoLoadableServer
/* This overrides the ObjCompile in Imake.rules! */
#undef ObjectCompile
#define ObjectCompile(options) RemoveFile($@) @@\
ClearmakeOSName\
$(MODCC) $(MODCFLAGS) options -c $*.c
/* This overrides an AssembleObject in xf86.rules or in an os-dependent
* rules file (currently only minix.cf and os2.rules (uncritical))
*/
#define ModCPPOnlyAsm(basename,options) RemoveFile(basename.i) @@\
$(MODCPP) AsmDefines $(DEFINES) $(INCLUDES) options basename.S | \ @@\
grep -v '^\#' > basename.i
#undef AssembleObject
#define AssembleObject(basename,flags) ModCPPOnlyAsm(basename,flags) @@\
RemoveFile(basename.o) @@\
$(MODAS) $(MODASFLAGS) -o basename.o basename.i @@\
RemoveFile(basename.i)
/* This overrides the NormalRelocatableTarget in Imake.rules */
#undef NormalRelocatableTarget
#define NormalRelocatableTarget(objname,objlist) @@\
AllTarget(objname.Osuf) @@\
@@\
objname.Osuf: objlist $(EXTRALIBRARYDEPS) @@\
RemoveFile($@) @@\
$(MODLD) $(MODLDCOMBINEFLAGS) objlist -o $@
/* This overrides the NormalDepRelocatableTarget in Imake.rules */
#undef NormalDepRelocatableTarget
#define NormalDepRelocatableTarget(objname,deplist,objlist) @@\
AllTarget(objname.Osuf) @@\
@@\
objname.Osuf: deplist $(EXTRALIBRARYDEPS) @@\
RemoveFile($@) @@\
$(MODLD) $(MODLDCOMBINEFLAGS) objlist -o $@
/* This overrides the RanLibrary in Imake.rules */
#if DoRanlibCmd || NeedModuleRanlib
#undef RanLibrary
#define RanLibrary(args) $(MODRANLIB) args
#endif
/* This overrides the MakeLibrary rule in Imake.rules */
#undef MakeLibrary
#define MakeLibrary(libname,objlist) $(MODAR) libname objlist
/* This overrides the LibraryTargetName rule in Imake.rules */
#undef LibraryTargetName
#define LibraryTargetName(libname)Concat(lib,libname.a)
/* This disables an OS/2 rule */
#undef BuildLibSupportLibs
#define BuildLibSupportLibs(dummy)
#endif /* IHaveModules */
nx-X11/config/cf/xorg.cf
View file @ 17334df9
...@@ -1140,7 +1140,7 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese ...@@ -1140,7 +1140,7 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese
*/ */
#ifndef OtherIConfigFiles #ifndef OtherIConfigFiles
# define OtherIConfigFiles $(IRULESRC)/xfree86.cf $(IRULESRC)/xf86.rules # define OtherIConfigFiles $(IRULESRC)/xf86.rules
#endif #endif
#ifndef UseRgbTxt #ifndef UseRgbTxt
......
nx-X11/programs/Xserver/GL/mesa/X/Imakefile
View file @ 17334df9
...@@ -21,13 +21,6 @@ LinkSourceFile(compsize.c,$(MESASRCDIR)/src/glx/x11) ...@@ -21,13 +21,6 @@ LinkSourceFile(compsize.c,$(MESASRCDIR)/src/glx/x11)
COMMON_SRCS = driverfuncs.c COMMON_SRCS = driverfuncs.c
COMMON_OBJS = driverfuncs.o COMMON_OBJS = driverfuncs.o
#ifndef XFree86Version
/* This appears to be the quickest way to build a non-XFree86 server */
GLXSRV_DEFINES = -DXFree86Server
#endif
GLX_SRCS = xf86glx.c xf86glx_util.c compsize.c GLX_SRCS = xf86glx.c xf86glx_util.c compsize.c
GLX_OBJS = xf86glx.o xf86glx_util.o compsize.o GLX_OBJS = xf86glx.o xf86glx_util.o compsize.o
......
nx-X11/programs/Xserver/Imakefile
View file @ 17334df9
...@@ -34,7 +34,7 @@ XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.296 2003/11/23 06:47:00 torrey ...@@ -34,7 +34,7 @@ XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.296 2003/11/23 06:47:00 torrey
#define dependLib(x) #define dependLib(x)
#endif #endif
#if (defined (XFree86Version) || defined(XorgVersion)) #if defined(XorgVersion)
/* Do not strip server binaries */ /* Do not strip server binaries */
INSTPGMFLAGS = INSTPGMFLAGS =
#endif #endif
...@@ -89,7 +89,7 @@ INSTPGMFLAGS = ...@@ -89,7 +89,7 @@ INSTPGMFLAGS =
#if BuildXKB #if BuildXKB
XKBEXT = xkb/LibraryTargetName(xkb) dependLib($(OS)) XKBEXT = xkb/LibraryTargetName(xkb) dependLib($(OS))
XKBDIR = xkb XKBDIR = xkb
#if (defined(XFree86Version) || defined(XorgVersion)) #if defined(XorgVersion)
XF86XKBOBJS = xkb/xf86KillSrv.o xkb/xf86VT.o xkb/xf86Private.o XF86XKBOBJS = xkb/xf86KillSrv.o xkb/xf86VT.o xkb/xf86Private.o
#endif #endif
#endif #endif
......
nx-X11/programs/Xserver/Xext/Imakefile
View file @ 17334df9
...@@ -55,15 +55,13 @@ SUBDIRS = extmod ...@@ -55,15 +55,13 @@ SUBDIRS = extmod
#endif #endif
#if BuildXF86VidModeExt && \ #if BuildXF86VidModeExt && \
((defined(XF86Server) && XF86Server) || \ (defined(XorgServer) && XorgServer)
(defined(XorgServer) && XorgServer))
VIDMODESRCS = xf86vmode.c VIDMODESRCS = xf86vmode.c
VIDMODEOBJS = xf86vmode.o VIDMODEOBJS = xf86vmode.o
#endif #endif
#if BuildXF86MiscExt && \ #if BuildXF86MiscExt && \
((defined(XF86Server) && XF86Server) || \ (defined(XorgServer) && XorgServer)
(defined(XorgServer) && XorgServer))
XF86MISCSRCS = xf86misc.c XF86MISCSRCS = xf86misc.c
XF86MISCOBJS = xf86misc.o XF86MISCOBJS = xf86misc.o
#endif #endif
...@@ -157,7 +155,7 @@ NX_DEFINES = -DNXAGENT_SERVER ...@@ -157,7 +155,7 @@ NX_DEFINES = -DNXAGENT_SERVER
#endif #endif
#if (defined(XFree86Version) || defined(XorgVersion)) #if defined(XorgVersion)
/* XXX Check if this can be eliminated */ /* XXX Check if this can be eliminated */
XF86INCLUDES = -I$(XF86COMSRC) XF86INCLUDES = -I$(XF86COMSRC)
#endif #endif
......
nx-X11/programs/Xserver/include/Imakefile
View file @ 17334df9
...@@ -7,7 +7,7 @@ XCOMM $XFree86: xc/programs/Xserver/include/Imakefile,v 3.21 2001/01/17 22:36:56 ...@@ -7,7 +7,7 @@ XCOMM $XFree86: xc/programs/Xserver/include/Imakefile,v 3.21 2001/01/17 22:36:56
HEADERS = os.h misc.h HEADERS = os.h misc.h
#if defined(XorgVersion) || defined(XFree86Version) \ #if defined(XorgVersion) \
|| defined(BSDOSArchitecture) || defined(BSDOSArchitecture)
#if DoLoadableServer #if DoLoadableServer
LinkSourceFile(xf86Module.h,$(XF86COMSRC)) LinkSourceFile(xf86Module.h,$(XF86COMSRC))
......
nx-X11/programs/Xserver/mi/Imakefile
View file @ 17334df9
...@@ -62,7 +62,7 @@ OBJS = $(CBRT_OBJ) mivaltree.o mipolyseg.o mipolyrect.o \ ...@@ -62,7 +62,7 @@ OBJS = $(CBRT_OBJ) mivaltree.o mipolyseg.o mipolyrect.o \
mipointer.o misprite.o midispcur.o miscrinit.o miclipn.o migc.o \ mipointer.o misprite.o midispcur.o miscrinit.o miclipn.o migc.o \
micmap.o mioverlay.o micmap.o mioverlay.o
#if (defined (XFree86Version) || defined(XorgVersion)) #if defined(XorgVersion)
/* /*
* Make sure XINPUT, XF86VidTune, etc aren't defined for the miinitext.o * Make sure XINPUT, XF86VidTune, etc aren't defined for the miinitext.o
* used by Xnest, Xvfb * used by Xnest, Xvfb
......
nx-X11/programs/Xserver/xkb/Imakefile
View file @ 17334df9
...@@ -29,7 +29,7 @@ XKB_DDXDEFS = XkbServerDefines ...@@ -29,7 +29,7 @@ XKB_DDXDEFS = XkbServerDefines
NX_DEFINES = -DNXAGENT_SERVER NX_DEFINES = -DNXAGENT_SERVER
#endif #endif
#if (defined(XF86Server) && XF86Server) || (defined(XorgServer) && XorgServer) #if (defined(XorgServer) && XorgServer)
XF86INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) XF86INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC)
XF86_OBJS = xf86KillSrv.o xf86VT.o xf86Private.o XF86_OBJS = xf86KillSrv.o xf86VT.o xf86Private.o
#endif #endif
...@@ -62,7 +62,7 @@ NormalLibraryTarget(xkb,$(OBJS)) ...@@ -62,7 +62,7 @@ NormalLibraryTarget(xkb,$(OBJS))
LintLibraryTarget(xkb,$(SRCS)) LintLibraryTarget(xkb,$(SRCS))
NormalLintTarget($(SRCS)) NormalLintTarget($(SRCS))
#if (defined(XF86Server) && XF86Server) || (defined(XorgServer) && XorgServer) #if (defined(XorgServer) && XorgServer)
ObjectFromSpecialSource(xf86KillSrv,ddxKillSrv,-DXF86DDXACTIONS) ObjectFromSpecialSource(xf86KillSrv,ddxKillSrv,-DXF86DDXACTIONS)
ObjectFromSpecialSource(xf86VT,ddxVT,-DXF86DDXACTIONS) ObjectFromSpecialSource(xf86VT,ddxVT,-DXF86DDXACTIONS)
ObjectFromSpecialSource(xf86Private,ddxPrivate,-DXF86DDXACTIONS) ObjectFromSpecialSource(xf86Private,ddxPrivate,-DXF86DDXACTIONS)
......
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