diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 00:59:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 00:59:37 -0600 |
| commit | f050f7c84cccf297921968acd454e6a462e30857 (patch) | |
| tree | d2dbec79b7ecb12d9dd28b20e491a454b18ecb52 /configure.py | |
| parent | 6b87edd9b7b08ca0030e5633e8a9653576f73a32 (diff) | |
| download | pytde-f050f7c84cccf297921968acd454e6a462e30857.tar.gz pytde-f050f7c84cccf297921968acd454e6a462e30857.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'configure.py')
| -rw-r--r-- | configure.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/configure.py b/configure.py index 9c9a388..3136629 100644 --- a/configure.py +++ b/configure.py @@ -96,7 +96,7 @@ opt_dep_warnings = 0 opt_libdir = "lib" opt_dist_name = "" -pytde_modules = ["dcop", "tdecore", "tdefx", "tdeui", "kio", "tderesources", "kabc", "tdeutils", "kfile", "tdeparts",\ +pytde_modules = ["dcop", "tdecore", "tdefx", "tdeui", "kio", "tderesources", "kabc", "tdeutils", "tdefile", "tdeparts",\ "tdehtml", "tdespell", "tdeprint", "tdemdi"] #, "tdespell2"] pytde_imports = { @@ -109,10 +109,10 @@ pytde_imports = { "tderesources": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio"], "kabc": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio", "tderesources"], "tdeutils": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio"], - "kfile": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio"], + "tdefile": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio"], "tdeparts": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio"], "tdehtml": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeutils", "kio", "tdeparts"], - "tdespell": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio", "kfile"], + "tdespell": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio", "tdefile"], "tdeprint": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui"], "tdemdi": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio", "tdeparts"], "tdespell2": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui"] @@ -125,15 +125,15 @@ kde_includes = { "tdefx": None, "tdeui": None, "kio": ["kio"], - "tderesources": ["kio", "../kio", "tderesources"], - "kabc": ["kio", "../kio", "tderesources", "kabc"], - "kfile": ["kio", "../kio"], - "tdeparts": ["kio", "../kio", "tdeparts"], - "tdehtml": ["kio", "../kio", "tdeparts", "dom"], + "tderesources": ["kio", "../tdeio", "tderesources"], + "kabc": ["kio", "../tdeio", "tderesources", "kabc"], + "tdefile": ["kio", "../tdeio"], + "tdeparts": ["kio", "../tdeio", "tdeparts"], + "tdehtml": ["kio", "../tdeio", "tdeparts", "dom"], "tdespell": ["kio"], "tdeprint": ["tdeprint"], - "tdemdi": ["tdemdi", "kio", "../kio", "tdeparts"], - "tdeutils": ["kio", "../kio"] #, + "tdemdi": ["tdemdi", "kio", "../tdeio", "tdeparts"], + "tdeutils": ["kio", "../tdeio"] #, # "tdespell2": None } @@ -148,7 +148,7 @@ postProcess = { "tderesources": None, "kabc": None, "kio": None, - "kfile": None, + "tdefile": None, "tdeparts": None, "tdehtml": None, "tdespell": None, @@ -749,7 +749,7 @@ def generate_code(mname, imports=None, extra_cflags=None, extra_cxxflags=None, e if extra_lib == "dcop": extra_lib = "DCOP" - elif extra_lib == "kfile": + elif extra_lib == "tdefile": extra_lib = "kio" makefile.extra_libs.append(extra_lib) |