freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freetype2-demos] master 1c3e44f: Remove obsolete Jamfiles from the tree


From: Werner LEMBERG
Subject: [freetype2-demos] master 1c3e44f: Remove obsolete Jamfiles from the tree.
Date: Mon, 18 May 2020 12:00:59 -0400 (EDT)

branch: master
commit 1c3e44f203dabe688631d542fbc7c9a9b2be9497
Author: David Turner <address@hidden>
Commit: Werner Lemberg <address@hidden>

    Remove obsolete Jamfiles from the tree.
    
    These are not used anymore.
    
    * Jamrules, src/Jamfile, graph/Jamfile, graph/*/Jamfile: Delete.
---
 ChangeLog           |  8 +++++++
 Jamfile             | 27 ----------------------
 Jamrules            | 66 -----------------------------------------------------
 README              |  8 +++----
 graph/Jamfile       | 58 ----------------------------------------------
 graph/beos/Jamfile  | 12 ----------
 graph/os2/Jamfile   | 13 -----------
 graph/win32/Jamfile | 19 ---------------
 graph/x11/Jamfile   | 12 ----------
 src/Jamfile         | 55 --------------------------------------------
 10 files changed, 12 insertions(+), 266 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1bda7ef..5339250 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2020-05-01  David Turner  <address@hidden>
+
+       Remove obsolete Jamfiles from the tree.
+
+       These are not used anymore.
+
+       * Jamrules, src/Jamfile, graph/Jamfile, graph/*/Jamfile: Delete.
+
 2020-05-16  Alexei Podtelezhnikov  <address@hidden>
 
        * graph/x11/grx11.c (gr_x11_device_init): Reduce nesting and clean up.
diff --git a/Jamfile b/Jamfile
deleted file mode 100644
index b1c72cb..0000000
--- a/Jamfile
+++ /dev/null
@@ -1,27 +0,0 @@
-# FreeType2 demos top Jamfile (c) 2001 David Turner
-#
-
-if $(FT2DEMO_TOP) != $(DOT)
-{
-  SubDir  FT2DEMO_TOP ;
-}
-
-# compile FreeType library here!
-#
-FT2_TOP ?= ../freetype2 ;
-
-SubInclude FT2_TOP ;
-
-FT2DEMO_SRC   = [ FT2DEMO_SubDir  src ] ;
-FT2DEMO_GRAPH = [ FT2DEMO_SubDir  graph ] ;
-
-# Include Graph sub-system rules
-#
-SubInclude  FT2DEMO_GRAPH ;
-
-# Include demos rules
-#
-SubInclude  FT2DEMO_SRC ;
-
-
-# end of top Jamfile
diff --git a/Jamrules b/Jamrules
deleted file mode 100644
index 7515254..0000000
--- a/Jamrules
+++ /dev/null
@@ -1,66 +0,0 @@
-# FreeType 2 Demos JamRules (c) 2001 David Turner
-#
-# This file contains the Jam rules needed to build the FreeType 2 Demos.
-# It is shared by all Jamfiles and is included only once in the build
-# process.
-#
-
-
-# Determine prefix of library file.  We must use "libxxxxx" on Unix systems,
-# while all other simply use the real name.
-#
-if $(UNIX)
-{
-  LIBPREFIX ?= lib ;
-}
-else
-{
-  LIBPREFIX ?= "" ;
-}
-
-
-FT2_TOP ?= [ FDirName $(DOTDOT) freetype2 ] ;
-
-# FT2_INCLUDE contains the location of the public FreeType 2 header files
-# it is ../freetype2/include by default
-#
-FT2_INCLUDE ?= [ FDirName $(FT2_TOP) include ] ;
-
-
-# FT2_LIB contains the path to the FreeType 2 library object
-#
-FT2_LIB ?= [ FDirName $(FT2_TOP) objs $(LIBPREFIX)freetype ] ;
-
-# X11_LINKLIBS is only used when compiling the X11 graphics back-end
-# this should be generated from a "configure" script on Unix
-#
-X11_LINKLIBS = -lX11 -L/usr/X11R6/lib ;
-
-
-# FT2DEMO_TOP contains the location of the FreeType demos directory.
-#
-FT2DEMO_TOP ?= $(DOT) ;
-
-
-# Define a new rule used to declare a sub directory of the Nirvana source
-# tree.
-#
-rule FT2DEMO_SubDir
-{
-  if $(FT2DEMO_TOP) = $(DOT)
-  {
-    return [ FDirName  $(<) ] ;
-  }
-  else
-  {
-    return [ FDirName  $(FT2DEMO_TOP) $(<) ] ;
-  }
-}
-
-# We also set ALL_LOCATE_TARGET in order to place all object and library
-# files in "objs".
-#
-ALL_LOCATE_TARGET ?= [ FT2DEMO_SubDir  objs ] ;
-
-
-# end of Jamrules
diff --git a/README b/README
index e6972ba..9817f75 100644
--- a/README
+++ b/README
@@ -3,10 +3,10 @@ This package contains example programs for the FreeType 2 
library.
 
 WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
 
-  The Makefile and Jamfile contained in this directory assume that the
-  FreeType 2  library sources are  located in `../freetype2'.   If you
-  downloaded one  of the  stable FreeType 2  source packages  from our
-  server, you most probably have to rename its directory, for example:
+  The Makefile contained in this  directory assume that the FreeType 2
+  library sources  are located  in `../freetype2'.  If  you downloaded
+  one of  the stable FreeType 2  source packages from our  server, you
+  most probably have to rename its directory, for example:
 
     mv freetype-2.10.2 freetype2       on Unix
     rename freetype-2.10.2 freetype2   on Windows
diff --git a/graph/Jamfile b/graph/Jamfile
deleted file mode 100644
index e8a6d90..0000000
--- a/graph/Jamfile
+++ /dev/null
@@ -1,58 +0,0 @@
-# FreeType2 demo graph Jamfile (c) 2001 David Turner
-#
-
-SubDir  FT2DEMO_TOP graph ;
-
-GRAPH_INCLUDE = $(FT2DEMO_GRAPH) ;
-GRAPH_LIB     = $(LIBPREFIX)graph$(SUFLIB) ;
-
-graph_sources = grblit
-                grobjs
-                grfont
-                grdevice
-                grinit
-                gblender
-                gblblit
-                grfill
-                grswizzle
-                ;
-
-if $(OS) = BEOS
-{
-  DEVICE_DEFINE = -DDEVICE_BEOS ;
-}
-else if $(UNIX)
-{
-  DEVICE_DEFINE = -DDEVICE_X11 ;
-}
-else if $(NT)
-{
-  DEVICE_DEFINE = -DDEVICE_WIN32 ;
-}
-else if $(OS2)
-{
-  DEVICE_DEFINE = -DDEVICE_OS2 ;
-}
-
-CCFLAGS on <graph>grinit$(SUFOBJ) = $(CCFLAGS) $(DEVICE_DEFINE) ;
-
-Library  $(GRAPH_LIB) : $(graph_sources).c ;
-
-if $(OS) = BEOS
-{
-  SubInclude  FT2DEMO_TOP graph beos ;
-}
-else if $(UNIX)
-{
-  SubInclude  FT2DEMO_TOP graph x11 ;
-}
-else if $(NT)
-{
-  SubInclude  FT2DEMO_TOP graph win32 ;
-}
-else if $(OS2)
-{
-  SubInclude  FT2DEMO_TOP graph os2 ;
-}
-
-# end of graph Jamfile
diff --git a/graph/beos/Jamfile b/graph/beos/Jamfile
deleted file mode 100644
index c49b606..0000000
--- a/graph/beos/Jamfile
+++ /dev/null
@@ -1,12 +0,0 @@
-# FreeType2 demos graph/beos Jamfile (c) 2002 David Turner
-#
-
-SubDir  FT2DEMO_TOP graph beos ;
-
-SubDirHdrs  $(GRAPH_INCLUDE) ;
-
-GRAPH_LINKLIBS = -lbe -lstdc++.r4 ;
-
-Library  $(GRAPH_LIB) : grbeos.cpp ;
-
-# end of graph/beos Jamfile
diff --git a/graph/os2/Jamfile b/graph/os2/Jamfile
deleted file mode 100644
index 3b21246..0000000
--- a/graph/os2/Jamfile
+++ /dev/null
@@ -1,13 +0,0 @@
-# FreeType2 demos graph/os2 Jamfile (c) 2001 David Turner
-#
-
-SubDir  FT2DEMO_TOP graph os2 ;
-
-SubDirHdrs  $(GRAPH_INCLUDE) ;
-
-GROS2_PATH     = [ FT2_SubDir graph os2 ];
-GRAPH_LINKLIBS = $(GROS2_PATH)gros2pm.def ;
-
-Library  $(GRAPH_LIB) : grxos2.c ;
-
-# end of graph/os2 Jamfile
diff --git a/graph/win32/Jamfile b/graph/win32/Jamfile
deleted file mode 100644
index d93dd64..0000000
--- a/graph/win32/Jamfile
+++ /dev/null
@@ -1,19 +0,0 @@
-# FreeType2 demos graph/win32 Jamfile (c) 2001 David Turner
-#
-
-SubDir  FT2DEMO_TOP graph win32 ;
-
-SubDirHdrs  $(GRAPH_INCLUDE) ;
-
-if $(JAM_TOOLSET) = MINGW
-{
-  GRAPH_LINKLIBS = "-luser32 -lgdi32" ;
-}
-else
-{
-  GRAPH_LINKLIBS = user32.lib gdi32.lib ;
-}
-
-Library  $(GRAPH_LIB) : grwin32.c ;
-
-# end of graph/win32 Jamfile
diff --git a/graph/x11/Jamfile b/graph/x11/Jamfile
deleted file mode 100644
index 7ac9389..0000000
--- a/graph/x11/Jamfile
+++ /dev/null
@@ -1,12 +0,0 @@
-# FreeType2 demos graph/x11 Jamfile (c) 2001 David Turner
-#
-
-SubDir  FT2DEMO_TOP graph x11 ;
-
-SubDirHdrs  $(GRAPH_INCLUDE) ;
-
-GRAPH_LINKLIBS = -lX11 -L/usr/X11R6/lib ;
-
-Library  $(GRAPH_LIB) : grx11.c ;
-
-# end of graph/x11 Jamfile
diff --git a/src/Jamfile b/src/Jamfile
deleted file mode 100644
index eec4ac9..0000000
--- a/src/Jamfile
+++ /dev/null
@@ -1,55 +0,0 @@
-# FreeType 2 src Jamfile (c) 2001, 2003, 2004, 2005, 2007 David Turner
-#
-
-SubDir  FT2DEMO_TOP src ;
-
-SubDirHdrs  $(FT2_INCLUDE) ;
-SubDirHdrs  [ FT2DEMO_SubDir  src ] ;
-SubDirHdrs  [ FT2DEMO_SubDir  graph ] ;
-
-COMMON_LIB = $(LIBPREFIX)ft2common ;
-
-Library  $(COMMON_LIB) : ftcommon.c common.c output.c mlgetopt.c ;
-
-
-if $(UNIX)
-{
-  CCDEFS += UNIX ;
-  LINKLIBS += -lm ;
-}
-
-PROGRAMS = ftbench ftlint ftdump fttimer ftchkwd ftvalid ftpatchk ;
-GRAPHIC_PROGRAMS = ftview ftmulti ftstring ftgamma ftgrid ftdiff ;
-{
-  local  t ;
-
-  for t in $(PROGRAMS) $(GRAPHIC_PROGRAMS)
-  {
-    Main           $(t) : $(t).c ;
-    LinkLibraries  $(t) : $(COMMON_LIB) $(FT2_LIB) ;
-  }
-
-  for t in $(GRAPHIC_PROGRAMS)
-  {
-    LINKLIBS on $(t)$(SUFEXE) = $(LINKLIBS) $(GRAPH_LINKLIBS) ;
-    LinkLibraries  $(t) : $(GRAPH_LIB) ;
-  }
-}
-
-
-# Compile bytecode debugger when needed. Define the environment
-# variable FT2_DEBUG_TT to enable this one before calling "jam"
-#
-if $(FT2_DEBUG_TT)
-{
-  if $(UNIX) { DEFINES += UNIX ; }
-  SubDirHdrs $(FT2_INCLUDE)/../src/truetype ;
-
-  LinkLibraries  ttdebug : $(FT2_LIB) ;
-  Main           ttdebug : ttdebug.c ;
-}
-
-Main  gbench : gbench.c ;
-
-
-# end of src Jamfile



reply via email to

[Prev in Thread] Current Thread [Next in Thread]