summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xsetup.py16
-rw-r--r--src/kdedistutils.py98
2 files changed, 57 insertions, 57 deletions
diff --git a/setup.py b/setup.py
index b26227f..2d4bd2f 100755
--- a/setup.py
+++ b/setup.py
@@ -218,17 +218,17 @@ class BuildLibpythonize(Command):
cmdlist.append("-rpath"); cmdlist.append(self.install_dir)
cmdlist.append("-o"); cmdlist.append(os.path.join(self.build_dir,'libpythonize.la'))
# Link libs
- lintdelist = []
- lintdelist.append("-lpython%i.%i" % (sys.version_info[0],sys.version_info[1]) )
- lintdelist.extend(sysconfig.get_config_var("LIBS").split())
+ linklist = []
+ linklist.append("-lpython%i.%i" % (sys.version_info[0],sys.version_info[1]) )
+ linklist.extend(sysconfig.get_config_var("LIBS").split())
- lintdelist.append("-lm")
- lintdelist.append("-lc")
- lintdelist.append(self.clib)
+ linklist.append("-lm")
+ linklist.append("-lc")
+ linklist.append(self.clib)
- lintdelist.append("-R"); lintdelist.append(self.python_dir)
+ linklist.append("-R"); linklist.append(self.python_dir)
- cmdlist.extend(lintdelist)
+ cmdlist.extend(linklist)
spawn(cmdlist) # Execute!!
print
diff --git a/src/kdedistutils.py b/src/kdedistutils.py
index 49a2005..0b475e5 100644
--- a/src/kdedistutils.py
+++ b/src/kdedistutils.py
@@ -824,38 +824,38 @@ class BuildKControlModule(Command):
cmdlist.append("-rpath"); cmdlist.append(self.kde_kcm_lib_dir)
cmdlist.append("-o"); cmdlist.append(os.path.join(self.build_dir,stub_la_name))
# Link libs
- lintdelist = []
- lintdelist.append("-lpython%s" % python_version)
- lintdelist.extend(sysconfig.get_config_var("LIBS").split())
+ linklist = []
+ linklist.append("-lpython%s" % python_version)
+ linklist.extend(sysconfig.get_config_var("LIBS").split())
# FIXME I doubt half of these libraries need to be here.
- lintdelist.append(self.sip_dir+"/sip.so")
+ linklist.append(self.sip_dir+"/sip.so")
# PyQt libs
- lintdelist.append(self.pyqt_dir+"/qt.so")
+ linklist.append(self.pyqt_dir+"/qt.so")
# PyTDE libs
- lintdelist.append(self.pytde_dir+"/tdecore.so")
- lintdelist.append(self.pytde_dir+"/tdeui.so")
+ linklist.append(self.pytde_dir+"/tdecore.so")
+ linklist.append(self.pytde_dir+"/tdeui.so")
-# lintdelist.append("-L"+self.sip_dir); lintdelist.append("-lsip")
+# linklist.append("-L"+self.sip_dir); linklist.append("-lsip")
# # PyQt libs
-# lintdelist.append("-L"+self.pyqt_dir); lintdelist.append("-lqtcmodule")
+# linklist.append("-L"+self.pyqt_dir); linklist.append("-lqtcmodule")
# # PyTDE libs
-# lintdelist.append("-L"+self.pytde_dir); lintdelist.append("-ltdecorecmodule"); lintdelist.append("-ltdeuicmodule")
-
- lintdelist.append("-L"+self.kde_lib_dir); lintdelist.append("-L/opt/trinity/lib"); lintdelist.append("-ltdecore"); lintdelist.append("-lpythonize")
- lintdelist.append("-L"+self.qt_lib_dir); lintdelist.append("-ltqt-mt")
- lintdelist.append("-lm")
- lintdelist.append("-lc")
- lintdelist.append(self.clib)
-
- lintdelist.append("-R"); lintdelist.append(self.python_dir)
- lintdelist.append("-R"); lintdelist.append(self.qt_lib_dir)
- lintdelist.append("-R"); lintdelist.append(self.sip_dir)
- lintdelist.append("-R"); lintdelist.append(self.pyqt_dir)
- lintdelist.append("-R"); lintdelist.append(self.pytde_dir)
- lintdelist.append("-R"); lintdelist.append(self.kde_lib_dir)
-
- cmdlist.extend(lintdelist)
+# linklist.append("-L"+self.pytde_dir); linklist.append("-ltdecorecmodule"); linklist.append("-ltdeuicmodule")
+
+ linklist.append("-L"+self.kde_lib_dir); linklist.append("-L/opt/trinity/lib"); linklist.append("-ltdecore"); linklist.append("-lpythonize")
+ linklist.append("-L"+self.qt_lib_dir); linklist.append("-ltqt-mt")
+ linklist.append("-lm")
+ linklist.append("-lc")
+ linklist.append(self.clib)
+
+ linklist.append("-R"); linklist.append(self.python_dir)
+ linklist.append("-R"); linklist.append(self.qt_lib_dir)
+ linklist.append("-R"); linklist.append(self.sip_dir)
+ linklist.append("-R"); linklist.append(self.pyqt_dir)
+ linklist.append("-R"); linklist.append(self.pytde_dir)
+ linklist.append("-R"); linklist.append(self.kde_lib_dir)
+
+ cmdlist.extend(linklist)
spawn(cmdlist) # Execute!!
print
@@ -1748,37 +1748,37 @@ class BuildTdeioslave(Command):
cmdlist.append("-rpath"); cmdlist.append(self.kde_tdeioslave_lib_dir)
cmdlist.append("-o"); cmdlist.append(os.path.join(self.build_dir,stub_la_name))
# Link libs
- lintdelist = []
- lintdelist.append("-lpython%s" % python_version)
- lintdelist.extend(sysconfig.get_config_var("LIBS").split())
+ linklist = []
+ linklist.append("-lpython%s" % python_version)
+ linklist.extend(sysconfig.get_config_var("LIBS").split())
# FIXME I doubt half of these libraries need to be here.
- lintdelist.append(self.sip_dir+"/sip.so")
+ linklist.append(self.sip_dir+"/sip.so")
# PyQt libs
- lintdelist.append(self.pyqt_dir+"/qt.so")
+ linklist.append(self.pyqt_dir+"/qt.so")
# PyTDE libs
- lintdelist.append(self.pytde_dir+"/tdecore.so")
+ linklist.append(self.pytde_dir+"/tdecore.so")
-# lintdelist.append("-L"+self.sip_dir); lintdelist.append("-lsip")
+# linklist.append("-L"+self.sip_dir); linklist.append("-lsip")
# # PyQt libs
-# lintdelist.append("-L"+self.pyqt_dir); lintdelist.append("-lqtcmodule")
+# linklist.append("-L"+self.pyqt_dir); linklist.append("-lqtcmodule")
# # PyTDE libs
-# lintdelist.append("-L"+self.pytde_dir); lintdelist.append("-ltdecorecmodule"); lintdelist.append("-ltdeuicmodule")
-
- lintdelist.append("-L"+self.kde_lib_dir); lintdelist.append("-L/opt/trinity/lib"); lintdelist.append("-ltdecore"); lintdelist.append("-lpythonize")
- lintdelist.append("-L"+self.qt_lib_dir); lintdelist.append("-lqt-mt")
- lintdelist.append("-lm")
- lintdelist.append("-lc")
- lintdelist.append(self.clib)
-
- lintdelist.append("-R"); lintdelist.append(self.python_dir)
- lintdelist.append("-R"); lintdelist.append(self.qt_lib_dir)
- lintdelist.append("-R"); lintdelist.append(self.sip_dir)
- lintdelist.append("-R"); lintdelist.append(self.pyqt_dir)
- lintdelist.append("-R"); lintdelist.append(self.pytde_dir)
- lintdelist.append("-R"); lintdelist.append(self.kde_lib_dir)
-
- cmdlist.extend(lintdelist)
+# linklist.append("-L"+self.pytde_dir); linklist.append("-ltdecorecmodule"); linklist.append("-ltdeuicmodule")
+
+ linklist.append("-L"+self.kde_lib_dir); linklist.append("-L/opt/trinity/lib"); linklist.append("-ltdecore"); linklist.append("-lpythonize")
+ linklist.append("-L"+self.qt_lib_dir); linklist.append("-lqt-mt")
+ linklist.append("-lm")
+ linklist.append("-lc")
+ linklist.append(self.clib)
+
+ linklist.append("-R"); linklist.append(self.python_dir)
+ linklist.append("-R"); linklist.append(self.qt_lib_dir)
+ linklist.append("-R"); linklist.append(self.sip_dir)
+ linklist.append("-R"); linklist.append(self.pyqt_dir)
+ linklist.append("-R"); linklist.append(self.pytde_dir)
+ linklist.append("-R"); linklist.append(self.kde_lib_dir)
+
+ cmdlist.extend(linklist)
spawn(cmdlist) # Execute!!
print