Skip to content

N
nx-libs
Commit 96c9aafd authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel
Browse files
Options

Imake: drop DoLoadableServer, MakeDllModules and IHaveModules

We do not build loadable modules, so we do not need them anywhere. Also remove the extra files requires for module builds.
parent 8dab7c21
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 840 deletions
nx-X11/config/cf/Imake.rules
View file @ 96c9aafd
...@@ -3419,42 +3419,25 @@ MutexDirective: targets ...@@ -3419,42 +3419,25 @@ MutexDirective: targets
* ObjectModuleTarget - build a module as a single object file * ObjectModuleTarget - build a module as a single object file
*/ */
#ifndef ObjectModuleTarget #ifndef ObjectModuleTarget
#if MakeDllModules && DoLoadableServer
#define ObjectModuleTarget(module,objects) @@\
DynamicModuleTarget(Concat(module,_drv.so), objects)
#else
#define ObjectModuleTarget(module,objects) @@\ #define ObjectModuleTarget(module,objects) @@\
NormalRelocatableTarget(Concat(module,_drv), objects) NormalRelocatableTarget(Concat(module,_drv), objects)
#endif #endif
#endif
/* /*
* LibraryModuleTarget * LibraryModuleTarget
*/ */
#ifndef LibraryModuleTarget #ifndef LibraryModuleTarget
#if MakeDllModules && DoLoadableServer
#define LibraryModuleTarget(module,objects) @@\
NormalLibraryTarget(module, objects) @@\
DynamicModuleTarget(Concat3(lib,module,.so), objects)
#else
#define LibraryModuleTarget(module, objects) @@\ #define LibraryModuleTarget(module, objects) @@\
NormalLibraryTarget(module, objects) NormalLibraryTarget(module, objects)
#endif #endif
#endif
/* /*
* DepLibraryModuleTarget * DepLibraryModuleTarget
*/ */
#ifndef DepLibraryModuleTarget #ifndef DepLibraryModuleTarget
#if MakeDllModules && DoLoadableServer
#define DepLibraryModuleTarget(module,deplist,objects) @@\
NormalDepLibraryTarget(module, deplist, objects) @@\
DepDynamicModuleTarget(Concat3(lib,module,.so), deplist, objects)
#else
#define DepLibraryModuleTarget(module,deplist,objects) @@\ #define DepLibraryModuleTarget(module,deplist,objects) @@\
NormalDepLibraryTarget(module, deplist, objects) NormalDepLibraryTarget(module, deplist, objects)
#endif #endif
#endif
/* /*
* DynamicModuleTarget - build a module to be dynamically loaded * DynamicModuleTarget - build a module to be dynamically loaded
...@@ -3532,31 +3515,11 @@ InstallObjectModule(module,dest,multimedia) ...@@ -3532,31 +3515,11 @@ InstallObjectModule(module,dest,multimedia)
#endif #endif
#ifndef InstallObjectModule #ifndef InstallObjectModule
#if !DoLoadableServer
#define InstallObjectModule(module,dest,subdir) /**/ #define InstallObjectModule(module,dest,subdir) /**/
#else
#if MakeDllModules
#define InstallObjectModule(module,dest,subdir) @@\
InstallDynamicModule(Concat(module,_drv.so),dest,subdir)
#else
#define InstallObjectModule(module,dest,subdir) @@\
InstallDynamicModule(Concat(module,_drv.o),dest,subdir)
#endif
#endif
#endif #endif
#ifndef InstallLibraryModule #ifndef InstallLibraryModule
#if !DoLoadableServer
#define InstallLibraryModule(module,dest,subdir) /**/ #define InstallLibraryModule(module,dest,subdir) /**/
#else
#if MakeDllModules
#define InstallLibraryModule(module,dest,subdir) @@\
InstallDynamicModule(Concat3(lib,module,.so),dest,subdir)
#else
#define InstallLibraryModule(module,dest,subdir) @@\
InstallDynamicModule(ModuleLibraryTargetName(module),dest,subdir)
#endif
#endif
#endif #endif
#ifndef InstallModuleManPage #ifndef InstallModuleManPage
......
nx-X11/config/cf/Imake.tmpl
View file @ 96c9aafd
...@@ -293,12 +293,6 @@ XCOMM the platform-specific parameters - edit site.def to change ...@@ -293,12 +293,6 @@ XCOMM the platform-specific parameters - edit site.def to change
#define HasCookieMaker NO #define HasCookieMaker NO
#endif #endif
#ifndef DoLoadableServer
#define DoLoadableServer NO
#endif
#ifndef MakeDllModules
#define MakeDllModules NO
#endif
#ifndef StripInstalledPrograms #ifndef StripInstalledPrograms
#define StripInstalledPrograms NO /* leave symbol table just in case */ #define StripInstalledPrograms NO /* leave symbol table just in case */
#endif #endif
......
nx-X11/config/cf/host.def
View file @ 96c9aafd
...@@ -300,23 +300,6 @@ ...@@ -300,23 +300,6 @@
*/ */
/* /*
* Build a server that dynamically loads the modules by setting
* this to YES. This defaults to YES on most platforms. A static server
* can be built by setting this to NO.
*
#define DoLoadableServer NO
*/
/*
* This release defaults to building dlopen() style modules instead of the
* previously standard loader modules.
*
* Uncomment the following to return to the XFree86 custom loader modules.
*
#define MakeDllModules NO
*/
/*
* Build XAA. This can be disabled with: * Build XAA. This can be disabled with:
* *
#define XF86XAA NO #define XF86XAA NO
......
nx-X11/config/cf/linux.cf
View file @ 96c9aafd
...@@ -462,26 +462,12 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) ...@@ -462,26 +462,12 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# endif # endif
#endif #endif
#if UseElfFormat
# ifndef DoLoadableServer
# if defined(MipsArchitecture) || defined(SuperHArchitecture)
# define DoLoadableServer NO
# else
# define DoLoadableServer YES
# endif
# endif
#endif
#if LinuxElfDefault #if LinuxElfDefault
# if UseElfFormat # if UseElfFormat
# ifdef MipsArchitecture # ifdef MipsArchitecture
# ifndef AsCmd # ifndef AsCmd
# define AsCmd gcc -c -x assembler-with-cpp # define AsCmd gcc -c -x assembler-with-cpp
# endif # endif
# ifndef MakeDllModules
# define MakeDllModules YES
# endif
# endif /* MipsArchitecure */ # endif /* MipsArchitecure */
# if defined (i386Architecture) && ((GccMajorVersion >3) \ # if defined (i386Architecture) && ((GccMajorVersion >3) \
|| ((GccMajorVersion == 3) && (GccMinorVersion >= 1))) || ((GccMajorVersion == 3) && (GccMinorVersion >= 1)))
...@@ -840,9 +826,6 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) ...@@ -840,9 +826,6 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# define LinuxMachineDefines -D__sh__ # define LinuxMachineDefines -D__sh__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
# ifndef DoLoadableServer
# define DoLoadableServer NO
# endif
#endif #endif
#ifdef AMD64Architecture #ifdef AMD64Architecture
......
nx-X11/config/cf/xf86.rules
View file @ 96c9aafd
...@@ -74,149 +74,54 @@ clean:: @@\ ...@@ -74,149 +74,54 @@ clean:: @@\
*/ */
#ifndef InstallDriverSDKNonExecFile #ifndef InstallDriverSDKNonExecFile
#if !DoLoadableServer
#define InstallDriverSDKNonExecFile(file,dest) /**/ #define InstallDriverSDKNonExecFile(file,dest) /**/
#else
#define InstallDriverSDKNonExecFile(file,dest) @@\
install.sdk:: file @@\
MakeDir($(DESTDIR)dest) @@\
$(INSTALL) -c $(INSTDATFLAGS) file $(DESTDIR)dest
#endif
#endif #endif
#ifndef InstallDriverSDKLibrary #ifndef InstallDriverSDKLibrary
#if !DoLoadableServer
#define InstallDriverSDKLibrary(libname,dest) /**/ #define InstallDriverSDKLibrary(libname,dest) /**/
#else
#define InstallDriverSDKLibrary(libname,dest) @@\
install.sdk:: Concat(lib,libname.a) @@\
MakeDir($(DESTDIR)dest) @@\
$(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.a) $(DESTDIR)dest @@\
RanLibrary($(RANLIBINSTFLAGS) Concat($(DESTDIR)dest/lib,libname.a))
#endif
#endif #endif
#ifndef InstallDriverSDKNamedLibrary #ifndef InstallDriverSDKNamedLibrary
#if !DoLoadableServer
#define InstallDriverSDKNamedLibrary(libname,dlibname,dest) /**/ #define InstallDriverSDKNamedLibrary(libname,dlibname,dest) /**/
#else
#define InstallDriverSDKNamedLibrary(libname,dlibname,dest) @@\
install.sdk:: Concat(lib,libname.a) @@\
MakeDir($(DESTDIR)dest) @@\
$(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.a) \ @@\
Concat($(DESTDIR)dest/lib,dlibname.a) @@\
RanLibrary($(RANLIBINSTFLAGS) Concat($(DESTDIR)dest/lib,dlibname.a))
#endif
#endif #endif
#ifndef InstallDriverSDKNamedNonExec #ifndef InstallDriverSDKNamedNonExec
#if !DoLoadableServer
#define InstallDriverSDKNamedNonExec(srcname,dstname,dest) /**/ #define InstallDriverSDKNamedNonExec(srcname,dstname,dest) /**/
#else
#define InstallDriverSDKNamedNonExec(srcname,dstname,dest) @@\
install.sdk:: srcname @@\
MakeDir($(DESTDIR)dest) @@\
$(INSTALL) -c $(INSTDATFLAGS) srcname $(DESTDIR)dest/dstname
#endif
#endif #endif
#ifndef InstallDriverSDKNamedProg #ifndef InstallDriverSDKNamedProg
#if !DoLoadableServer
#define InstallDriverSDKNamedProg(srcname,dstname,dest) /**/ #define InstallDriverSDKNamedProg(srcname,dstname,dest) /**/
#else
#define InstallDriverSDKNamedProg(srcname,dstname,dest) @@\
install.sdk:: srcname @@\
MakeDir($(DESTDIR)dest) @@\
$(INSTALL) -c $(INSTBINFLAGS) srcname $(DESTDIR)dest/dstname
#endif
#endif #endif
#ifndef InstallDriverSDKSubdirs #ifndef InstallDriverSDKSubdirs
#if !DoLoadableServer
#define InstallDriverSDKSubdirs(dirs) /**/ #define InstallDriverSDKSubdirs(dirs) /**/
#else
#define InstallDriverSDKSubdirs(dirs) \
NamedTargetSubdirs(install.sdk,dirs,"installing driver SDK",DESTDIR='$(DESTDIR)',install.sdk)
#endif
#endif #endif
#ifndef InstallDriverSDKMultipleDestFlags #ifndef InstallDriverSDKMultipleDestFlags
#if !DoLoadableServer
#define InstallDriverSDKMultipleDestFlags(list,dest,flags) /**/ #define InstallDriverSDKMultipleDestFlags(list,dest,flags) /**/
#else
#define InstallDriverSDKMultipleDestFlags(list,dest,flags) \
InstallMultipleDestFlags(install.sdk,list,dest,flags)
#endif
#endif #endif
#ifndef InstallDriverSDKDynamicModule #ifndef InstallDriverSDKDynamicModule
#if !DoLoadableServer
#define InstallDriverSDKDynamicModule(module,dest,subdir) /**/ #define InstallDriverSDKDynamicModule(module,dest,subdir) /**/
#else
#define InstallDriverSDKDynamicModule(module,dest,subdir) @@\
install.sdk:: module @@\
MakeDir($(DESTDIR)dest/subdir) @@\
$(INSTALL) -c module $(DESTDIR)dest/subdir
#endif
#endif #endif
#ifndef InstallDriverSDKObjectModule #ifndef InstallDriverSDKObjectModule
#if !DoLoadableServer
#define InstallDriverSDKObjectModule(module,dest,subdir) /**/ #define InstallDriverSDKObjectModule(module,dest,subdir) /**/
#else
#if MakeDllModules
#define InstallDriverSDKObjectModule(module,dest,subdir) @@\
InstallDriverSDKDynamicModule(Concat(module,_drv.so),dest,subdir)
#else
#define InstallDriverSDKObjectModule(module,dest,subdir) @@\
InstallDriverSDKDynamicModule(Concat(module,_drv.o),dest,subdir)
#endif
#endif
#endif #endif
#ifndef InstallDriverSDKObjectSubModule #ifndef InstallDriverSDKObjectSubModule
#if !DoLoadableServer
#define InstallDriverSDKObjectSubModule(module,dest,subdir) /**/ #define InstallDriverSDKObjectSubModule(module,dest,subdir) /**/
#else
#if MakeDllModules
#define InstallDriverSDKObjectSubModule(module,dest,subdir) @@\
InstallDriverSDKDynamicModule(Concat(module,.so),dest,subdir)
#else
#define InstallDriverSDKObjectSubModule(module,dest,subdir) @@\
InstallDriverSDKDynamicModule(Concat(module,.o),dest,subdir)
#endif
#endif
#endif #endif
#ifndef InstallDriverSDKLibraryModule #ifndef InstallDriverSDKLibraryModule
#if !DoLoadableServer
#define InstallDriverSDKLibraryModule(module,dest,subdir) /**/ #define InstallDriverSDKLibraryModule(module,dest,subdir) /**/
#else
#if MakeDllModules
#define InstallDriverSDKLibraryModule(module,dest,subdir) @@\
InstallDriverSDKDynamicModule(Concat3(lib,module,.so),dest,subdir)
#else
#define InstallDriverSDKLibraryModule(module,dest,subdir) @@\
InstallDriverSDKDynamicModule(ModuleLibraryTargetName(module),dest,subdir)
#endif
#endif
#endif #endif
#ifndef ServerDriverSDKTarget #ifndef ServerDriverSDKTarget
#if !DoLoadableServer
#define ServerDriverSDKTarget(program) /**/ #define ServerDriverSDKTarget(program) /**/
#else
#define ServerDriverSDKTarget(program) @@\
InstallDriverSDKProgramWithFlags(program,$(DRIVERSDKDIR),$(_NOOP_))
#endif
#endif #endif
#ifndef InstallDriverSDKProgramWithFlags #ifndef InstallDriverSDKProgramWithFlags
#if !DoLoadableServer
#define InstallDriverSDKProgramWithFlags(program,dest,flags) /**/ #define InstallDriverSDKProgramWithFlags(program,dest,flags) /**/
#else
#define InstallDriverSDKProgramWithFlags(program,dest,flags) @@\
InstallTarget(install.sdk,ProgramTargetName(program),$(INSTPGMFLAGS) flags,dest)
#endif
#endif #endif
nx-X11/config/cf/xorg.cf
View file @ 96c9aafd
...@@ -201,18 +201,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString ...@@ -201,18 +201,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString
#define BuildModuleInSubdir NO #define BuildModuleInSubdir NO
#endif #endif
#ifndef DoLoadableServer
#define DoLoadableServer NO
#endif
#ifndef MakeDllModules
#if DoLoadableServer
#define MakeDllModules YES
#else
#define MakeDllModules NO
#endif
#endif
/* /*
* Default settings for which X Servers to build. * Default settings for which X Servers to build.
*/ */
...@@ -337,10 +325,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString ...@@ -337,10 +325,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString
#ifndef XorgServer #ifndef XorgServer
# define XorgServer NO # define XorgServer NO
#endif #endif
#if !XorgServer
# undef DoLoadableServer
# define DoLoadableServer NO
#endif
/* /*
* Fbdev module defines. They are set to indicate the fb types supported * Fbdev module defines. They are set to indicate the fb types supported
...@@ -569,18 +553,10 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 ...@@ -569,18 +553,10 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
#endif #endif
#ifndef ExtraLoaderDefines #ifndef ExtraLoaderDefines
# if MakeDllModules
# define ExtraLoaderDefines DlopenHack
# else
# define ExtraLoaderDefines /**/ # define ExtraLoaderDefines /**/
# endif
#endif #endif
#if DoLoadableServer
# define XFree86LoaderDefines -DXFree86LOADER ExtraLoaderDefines
#else
# define XFree86LoaderDefines /**/ # define XFree86LoaderDefines /**/
#endif
#ifndef HasBsdMake #ifndef HasBsdMake
#define HasBsdMake NO #define HasBsdMake NO
......
nx-X11/config/cf/xorg.tmpl
View file @ 96c9aafd
...@@ -64,79 +64,4 @@ BUILDERADDR = "xorg@lists.freedesktop.org" ...@@ -64,79 +64,4 @@ BUILDERADDR = "xorg@lists.freedesktop.org"
#define HasGccMergeConstants NO #define HasGccMergeConstants NO
#endif #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) 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/xorgsite.def
View file @ 96c9aafd
...@@ -169,23 +169,6 @@ ...@@ -169,23 +169,6 @@
*/ */
/* /*
* Build a server that dynamically loads the modules by setting
* this to YES. This defaults to YES on most platforms. A static server
* can be built by setting this to NO.
*
#define DoLoadableServer NO
*/
/*
* This release defaults to building dlopen() style modules instead of the
* previously standard loader modules.
*
* Uncomment the following to return to the XFree86 custom loader modules.
*
#define MakeDllModules NO
*/
/*
* Build XAA. This can be disabled with: * Build XAA. This can be disabled with:
* *
#define XF86XAA NO #define XF86XAA NO
......
nx-X11/programs/Xserver/GL/Imakefile
View file @ 96c9aafd
...@@ -7,10 +7,6 @@ ...@@ -7,10 +7,6 @@
SUBDIRS = glx $(CORE_SUBDIR) SUBDIRS = glx $(CORE_SUBDIR)
#if DoLoadableServer
MSRCS = glxmodule.c
MOBJS = glxmodule.o
#endif
#if BuildModuleInSubdir #if BuildModuleInSubdir
SRCS = glx/module/?*.c $(MSRCS) SRCS = glx/module/?*.c $(MSRCS)
......
nx-X11/programs/Xserver/GL/glx/Imakefile
View file @ 96c9aafd
NULL = NULL =
#if DoLoadableServer
# if !BuildModuleInSubdir
# define IHaveModules
# elif !defined(IHaveModules)
# define IHaveSubdirs
SUBDIRS = module
# endif
#endif
/* Large PIC tables needed for SPARC builds */ /* Large PIC tables needed for SPARC builds */
#if defined(sparc) || defined(SparcArchitecture) #if defined(sparc) || defined(SparcArchitecture)
...@@ -131,10 +123,6 @@ XCOMM add DEBUG to the define in ../mesa/src/X/xf86glx.c ...@@ -131,10 +123,6 @@ XCOMM add DEBUG to the define in ../mesa/src/X/xf86glx.c
$(NX_DEFINES) \ $(NX_DEFINES) \
$(NULL) $(NULL)
#ifdef IHaveModules
ModuleObjectRule()
LibraryModuleTarget(glx,$(OBJS))
#else
NormalLibraryObjectRule() NormalLibraryObjectRule()
NormalLibraryTarget(glx,$(OBJS)) NormalLibraryTarget(glx,$(OBJS))
#if defined(GlxUseWindows) && GlxUseWindows #if defined(GlxUseWindows) && GlxUseWindows
...@@ -145,7 +133,6 @@ includes:: ...@@ -145,7 +133,6 @@ includes::
SpecialObjectRule(stdcall/%.o,%.c,-DUSE_OPENGL32 -o $@) SpecialObjectRule(stdcall/%.o,%.c,-DUSE_OPENGL32 -o $@)
NormalLibraryTarget(glx_stdcall,$(foreach obj,$(OBJS), stdcall/$(obj))) NormalLibraryTarget(glx_stdcall,$(foreach obj,$(OBJS), stdcall/$(obj)))
#endif #endif
#endif
SubdirLibraryRule($(OBJS)) SubdirLibraryRule($(OBJS))
LintLibraryTarget(glx,$(SRCS)) LintLibraryTarget(glx,$(SRCS))
......
nx-X11/programs/Xserver/GL/mesa/GLcore/GLcoremodule.c deleted 100644 → 0
View file @ 8dab7c21
/**************************************************************************
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sub license, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice (including the
next paragraph) shall be included in all copies or substantial portions
of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
/*
* Authors:
* Kevin E. Martin <kevin@precisioninsight.com>
*
*/
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
#include "xf86Module.h"
static MODULESETUPPROTO(GLcoreSetup);
static XF86ModuleVersionInfo VersRec =
{
"GLcore",
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
XORG_VERSION_CURRENT,
1, 0, 0,
ABI_CLASS_EXTENSION,
ABI_EXTENSION_VERSION,
MOD_CLASS_NONE,
{0,0,0,0}
};
XF86ModuleData GLcoreModuleData = { &VersRec, GLcoreSetup, NULL };
static void *
GLcoreSetup(void * module, void * opts, int *errmaj, int *errmin)
{
/* Need a non-NULL return value to indicate success */
return (void *)1;
}
nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile
View file @ 96c9aafd
#if DoLoadableServer
#define IHaveModules
#endif
#include <Server.tmpl> #include <Server.tmpl>
#define NeedAllMesaSrc #define NeedAllMesaSrc
...@@ -29,11 +25,6 @@ ...@@ -29,11 +25,6 @@
#include "../X/Imakefile.inc" #include "../X/Imakefile.inc"
#include "../Imakefile.inc" #include "../Imakefile.inc"
#ifdef IHaveModules
MSRCS = GLcoremodule.c
MOBJS = GLcoremodule.o
#endif
XOBJS = ../X/?*.o XOBJS = ../X/?*.o
OBJS = $(COREMESAOBJS) $(MOBJS) OBJS = $(COREMESAOBJS) $(MOBJS)
...@@ -50,16 +41,8 @@ ...@@ -50,16 +41,8 @@
DEFINES = $(GLX_DEFINES) DEFINES = $(GLX_DEFINES)
#ifdef IHaveModules
ModuleObjectRule()
DepLibraryModuleTarget(GLcore, $(DONES) $(OBJS),$(OBJS) $(XOBJS))
InstallLibraryModule(GLcore,$(MODULEDIR),extensions)
#else
NormalDepLibraryTarget(GLcore, $(DONES) $(OBJS), $(OBJS) $(XOBJS)) NormalDepLibraryTarget(GLcore, $(DONES) $(OBJS), $(OBJS) $(XOBJS))
NormalLibraryObjectRule() NormalLibraryObjectRule()
#endif
InstallDriverSDKLibraryModule(GLcore,$(DRIVERSDKMODULEDIR),extensions) InstallDriverSDKLibraryModule(GLcore,$(DRIVERSDKMODULEDIR),extensions)
......
nx-X11/programs/Xserver/GL/mesa/Imakefile
View file @ 96c9aafd
#if DoLoadableServer
#define IHaveModules
#endif
#define IHaveSubdirs #define IHaveSubdirs
SUBDIRS = main math array_cache swrast swrast_setup tnl shader X GLcore $(MODSUBDIR) SUBDIRS = main math array_cache swrast swrast_setup tnl shader X GLcore $(MODSUBDIR)
...@@ -20,11 +16,7 @@ ...@@ -20,11 +16,7 @@
DEFINES = $(GLX_DEFINES) DEFINES = $(GLX_DEFINES)
#ifdef IHaveModules
ModuleObjectRule()
#else
NormalLibraryObjectRule() NormalLibraryObjectRule()
#endif
#ifdef IHaveSubdirs #ifdef IHaveSubdirs
MakeSubdirs($(SUBDIRS)) MakeSubdirs($(SUBDIRS))
......
nx-X11/programs/Xserver/GL/mesa/X/Imakefile
View file @ 96c9aafd
#if DoLoadableServer
#define IHaveModules
#endif
#include <Server.tmpl> #include <Server.tmpl>
#define NeedAllMesaSrc #define NeedAllMesaSrc
...@@ -42,11 +38,7 @@ LinkSourceFile(compsize.c,$(MESASRCDIR)/src/glx/x11) ...@@ -42,11 +38,7 @@ LinkSourceFile(compsize.c,$(MESASRCDIR)/src/glx/x11)
DEFINES = $(GLX_DEFINES) $(GLXSRV_DEFINES) -DNXAGENT_SERVER /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ DEFINES = $(GLX_DEFINES) $(GLXSRV_DEFINES) -DNXAGENT_SERVER /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/
#ifdef IHaveModules
ModuleObjectRule()
#else
NormalLibraryObjectRule() NormalLibraryObjectRule()
#endif
SubdirLibraryRule($(OBJS)) SubdirLibraryRule($(OBJS))
...@@ -59,10 +51,6 @@ MakeSubdirs($(SUBDIRS)) ...@@ -59,10 +51,6 @@ MakeSubdirs($(SUBDIRS))
DependSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS))
#endif #endif
#if defined(IHaveModules) && BuildModuleInSubdir
LinkSourceFile(xf86glx.c,..)
LinkSourceFile(xf86glx_util.c,..)
#endif
#ifndef MesaDrvSrcDir #ifndef MesaDrvSrcDir
#define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri #define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri
......
nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile
View file @ 96c9aafd
#if DoLoadableServer
#define IHaveModules
#endif
#include <Server.tmpl> #include <Server.tmpl>
#define NeedAllMesaSrc #define NeedAllMesaSrc
...@@ -25,11 +21,7 @@ ...@@ -25,11 +21,7 @@
DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/
#ifdef IHaveModules
ModuleObjectRule()
#else
NormalLibraryObjectRule() NormalLibraryObjectRule()
#endif
SubdirLibraryRule($(OBJS)) SubdirLibraryRule($(OBJS))
......
nx-X11/programs/Xserver/GL/mesa/main/Imakefile
View file @ 96c9aafd
#if DoLoadableServer
#define IHaveModules
#endif
/* Large PIC tables needed for Solaris/SPARC builds */ /* Large PIC tables needed for Solaris/SPARC builds */
#if defined(SunArchitecture) && defined(SparcArchitecture) && defined(LargePositionIndependentCFlags) #if defined(SunArchitecture) && defined(SparcArchitecture) && defined(LargePositionIndependentCFlags)
PICFLAGS = LargePositionIndependentCFlags PICFLAGS = LargePositionIndependentCFlags
...@@ -29,11 +25,7 @@ ...@@ -29,11 +25,7 @@
DEFINES = $(GLX_DEFINES) -DNXAGENT_SERVER /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ DEFINES = $(GLX_DEFINES) -DNXAGENT_SERVER /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/
#ifdef IHaveModules
ModuleObjectRule()
#else
NormalLibraryObjectRule() NormalLibraryObjectRule()
#endif
SubdirLibraryRule($(OBJS)) SubdirLibraryRule($(OBJS))
......
nx-X11/programs/Xserver/GL/mesa/math/Imakefile
View file @ 96c9aafd
#if DoLoadableServer
#define IHaveModules
#endif
#include <Server.tmpl> #include <Server.tmpl>
#define NeedAllMesaSrc #define NeedAllMesaSrc
...@@ -24,11 +20,7 @@ ...@@ -24,11 +20,7 @@
DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/
#ifdef IHaveModules
ModuleObjectRule()
#else
NormalLibraryObjectRule() NormalLibraryObjectRule()
#endif
SubdirLibraryRule($(OBJS)) SubdirLibraryRule($(OBJS))
......
nx-X11/programs/Xserver/GL/mesa/shader/Imakefile
View file @ 96c9aafd
#if DoLoadableServer
#define IHaveModules
#endif
#define IHaveSubdirs #define IHaveSubdirs
SUBDIRS = grammar slang SUBDIRS = grammar slang
...@@ -29,11 +26,7 @@ ...@@ -29,11 +26,7 @@
DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/
#ifdef IHaveModules
ModuleObjectRule()
#else
NormalLibraryObjectRule() NormalLibraryObjectRule()
#endif
SubdirLibraryRule($(OBJS)) SubdirLibraryRule($(OBJS))
......
nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile
View file @ 96c9aafd
#if DoLoadableServer
#define IHaveModules
#endif
#include <Server.tmpl> #include <Server.tmpl>
...@@ -25,11 +22,7 @@ ...@@ -25,11 +22,7 @@
DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/
#ifdef IHaveModules
ModuleObjectRule()
#else
NormalLibraryObjectRule() NormalLibraryObjectRule()
#endif
SubdirLibraryRule($(OBJS)) SubdirLibraryRule($(OBJS))
......
nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile
View file @ 96c9aafd
#if DoLoadableServer
#define IHaveModules
#endif
#define IHaveSubdirs #define IHaveSubdirs
SUBDIRS = library SUBDIRS = library
...@@ -28,11 +25,7 @@ ...@@ -28,11 +25,7 @@
DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/
#ifdef IHaveModules
ModuleObjectRule()
#else
NormalLibraryObjectRule() NormalLibraryObjectRule()
#endif
SubdirLibraryRule($(OBJS)) SubdirLibraryRule($(OBJS))
......
nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile
View file @ 96c9aafd
#if DoLoadableServer
#define IHaveModules
#endif
#include <Server.tmpl> #include <Server.tmpl>
...@@ -22,11 +19,7 @@ ...@@ -22,11 +19,7 @@
DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/
#ifdef IHaveModules
ModuleObjectRule()
#else
NormalLibraryObjectRule() NormalLibraryObjectRule()
#endif
DependTarget() DependTarget()
......
nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile
View file @ 96c9aafd
#if DoLoadableServer
#define IHaveModules
#endif
/* Large PIC tables needed for Solaris/SPARC builds */ /* Large PIC tables needed for Solaris/SPARC builds */
#if defined(SunArchitecture) && defined(SparcArchitecture) && defined(LargePositionIndependentCFlags) #if defined(SunArchitecture) && defined(SparcArchitecture) && defined(LargePositionIndependentCFlags)
PICFLAGS = LargePositionIndependentCFlags PICFLAGS = LargePositionIndependentCFlags
...@@ -32,11 +28,7 @@ ...@@ -32,11 +28,7 @@
DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/
#ifdef IHaveModules
ModuleObjectRule()
#else
NormalLibraryObjectRule() NormalLibraryObjectRule()
#endif
SubdirLibraryRule($(OBJS)) SubdirLibraryRule($(OBJS))
......
nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile
View file @ 96c9aafd
#if DoLoadableServer
#define IHaveModules
#endif
#include <Server.tmpl> #include <Server.tmpl>
#define NeedAllMesaSrc #define NeedAllMesaSrc
...@@ -24,11 +20,7 @@ ...@@ -24,11 +20,7 @@
DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/
#ifdef IHaveModules
ModuleObjectRule()
#else
NormalLibraryObjectRule() NormalLibraryObjectRule()
#endif
SubdirLibraryRule($(OBJS)) SubdirLibraryRule($(OBJS))
......
nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile
View file @ 96c9aafd
#if DoLoadableServer
#define IHaveModules
#endif
/* Large PIC tables needed for Solaris/SPARC builds */ /* Large PIC tables needed for Solaris/SPARC builds */
#if defined(SunArchitecture) && defined(SparcArchitecture) && defined(LargePositionIndependentCFlags) #if defined(SunArchitecture) && defined(SparcArchitecture) && defined(LargePositionIndependentCFlags)
PICFLAGS = LargePositionIndependentCFlags PICFLAGS = LargePositionIndependentCFlags
...@@ -34,11 +30,7 @@ ...@@ -34,11 +30,7 @@
DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/
#ifdef IHaveModules
ModuleObjectRule()
#else
NormalLibraryObjectRule() NormalLibraryObjectRule()
#endif
SubdirLibraryRule($(OBJS)) SubdirLibraryRule($(OBJS))
......
nx-X11/programs/Xserver/Imakefile
View file @ 96c9aafd
...@@ -61,13 +61,8 @@ INSTPGMFLAGS = ...@@ -61,13 +61,8 @@ INSTPGMFLAGS =
#define AllFBLibs PreFbLibs $(FB) PostFbLibs #define AllFBLibs PreFbLibs $(FB) PostFbLibs
#if BuildGlxExt #if BuildGlxExt
# if DoLoadableServer
GLXLIB = GL/glx/ModuleLibraryTargetName(glx) \ GLXLIB = GL/glx/ModuleLibraryTargetName(glx) \
GL/mesa/GLcore/ModuleLibraryTargetName(GLcore) GL/mesa/GLcore/ModuleLibraryTargetName(GLcore)
# else
GLXLIB = GL/glx/ModuleLibraryTargetName(glx) \
GL/mesa/GLcore/ModuleLibraryTargetName(GLcore)
# endif
GLXDIR = GL GLXDIR = GL
GLXEXT = $(GLXLIB) GLXEXT = $(GLXLIB)
#endif #endif
...@@ -101,14 +96,8 @@ INSTPGMFLAGS = ...@@ -101,14 +96,8 @@ INSTPGMFLAGS =
#ifdef SiteExtensionDirs #ifdef SiteExtensionDirs
SITEEXTDIRS = SiteExtensionDirs SITEEXTDIRS = SiteExtensionDirs
#endif #endif
#if DoLoadableServer && HasDlopen
LIBDL = DlLibrary
#endif
LIBREGEX = RegexLibrary LIBREGEX = RegexLibrary
#if DoLoadableServer
LIBCWRAPPER = os/libcwrapper.o
#endif
#if BuildRender #if BuildRender
RENDERDIR = render RENDERDIR = render
...@@ -130,46 +119,24 @@ INSTPGMFLAGS = ...@@ -130,46 +119,24 @@ INSTPGMFLAGS =
CWDIR = miext/cw CWDIR = miext/cw
COMPOSITEDIR = composite COMPOSITEDIR = composite
COMPOSITELIB = $(COMPOSITEDIR)/libcomposite.a COMPOSITELIB = $(COMPOSITEDIR)/libcomposite.a
#if DoLoadableServer
CW = miext/cw/ModuleLibraryTargetName(cw)
#else
CW = miext/cw/LibraryTargetName(cw) CW = miext/cw/LibraryTargetName(cw)
#endif #endif
#endif
#if DoLoadableServer
EXTENSIONS = $(COMPOSITELIB) $(DAMAGELIB) $(DAMAGE) $(FIXESLIB) $(CW) \
$(OTHEREXTS) $(RANDRLIB) $(RENDERLIB)
LOADABLEEXTS = $(MISCEXT) $(DBEEXT) $(RECORDEXT) $(GLXEXT)
MISCEXT = Xext/LibraryTargetName(ext)
OTHEREXTS = Xext/LibraryTargetName(exts) $(XKBEXT) $(XINPUTEXT) \
$(SITEEXTS)
#else
EXTENSIONS = $(COMPOSITELIB) $(DAMAGELIB) $(DAMAGE) $(FIXESLIB) $(CW) \ EXTENSIONS = $(COMPOSITELIB) $(DAMAGELIB) $(DAMAGE) $(FIXESLIB) $(CW) \
$(OTHEREXTS) $(GLXEXT) $(RANDRLIB) $(RENDERLIB) $(OTHEREXTS) $(GLXEXT) $(RANDRLIB) $(RENDERLIB)
OTHEREXTS = Xext/LibraryTargetName(ext) $(XKBEXT) $(XINPUTEXT) \ OTHEREXTS = Xext/LibraryTargetName(ext) $(XKBEXT) $(XINPUTEXT) \
$(DBEEXT) $(RECORDEXT) $(SITEEXTS) $(DBEEXT) $(RECORDEXT) $(SITEEXTS)
#endif
EXTDIRS = Xext $(XKBDIR) $(XIDIR) $(GLXDIR) \ EXTDIRS = Xext $(XKBDIR) $(XIDIR) $(GLXDIR) \
$(DBEDIR) $(RECORDDIR) $(SITEEXTDIRS) \ $(DBEDIR) $(RECORDDIR) $(SITEEXTDIRS) \
$(RANDRDIR) $(RENDERDIR) $(XPCONFIGDIR) \ $(RANDRDIR) $(RENDERDIR) $(XPCONFIGDIR) \
$(FIXESDIR) $(DAMAGEDIR) $(CWDIR) $(COMPOSITEDIR) $(FIXESDIR) $(DAMAGEDIR) $(CWDIR) $(COMPOSITEDIR)
OS = os/LibraryTargetName(os) OS = os/LibraryTargetName(os)
BSDEMUL = $(DEPXBSDLIB) BSDEMUL = $(DEPXBSDLIB)
#if DoLoadableServer
FB = fb/ModuleLibraryTargetName(fb)
#if (!(defined(NXAgentServer) && NXAgentServer))
DAMAGE = miext/damage/ModuleLibraryTargetName(damage)
#endif
SHADOW = miext/shadow/ModuleLibraryTargetName(shadow)
LAYER = miext/layer/ModuleLibraryTargetName(layer)
#else
FB = fb/LibraryTargetName(fb) FB = fb/LibraryTargetName(fb)
#if (!(defined(NXAgentServer) && NXAgentServer)) #if (!(defined(NXAgentServer) && NXAgentServer))
DAMAGE = miext/damage/LibraryTargetName(damage) DAMAGE = miext/damage/LibraryTargetName(damage)
#endif #endif
SHADOW = miext/shadow/LibraryTargetName(shadow) SHADOW = miext/shadow/LibraryTargetName(shadow)
LAYER = miext/layer/LibraryTargetName(layer) LAYER = miext/layer/LibraryTargetName(layer)
#endif
#if !HasFfs && (defined(mingwArchitecture) || defined(cygwinArchitecture)) #if !HasFfs && (defined(mingwArchitecture) || defined(cygwinArchitecture))
/* Order of libraries is important when linking in mingw or /* Order of libraries is important when linking in mingw or
* cygwin. libmi.a requires ffs from libdix.a. So it is added * cygwin. libmi.a requires ffs from libdix.a. So it is added
...@@ -220,11 +187,11 @@ XCOMM ...@@ -220,11 +187,11 @@ XCOMM
#if defined(NXAgentServer) && NXAgentServer #if defined(NXAgentServer) && NXAgentServer
NXAGENT = nxagent NXAGENT = nxagent
#endif #endif
#if defined(NXWinServer) && NXWinServer && !MakeDllModules #if defined(NXWinServer) && NXWinServer
NXWIN = NXWin NXWIN = NXWin
#endif #endif
#if (defined(NXAgentServer) && NXAgentServer) || \ #if (defined(NXAgentServer) && NXAgentServer) || \
(!MakeDllModules && defined(NXWinServer) && NXWinServer) (defined(NXWinServer) && NXWinServer)
MakeMutex($(NXAGENT) $(NXWIN)) MakeMutex($(NXAGENT) $(NXWIN))
#endif #endif
MakeMutex($(STDDIRS) fb) MakeMutex($(STDDIRS) fb)
...@@ -568,20 +535,3 @@ ForceSubdirs($(DEPDIRS) $(SUBDIRS)) ...@@ -568,20 +535,3 @@ ForceSubdirs($(DEPDIRS) $(SUBDIRS))
DEFAULTFONTPATH = DefaultFontPath DEFAULTFONTPATH = DefaultFontPath
EXTRAMANDEFS = -D__default_font_path__="`echo $(DEFAULTFONTPATH) | sed -e 's/,/, /g'`" EXTRAMANDEFS = -D__default_font_path__="`echo $(DEFAULTFONTPATH) | sed -e 's/,/, /g'`"
#if MakeDllModules && DoLoadableServer && \
(defined(SunArchitecture) && defined(SVR4Architecture))
XCOMM Hackery for building dlopen-able .so modules on Solaris
AllTarget(linker-deps)
LINKER_DEPS_DIRS = $(SUBDIRS)
XCOMM After everything is built, run through and generate linker dependencies
linker-deps:
RunPerlScript($(XF86SRC)/os-support/sunos/find_deps.pl,-R ProjectRoot $(LINKER_DEPS_DIRS))
for i in $(LINKER_DEPS_DIRS) ; do \
echo "relinking with dependency flags in $(CURRENT_DIR)/$$i..."; \
MakeNamedTargetSubdir($$i,NullParameter,all) ; \
done
#endif
nx-X11/programs/Xserver/Xext/Imakefile
View file @ 96c9aafd
...@@ -118,10 +118,6 @@ NormalLibraryTarget(ext,$(OBJS)) ...@@ -118,10 +118,6 @@ NormalLibraryTarget(ext,$(OBJS))
LintLibraryTarget(ext,$(SRCS)) LintLibraryTarget(ext,$(SRCS))
NormalLintTarget($(SRCS)) NormalLintTarget($(SRCS))
#if DoLoadableServer
NormalLibraryTarget(exts,$(SOBJS))
#endif
#if BuildXF86BigfontExt #if BuildXF86BigfontExt
SpecialCObjectRule(xf86bigfont,$(ICONFIGFILES),$(SHM_DEFINES)) SpecialCObjectRule(xf86bigfont,$(ICONFIGFILES),$(SHM_DEFINES))
#endif #endif
...@@ -137,10 +133,5 @@ InstallNonExecFile(SecurityPolicy,$(SERVERCONFIGDIR)) ...@@ -137,10 +133,5 @@ InstallNonExecFile(SecurityPolicy,$(SERVERCONFIGDIR))
DependTarget() DependTarget()
#if DoLoadableServer
MakeSubdirs($(SUBDIRS))
DependSubdirs($(SUBDIRS))
#endif
InstallDriverSDKNonExecFile(xvdix.h,$(DRIVERSDKINCLUDEDIR)) InstallDriverSDKNonExecFile(xvdix.h,$(DRIVERSDKINCLUDEDIR))
InstallDriverSDKNonExecFile(xvmcext.h,$(DRIVERSDKINCLUDEDIR)) InstallDriverSDKNonExecFile(xvmcext.h,$(DRIVERSDKINCLUDEDIR))
nx-X11/programs/Xserver/Xext/xvmod.c deleted 100644 → 0
View file @ 8dab7c21
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
#include <nx-X11/X.h>
#include "misc.h"
#include "scrnintstr.h"
#include "gc.h"
#include <nx-X11/extensions/Xv.h>
#include <nx-X11/extensions/Xvproto.h>
#include "xvdix.h"
#include "xvmodproc.h"
void
XvRegister()
{
XvScreenInitProc = XvScreenInit;
XvGetScreenIndexProc = XvGetScreenIndex;
XvGetRTPortProc = XvGetRTPort;
XvMCScreenInitProc = XvMCScreenInit;
}
nx-X11/programs/Xserver/Xext/xvmodproc.h deleted 100644 → 0
View file @ 8dab7c21
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#include "xvmcext.h"
extern int (*XvGetScreenIndexProc)(void);
extern unsigned long (*XvGetRTPortProc)(void);
extern int (*XvScreenInitProc)(ScreenPtr);
extern int (*XvMCScreenInitProc)(ScreenPtr, int, XvMCAdaptorPtr);
extern void XvRegister(void);
nx-X11/programs/Xserver/dbe/Imakefile
View file @ 96c9aafd
#if DoLoadableServer
#define IHaveSubdirs
#endif
#include <Server.tmpl> #include <Server.tmpl>
#if DoLoadableServer
SUBDIRS = module
#endif
SRCS = dbe.c midbe.c SRCS = dbe.c midbe.c
OBJS = dbe.o midbe.o OBJS = dbe.o midbe.o
...@@ -20,10 +13,6 @@ NormalLibraryTarget(dbe,$(OBJS)) ...@@ -20,10 +13,6 @@ NormalLibraryTarget(dbe,$(OBJS))
LintLibraryTarget(dbe,$(SRCS)) LintLibraryTarget(dbe,$(SRCS))
NormalLintTarget($(SRCS)) NormalLintTarget($(SRCS))
#if DoLoadableServer
MakeSubdirs($(SUBDIRS))
DependSubdirs($(SUBDIRS))
#endif
DependTarget() DependTarget()
nx-X11/programs/Xserver/dbe/dbemodule.c deleted 100644 → 0
View file @ 8dab7c21
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
#include "xf86Module.h"
#include "globals.h"
static MODULESETUPPROTO(dbeSetup);
extern void DbeExtensionInit(void);
ExtensionModule dbeExt = {
DbeExtensionInit,
"DOUBLE-BUFFER",
&noDbeExtension,
NULL,
NULL
};
static XF86ModuleVersionInfo VersRec =
{
"dbe",
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
XORG_VERSION_CURRENT,
1, 0, 0,
ABI_CLASS_EXTENSION,
ABI_EXTENSION_VERSION,
MOD_CLASS_EXTENSION,
{0,0,0,0}
};
/*
* Data for the loader
*/
XF86ModuleData dbeModuleData = { &VersRec, dbeSetup, NULL };
static void *
dbeSetup(void * module, void * opts, int *errmaj, int *errmin)
{
LoadExtension(&dbeExt, FALSE);
/* Need a non-NULL return value to indicate success */
return (void *)1;
}
nx-X11/programs/Xserver/dbe/module/Imakefile deleted 100644 → 0
View file @ 8dab7c21
#define IHaveModules
#include <Server.tmpl>
#if DoLoadableServer
MSRCS = dbemodule.c
MOBJS = dbemodule.o
#endif
SRCS = dbe.c midbe.c $(MSRCS)
OBJS = dbe.o midbe.o $(MOBJS)
INCLUDES = -I.. -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(EXTINCSRC) $(EXTRAINCLUDES)
LINTLIBS = ../../dix/llib-ldix.ln ../../os/llib-los.ln
DEFINES = $(EXT_DEFINES)
LinkSourceFile(dbemodule.c,..)
LinkSourceFile(midbe.c,..)
LinkSourceFile(dbe.c,..)
ModuleObjectRule()
LibraryModuleTarget(dbe,$(OBJS))
LintLibraryTarget(dbe,$(SRCS))
NormalLintTarget($(SRCS))
InstallLibraryModule(dbe,$(MODULEDIR),extensions)
DependTarget()
InstallDriverSDKLibraryModule(dbe,$(DRIVERSDKMODULEDIR),extensions)
nx-X11/programs/Xserver/fb/Imakefile
View file @ 96c9aafd
...@@ -17,14 +17,6 @@ SpecialCObjectRule(fbcopy,fbcopy.c,$(USEMMXOPTIONS)) ...@@ -17,14 +17,6 @@ SpecialCObjectRule(fbcopy,fbcopy.c,$(USEMMXOPTIONS))
#endif #endif
*/ */
#if DoLoadableServer
#if !BuildModuleInSubdir
#define IHaveModules
#elif !defined(IHaveModules)
#define IHaveSubdirs
SUBDIRS = module
#endif
#endif
#include <Server.tmpl> #include <Server.tmpl>
...@@ -32,10 +24,6 @@ SUBDIRS = module ...@@ -32,10 +24,6 @@ SUBDIRS = module
FB_DEFINES=-DFBNOPIXADDR -DFBNO24BIT FB_DEFINES=-DFBNOPIXADDR -DFBNO24BIT
#endif #endif
#if defined(IHaveModules)
XFMODSRC = fbmodule.c
XFMODOBJ = fbmodule.o
#endif
#if BuildRender #if BuildRender
RENDERSRC = fbcompose.c RENDERSRC = fbcompose.c
...@@ -131,21 +119,13 @@ OBJS = $(XFMODOBJ) \ ...@@ -131,21 +119,13 @@ OBJS = $(XFMODOBJ) \
LINTLIBS = $(SERVERSRC)/dix/llib-ldix.ln $(SERVERSRC)/os/llib-los.ln \ LINTLIBS = $(SERVERSRC)/dix/llib-ldix.ln $(SERVERSRC)/os/llib-los.ln \
$(SERVERSRC)/mi/llib-lmi.ln $(SERVERSRC)/mi/llib-lmi.ln
#ifdef IHaveModules
ModuleObjectRule()
LibraryModuleTarget(fb,$(OBJS))
#else
NormalLibraryObjectRule() NormalLibraryObjectRule()
NormalLibraryTarget(fb,$(OBJS)) NormalLibraryTarget(fb,$(OBJS))
#endif
LintLibraryTarget(fb,$(SRCS)) LintLibraryTarget(fb,$(SRCS))
NormalLintTarget($(SRCS)) NormalLintTarget($(SRCS))
#ifdef IHaveModules
InstallLibraryModule(fb,$(MODULEDIR),.)
#endif
DependTarget() DependTarget()
......
nx-X11/programs/Xserver/fb/fbmodule.c deleted 100644 → 0
View file @ 8dab7c21
/*
* Copyright (C) 1998 The XFree86 Project, Inc. All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
* Except as contained in this notice, the name of the XFree86 Project shall
* not be used in advertising or otherwise to promote the sale, use or other
* dealings in this Software without prior written authorization from the
* XFree86 Project.
*/
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
#ifdef XFree86LOADER
#include "xf86Module.h"
#include "fb.h"
static XF86ModuleVersionInfo VersRec =
{
"fb",
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
XORG_VERSION_CURRENT,
1, 0, 0,
ABI_CLASS_ANSIC, /* Only need the ansic layer */
ABI_ANSIC_VERSION,
MOD_CLASS_NONE,
{0,0,0,0} /* signature, to be patched into the file by a tool */
};
XF86ModuleData fbModuleData = { &VersRec, NULL, NULL };
#endif
nx-X11/programs/Xserver/fb/module/Imakefile deleted 100644 → 0
View file @ 8dab7c21
#define IHaveModules
#define LinkDirectory ..
#include "../Imakefile"
nx-X11/programs/Xserver/include/Imakefile
View file @ 96c9aafd
...@@ -2,10 +2,6 @@ HEADERS = os.h misc.h ...@@ -2,10 +2,6 @@ HEADERS = os.h misc.h
#if defined(XorgVersion) \ #if defined(XorgVersion) \
|| defined(BSDOSArchitecture) || defined(BSDOSArchitecture)
#if DoLoadableServer
LinkSourceFile(xf86Module.h,$(XF86COMSRC))
LinkSourceFile(xf86Opt.h,$(XF86COMSRC))
#endif
#endif #endif
LinkSourceFile(osdep.h,../os) LinkSourceFile(osdep.h,../os)
......
nx-X11/programs/Xserver/mi/Imakefile
View file @ 96c9aafd
...@@ -36,12 +36,8 @@ CBRT_OBJ = cbrt.o ...@@ -36,12 +36,8 @@ CBRT_OBJ = cbrt.o
FFS_DEFINES = -DHAS_FFS FFS_DEFINES = -DHAS_FFS
#endif #endif
#if DoLoadableServer
EXTRAMIINITEXTOBJ = miinitext.o
#else
MIINITEXTSRC = miinitext.c MIINITEXTSRC = miinitext.c
MIINITEXTOBJ = miinitext.o MIINITEXTOBJ = miinitext.o
#endif
#if (!(defined(NXAgentServer) && NXAgentServer)) #if (!(defined(NXAgentServer) && NXAgentServer))
NXAGENT_SKIP_SRCS = \ NXAGENT_SKIP_SRCS = \
......
nx-X11/programs/Xserver/miext/cw/Imakefile
View file @ 96c9aafd
#define IHaveModules
#include <Server.tmpl> #include <Server.tmpl>
SRCS = cw.c cw_ops.c cw_render.c SRCS = cw.c cw_ops.c cw_render.c
......
nx-X11/programs/Xserver/os/Imakefile
View file @ 96c9aafd
...@@ -188,9 +188,4 @@ SpecialCObjectRule(oscolor,$(ICONFIGFILES),$(DBM_DEFINES)) ...@@ -188,9 +188,4 @@ SpecialCObjectRule(oscolor,$(ICONFIGFILES),$(DBM_DEFINES))
LinkSourceFile(snprintf.c,$(LIBSRC)/misc) LinkSourceFile(snprintf.c,$(LIBSRC)/misc)
#endif #endif
#if DoLoadableServer
AllTarget(libcwrapper.o)
ObjectFromSpecialSource(libcwrapper,$(XF86OSSRC)/shared/libc_wrapper,-DSELF_CONTAINED_WRAPPER)
#endif
DependTarget() DependTarget()
nx-X11/programs/Xserver/record/Imakefile
View file @ 96c9aafd
NULL = NULL =
#if DoLoadableServer
#define IHaveSubdirs
#endif
#include <Server.tmpl> #include <Server.tmpl>
#if DoLoadableServer
SUBDIRS = module
#endif
SRCS = record.c set.c SRCS = record.c set.c
OBJS = record.o set.o OBJS = record.o set.o
INCLUDES = -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(SERVERSRC)/Xext `pkg-config --cflags-only-I pixman-1` INCLUDES = -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(SERVERSRC)/Xext `pkg-config --cflags-only-I pixman-1`
...@@ -28,9 +22,5 @@ NormalLibraryTarget(record,$(OBJS)) ...@@ -28,9 +22,5 @@ NormalLibraryTarget(record,$(OBJS))
LintLibraryTarget(record,$(SRCS)) LintLibraryTarget(record,$(SRCS))
NormalLintTarget($(SRCS)) NormalLintTarget($(SRCS))
#if DoLoadableServer
MakeSubdirs($(SUBDIRS))
DependSubdirs($(SUBDIRS))
#endif
DependTarget() DependTarget()
nx-X11/programs/Xserver/record/module/Imakefile deleted 100644 → 0
View file @ 8dab7c21
#define IHaveModules
#include <Server.tmpl>
#if DoLoadableServer
MSRCS = recordmod.c
MOBJS = recordmod.o
#endif
SRCS = record.c set.c $(MSRCS)
OBJS = record.o set.o $(MOBJS)
INCLUDES = -I.. -I../../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \
-I$(SERVERSRC)/Xext
LINTLIBS = ../../dix/llib-ldix.ln
DEFINES = -DNDEBUG
LinkSourceFile(recordmod.c,..)
LinkSourceFile(record.c,..)
LinkSourceFile(set.c,..)
ModuleObjectRule()
LibraryModuleTarget(record,$(OBJS))
LintLibraryTarget(record,$(SRCS))
NormalLintTarget($(SRCS))
InstallLibraryModule(record,$(MODULEDIR),extensions)
DependTarget()
InstallDriverSDKLibraryModule(record,$(DRIVERSDKMODULEDIR),extensions)
nx-X11/programs/Xserver/record/recordmod.c deleted 100644 → 0
View file @ 8dab7c21
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
#include "xf86Module.h"
extern Bool noTestExtensions;
static MODULESETUPPROTO(recordSetup);
extern void RecordExtensionInit(void);
ExtensionModule recordExt = {
RecordExtensionInit,
"RECORD",
&noTestExtensions,
NULL,
NULL
};
static XF86ModuleVersionInfo VersRec = {
"record",
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
XORG_VERSION_CURRENT,
1, 13, 0,
ABI_CLASS_EXTENSION,
ABI_EXTENSION_VERSION,
MOD_CLASS_EXTENSION,
{0,0,0,0}
};
XF86ModuleData recordModuleData = { &VersRec, recordSetup, NULL };
static void *
recordSetup(void * module, void * opts, int *errmaj, int *errmin)
{
LoadExtension(&recordExt, FALSE);
/* Need a non-NULL return value to indicate success */
return (void *)1;
}
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