From 96c9aafd6bf6d09ce2e98a77685f5e25b9009e35 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Sat, 29 Oct 2016 22:52:53 +0200
Subject: 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.
---
 nx-X11/config/cf/xorg.tmpl | 75 ----------------------------------------------
 1 file changed, 75 deletions(-)

(limited to 'nx-X11/config/cf/xorg.tmpl')

diff --git a/nx-X11/config/cf/xorg.tmpl b/nx-X11/config/cf/xorg.tmpl
index c5f332b3a..2737ebdf9 100644
--- a/nx-X11/config/cf/xorg.tmpl
+++ b/nx-X11/config/cf/xorg.tmpl
@@ -64,79 +64,4 @@ BUILDERADDR = "xorg@lists.freedesktop.org"
 #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 */
-- 
cgit v1.2.3