From 7800179a21ffd828f63a591863969db5ce697f95 Mon Sep 17 00:00:00 2001 From: David Turner Date: Fri, 8 Mar 2002 18:17:46 +0000 Subject: Changing Jamfile.in and Jamfile to remove experimental libtool support (it didn't work exactl well :-() --- ChangeLog | 5 +++-- Jamfile | 7 +++++++ Jamfile.in | 19 ++----------------- 3 files changed, 12 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index e48638f9c..73981f7a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,8 @@ 2002-03-08 David Turner - * Jamfile.in: Adding template file to support libtool with Jam on - Unix. + * Jamfile.in, Jamfile: Adding the template file that will be used to + support libtool with Jam on Unix in the near future. I have experimented + with this and haven't found a valid solution for now though.. :-( 2002-03-08 Werner Lemberg diff --git a/Jamfile b/Jamfile index 724b71265..9272ffdc8 100644 --- a/Jamfile +++ b/Jamfile @@ -15,6 +15,13 @@ FT2_SRC = [ FT2_SubDir src ] ; FT2_LIB = $(LIBPREFIX)freetype ; + +# We don't support libtool just yet. It seems that this is not +# so simple with Jam, but I'll study this topic later.. +# + +# used only when trying to debug the hinter(s) +# if $(DEBUG_HINTER) { CCFLAGS += -DDEBUG_HINTER ; diff --git a/Jamfile.in b/Jamfile.in index 70a9402c3..9272ffdc8 100644 --- a/Jamfile.in +++ b/Jamfile.in @@ -16,24 +16,9 @@ FT2_SRC = [ FT2_SubDir src ] ; FT2_LIB = $(LIBPREFIX)freetype ; -# Libtool support, this is actually generated from a template in Jamfile.in !! -# we may move this code into 'builds/unix' someday to make the top-level -# Jamfile cleaner.. +# We don't support libtool just yet. It seems that this is not +# so simple with Jam, but I'll study this topic later.. # -if $(UNIX) && ! $(FT2_DEVEL) -{ - LIBTOOL = [ FT2_SubDir builds unix libtool ] ; - - CCFLAGS = @XX_CFLAGS@ @XX_ANSIFLAGS@ @CFLAGS@ ; - - CC = $(LIBTOOL) --mode=compile $(CC) ; - - LINK = $(LIBTOOL) --mode=link $(LINK) -rpath @libdir@ - -version_info @version_info@ ; - - LINKFLAGS = @LDFLAGS@ ; -} - # used only when trying to debug the hinter(s) # -- cgit v1.2.1