diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-16 17:55:59 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-16 17:55:59 +0000 |
| commit | 645b876e7388a53d53aeb390cfbb3d773cc088b1 (patch) | |
| tree | e8c1fb2b75d424662c6e241d80b68a0d219a3a08 /admin/am_edit | |
| parent | 54b3a986bc5b6d8227ce44e39025bcad552093ed (diff) | |
| download | other-645b876e7388a53d53aeb390cfbb3d773cc088b1.tar.gz other-645b876e7388a53d53aeb390cfbb3d773cc088b1.zip | |
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@1232280 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'admin/am_edit')
| -rw-r--r-- | admin/am_edit | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/admin/am_edit b/admin/am_edit index 41dee23..668c5ac 100644 --- a/admin/am_edit +++ b/admin/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"); } |