Merge branch 'sunweaver-pr/libxfont-cleanup' into arctica-3.6.x

Attributes GH PR #14: https://github.com/ArcticaProject/nx-libs/pull/14

1 files changed, 0 insertions, 178 deletions

diff --git a/nx-X11/lib/font/Imakefile b/nx-X11/lib/font/Imakefile
deleted file mode 100644
index f47fe963c..000000000
--- a/nx-X11/lib/font/Imakefile
+++ /dev/null
@@ -1,178 +0,0 @@
-XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:24 cpqbld Exp $
-
-
-
-
-XCOMM $XFree86: xc/lib/font/Imakefile,v 3.37 2003/10/24 16:21:12 tsi Exp $
-
-#include <Server.tmpl>
-
-#define	IHaveSubdirs
-
-#define DoNormalLib NormalLibFont
-#define DoSharedLib SharedLibFont
-#define DoExtraLib SharedLibFont
-#define DoDebugLib DebugLibFont
-#define DoProfileLib ProfileLibFont
-
-#if !BuildFontLib
-#define LibCreate NO
-#else
-#define LibCreate YES
-#endif
-
-#if BuildLibraries
-#define LibInstall YES
-#else
-#define LibInstall NO
-#endif
-
-#if BuildLibraries
-STUBDIRS = stubs
-#endif
-
-LIBNAME = NX_Xfont
-SOREV = $(SOFONTREV)
-
-#ifndef SeparateSharedCompile
-#define SeparateSharedCompile YES
-#endif
-#if NormalLibFont && SharedLibFont && SeparateSharedCompile
-STATIC_OBJSDIR = unshared/
-#endif
-
-#ifdef SharedXfontReqs
-REQUIREDLIBS = SharedXfontReqs
-#endif
-
-#if BuildSpeedo
-         SPEEDODIRS = Speedo
-   SPEEDOSHAREDOBJS = Speedo/?*.o
-   SPEEDOSTATICOBJS = Speedo/$(STATIC_OBJSDIR)?*.o
-    SPEEDODEBUGOBJS = Speedo/debugger/?*.o
-  SPEEDOPROFILEOBJS = Speedo/profiled/?*.o
-        SPEEDODONES = Speedo/DONE
-#endif
-#if BuildType1 || BuildCID
-          TYPE1DIRS = Type1
-    TYPE1SHAREDOBJS = Type1/?*.o
-    TYPE1STATICOBJS = Type1/$(STATIC_OBJSDIR)?*.o
-     TYPE1DEBUGOBJS = Type1/debugger/?*.o
-   TYPE1PROFILEOBJS = Type1/profiled/?*.o
-         TYPE1DONES = Type1/DONE
-#endif
-#if BuildFreeType || BuildFreetype2Library
-       FREETYPEDIRS = FreeType
- FREETYPESHAREDOBJS = FreeType/?*.o
- FREETYPESTATICOBJS = FreeType/$(STATIC_OBJSDIR)?*.o
-  FREETYPEDEBUGOBJS = FreeType/debugger/?*.o
-FREETYPEPROFILEOBJS = FreeType/profiled/?*.o
-      FREETYPEDONES = FreeType/DONE
-#endif
-#if BuildBuiltinFonts
-        BUILTINDIRS = builtins
-  BUILTINSHAREDOBJS = builtins/?*.o
-  BUILTINSTATICOBJS = builtins/$(STATIC_OBJSDIR)?*.o
-   BUILTINDEBUGOBJS = builtins/debugger/?*.o
- BUILTINPROFILEOBJS = builtins/profiled/?*.o
-       BUILTINDONES = builtins/DONE
-#endif
-#if BuildFontCache
-      FONTCACHEDIRS = fontcache
-FONTCACHESHAREDOBJS = fontcache/?*.o
-FONTCACHESTATICOBJS = fontcache/$(STATIC_OBJSDIR)?*.o
- FONTCACHEDEBUGOBJS = fontcache/debugger/?*.o
-FONTCACHEPROFILEOBJS = fontcache/profiled/?*.o
-     FONTCACHEDONES = fontcache/DONE
-#endif
-
-       SUBDIRS = bitmap fontfile fc $(FONTCACHEDIRS) \
-		 $(SPEEDODIRS) $(TYPE1DIRS) \
-		 $(FREETYPEDIRS) $(BUILTINDIRS) \
-		 util $(STUBDIRS) include
-   SHARED_OBJS = bitmap/?*.o fontfile/?*.o fc/?*.o $(FONTCACHESHAREDOBJS) \
-		 $(SPEEDOSHAREDOBJS) $(TYPE1SHAREDOBJS) \
-		 $(FREETYPESHAREDOBJS) \
-		 $(BUILTINSHAREDOBJS) util/?*.o
-   STATIC_OBJS = bitmap/$(STATIC_OBJSDIR)?*.o fontfile/$(STATIC_OBJSDIR)?*.o \
-		 fc/$(STATIC_OBJSDIR)?*.o $(FONTCACHESTATICOBJS) \
-		 $(SPEEDOSTATICOBJS) $(TYPE1STATICOBJS) \
-		 $(FREETYPESTATICOBJS) \
-		 $(BUILTINSTATICOBJS) util/$(STATIC_OBJSDIR)?*.o
-    DEBUG_OBJS = bitmap/debugger/?*.o fontfile/debugger/?*.o fc/debugger/?*.o \
-		 $(FONTCACHEDEBUGOBJS) \
-		 $(SPEEDODEBUGOBJS) $(TYPE1DEBUGOBJS) \
-		 $(FREETYPEDEBUGOBJS) \
-		 $(BUILTINDEBUGOBJS) util/debugger/?*.o
-  PROFILE_OBJS = bitmap/profiled/?*.o fontfile/profiled/?*.o fc/profiled/?*.o \
-		 $(FONTCACHEPROFILEOBJS) \
-		 $(SPEEDOPROFILEOBJS) $(TYPE1PROFILEOBJS) \
-		 $(FREETYPEPROFILEOBJS) \
-		 $(BUILTINPROFILEOBJS) util/profiled/?*.o
-         DONES = bitmap/DONE fontfile/DONE fc/DONE $(FONTCACHEDONES) \
-		 $(SPEEDODONES) $(TYPE1DONES) \
-		 $(FREETYPEDONES) \
-		 $(BUILTINDONES) util/DONE
-
-#if BuildServer && DoLoadableServer
-      BASEDIRS = fontfile fc util $(FONTCACHEDIRS)
-   BASELIBOBJS = fontfile/$(STATIC_OBJSDIR)?*.o fc/$(STATIC_OBJSDIR)?*.o \
-		 util/$(STATIC_OBJSDIR)?*.o $(FONTCACHESTATICOBJS)
-      BASEOBJS = fontfile/module/ffcheck.o fontfile/module/register.o \
-		 util/private.o
-     BASEDONES = fontfile/DONE fontfile/module/DONE fc/DONE util/DONE \
-		 $(FONTCACHEDONES)
-#endif
-
-#if HasParallelMake
-MakeMutex($(SUBDIRS) $(DONES))
-#endif
-
-#if HasGnuMake || HasBsdMake
-$(DONES): $(SUBDIRS)
-#endif
-
-#include <Library.tmpl>
-
-#undef _LinkBuildLibrary
-#define _LinkBuildLibrary(lib) LinkBuildLibrary(lib)
-
-#if LibCreate
-#if NormalLibFont
-NormalDepLibraryTarget($(LIBNAME),$(SUBDIRS) $(DONES),$(STATIC_OBJS))
-#if LibInstall
-InstallLibrary($(LIBNAME),$(USRLIBDIR))
-#endif /* LibInstall */
-#endif /* NormalLibFont */
-
-#if SharedLibFont
-SharedDepLibraryTarget($(LIBNAME),$(SOREV),$(SUBDIRS) $(DONES),$(SHARED_OBJS),.,.)
-#if LibInstall
-InstallSharedLibrary($(LIBNAME),$(SOREV),$(SHLIBDIR))
-#endif /* LibInstall */
-#endif /* SharedLibFont */
-
-#if DebugLibFont
-DebuggedDepLibraryTarget($(LIBNAME),$(SUBDIRS) $(DONES),$(DEBUG_OBJS))
-#if LibInstall
-InstallLibrary($(LIBNAME)_d,$(USRLIBDIR))
-#endif /* LibInstall */
-#endif /* DebugLibFont */
-
-#if ProfileLibFont
-ProfiledDepLibraryTarget($(LIBNAME),$(SUBDIRS) $(DONES),$(PROFILE_OBJS))
-#if LibInstall
-InstallLibrary($(LIBNAME)_p,$(USRLIBDIR))
-#endif /* LibInstall */
-#endif /* ProfileLibFont */
-#endif /* LibCreate */
-
-#if BuildServer && DoLoadableServer
-NormalDepLibraryTarget(fontbase,$(BASEDIRS) $(BASEDONES),$(BASELIBOBJS))
-NormalDepRelocatableTarget(fontbase,$(BASEDIRS) $(BASEDONES),$(BASEOBJS))
-#endif
-
-
-ForceSubdirs($(SUBDIRS))
-
-DependSubdirs($(SUBDIRS))