Skip to content

Commit 81cff17

Browse files
committed
updated manifest; removed gtkgd
svn path=/trunk/matplotlib/; revision=192
1 parent c7dfa5b commit 81cff17

File tree

3 files changed

+2
-24
lines changed

3 files changed

+2
-24
lines changed

MANIFEST.in

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,3 @@ recursive-include examples README *.py *.glade
1313
prune examples/_tmp_*
1414
recursive-include src *.cpp *.c *.h
1515
recursive-include agg2 *.cpp *.c *.h
16-
recursive-include FontTools *
17-
recursive-include FontToolsSrc *
18-
include FontTools.pth
19-
recursive-include ttfquery *

setup.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323
# build GTK GUI with Agg renderer ; requires pygtk src distros installed
2424
BUILD_GTKAGG = 1
2525

26-
# build GTK GUI with GD renderer ; requires pygtk and GD src distros installed
27-
BUILD_GTKGD = 0
28-
2926
# build TK GUI with Agg renderer ; requires Tkinter Python extension
3027
# and Tk includes
3128
BUILD_TKAGG = 1
@@ -35,7 +32,7 @@
3532
from distutils.core import setup
3633
import sys,os
3734
import glob
38-
from setupext import build_gtkgd, build_agg, build_gtkagg, build_tkagg, \
35+
from setupext import build_agg, build_gtkagg, build_tkagg, \
3936
build_ft2font, build_image
4037
import distutils.sysconfig
4138

@@ -56,9 +53,6 @@
5653
]
5754

5855

59-
if BUILD_GTKGD:
60-
build_gtkgd(ext_modules, packages)
61-
6256
if BUILD_GTKAGG:
6357
BUILD_AGG = 1
6458
build_gtkagg(ext_modules, packages)

setupext.py

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
BUILT_AGG = False
5151
BUILT_FT2FONT = False
5252
BUILT_GTKAGG = False
53-
BUILT_GTKGD = False
5453
BUILT_IMAGE = False
5554
BUILT_TKAGG = False
5655

@@ -156,18 +155,7 @@ def build_ft2font(ext_modules, packages):
156155
)
157156
add_ft2font_flags(module)
158157
ext_modules.append(module)
159-
BUILT_GTKGD = True
160-
161-
def build_gtkgd(ext_modules, packages):
162-
global BUILT_GTKGD
163-
if BUILT_GTKGD: return # only build it if you you haven't already
164-
module = Extension('matplotlib.backends._gtkgd',
165-
['src/_gtkgd.c'],
166-
)
167-
add_pygtk_flags(module)
168-
add_gd_flags(module)
169-
ext_modules.append(module)
170-
BUILT_GTKGD = True
158+
BUILT_FT2FONT = True
171159

172160
def build_gtkagg(ext_modules, packages):
173161
global BUILT_GTKAGG

0 commit comments

Comments
 (0)