From 77607214fef4dbc9ebba275143f608bf4c966cf5 Mon Sep 17 00:00:00 2001
From: Nikos Kouremenos <kourem@gmail.com>
Date: Fri, 6 May 2005 12:06:10 +0000
Subject: [PATCH] replace setup.py in favor of Makefile in idle module
compilation
---
src/common/Makefile | 11 +++++++++--
src/common/setup.py | 36 ------------------------------------
2 files changed, 9 insertions(+), 38 deletions(-)
delete mode 100644 src/common/setup.py
diff --git a/src/common/Makefile b/src/common/Makefile
index 5a3d9fef23..b50e20107a 100644
--- a/src/common/Makefile
+++ b/src/common/Makefile
@@ -1,5 +1,12 @@
-all:
- python setup.py build_ext -i
+# Set the C flags to include the GTK+ and Python libraries
+PYTHONVER = `python -V 2>&1 | awk '{print $$2}' | cut -f1,2 -d.`
+CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -fpic -I/usr/include/python$(PYTHONVER) -I.
+LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0`
+
+all: idle.so
+
+idle.so:
+ $(CC) $(CFLAGS) $(LDFLAGS) -shared idle.c $^ -o $@
clean:
rm -f *.so
diff --git a/src/common/setup.py b/src/common/setup.py
deleted file mode 100644
index 11a6659728..0000000000
--- a/src/common/setup.py
+++ /dev/null
@@ -1,36 +0,0 @@
-## common/setup.py
-##
-## Gajim Team:
-## - Yann Le Boulanger <asterix@lagaule.org>
-## - Vincent Hanquez <tab@snarc.org>
-##
-## Copyright (C) 2003-2005 Gajim Team
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published
-## by the Free Software Foundation; version 2 only.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-
-from distutils.core import setup, Extension
-import os
-
-if os.name == 'posix':
- module1 = Extension( 'idle',
- sources = ['idle.c'],
-# extra_compile_args = ['-W'],
- libraries = ['gtk-x11-2.0','gdk-x11-2.0','glib-2.0','X11','Xext','Xss','atk-1.0'],
- library_dirs = ['/usr/X11R6/lib'],
- include_dirs = ['/usr/include/gtk-2.0', '/usr/include/glib-2.0','/usr/lib/gtk-2.0/include','/usr/lib/glib-2.0/include','/usr/include/pango-1.0','/usr/include/atk-1.0']
- )
-elif os.name == 'nt':
- module1 = Extension( 'idle',
- sources = ['idle.c'],
-# extra_compile_args = ['-W'],
- )
-
-setup (name = 'idle', version = '1.0', description = 'interface to X11/scrnserver.h', ext_modules = [module1])
--
GitLab