From a0d96967938113e7413deb773804d3db2f0ed274 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 16 May 2011 17:55:59 +0000 Subject: Fix up Autotools for TQt3/TQt4 This should repair compilation of non-core Autotools-based packages such as Adept git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kde-common/admin@1232280 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- am_edit | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'am_edit') diff --git a/am_edit b/am_edit index 41dee23..668c5ac 100644 --- a/am_edit +++ b/am_edit @@ -1381,7 +1381,7 @@ sub tag_UIFILES () $dep_lines .= "\t\$(UIC) -o $source.h $sourcedir$source.ui\n"; } $dep_lines .= "$source.moc: $source.h\n"; - $dep_lines .= "\t\$(TQTMOC) \$(MOC) $source.h $source.moc\n"; + $dep_lines .= "\t\$(TQTMOC) $source.h -o $source.moc\n"; $rule_adds{"$source.$cxxsuffix"} = $dep_lines; @@ -2242,13 +2242,13 @@ sub addMocRules () $cppFile =~ s,\.[^.]*$,,; $target_adds{"$cppFile.o"} .= "$mocFile.moc "; $target_adds{"$cppFile.lo"} .= "$mocFile.moc "; - appendLines ("$mocFile.moc: $dir/$hFile\n\t\$(TQTMOC) \$(MOC) $dir/$hFile $mocFile.moc\n"); + appendLines ("$mocFile.moc: $dir/$hFile\n\t\$(TQTMOC) $dir/$hFile -o $mocFile.moc\n"); $cleanMoc .= " $mocFile.moc"; appendLines ("mocs: $mocFile.moc\n"); } else { - appendLines ("$mocFile$mocExt: $dir/$hFile\n\t\$(TQTMOC) \$(MOC) $dir/$hFile $mocFile$mocExt\n"); + appendLines ("$mocFile$mocExt: $dir/$hFile\n\t\$(TQTMOC) $dir/$hFile -o $mocFile$mocExt\n"); $cleanMoc .= " $mocFile$mocExt"; appendLines ("mocs: $mocFile$mocExt\n"); } -- cgit v1.2.1