summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2020-06-07 11:44:27 +0200
committerSlávek Banko <slavek.banko@axis.cz>2020-06-07 15:34:28 +0200
commit73da1dc813757ec2c9cba699453a6ced536cf9f3 (patch)
tree19a479f9c09ca7422c7812ea3ceb299756892958
parentf9148018b2f8a11fd830712c1b508046cc34ff22 (diff)
downloadadmin-73da1dc813757ec2c9cba699453a6ced536cf9f3.tar.gz
admin-73da1dc813757ec2c9cba699453a6ced536cf9f3.zip
Use dcopildng as the default instead of dcopidl.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 3e80abcba548f353276a4f3088f9e0bb6295039c)
-rw-r--r--am_edit5
1 files changed, 2 insertions, 3 deletions
diff --git a/am_edit b/am_edit
index 085f49d..7c1a582 100644
--- a/am_edit
+++ b/am_edit
@@ -1262,9 +1262,8 @@ sub tag_IDLFILES ()
}
if ($allidls !~ /$source\_kidl/) {
-
- $use_ng = ($MakefileData =~ /\n$source\_DCOPIDLNG\s*=\s*(\S+)\n/);
- $dcopidl = $use_ng ? "KDECONFIG=\"\$(KDECONFIG)\" \$(TQTDCOPIDLNG)" : " \$(TQTDCOPIDL)";
+
+ $dcopidl = "KDECONFIG=\"\$(KDECONFIG)\" \$(TQTDCOPIDLNG)";
$dep_lines .= "$source.kidl: $sourcedir$source.h \$(DCOP_DEPENDENCIES)\n";
$dep_lines .= "\t$dcopidl $sourcedir$source.h > $source.kidl || ( rm -f $source.kidl ; false )\n";