diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-29 02:08:29 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-29 02:08:29 +0000 |
| commit | 8682a96d7f3bbfcc1faea473df15509c3bf42d83 (patch) | |
| tree | 35552aca655b0e0a2db946c33cf300a0294cf895 /kopete | |
| parent | e7d3e8c4637fbcfcfc158806eb8c943c1bc65e9d (diff) | |
| download | tdenetwork-8682a96d7f3bbfcc1faea473df15509c3bf42d83.tar.gz tdenetwork-8682a96d7f3bbfcc1faea473df15509c3bf42d83.zip | |
Fix Kopete Jabber plugin failing to load
This closes Bug 556
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1261215 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kopete')
3 files changed, 14 insertions, 5 deletions
diff --git a/kopete/protocols/jabber/libiris/iris/jabber/Makefile.am b/kopete/protocols/jabber/libiris/iris/jabber/Makefile.am index 7024cdf3..47a6dca8 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/Makefile.am +++ b/kopete/protocols/jabber/libiris/iris/jabber/Makefile.am @@ -11,9 +11,12 @@ s5b.lo: s5b.moc CLEANFILES = s5b.moc s5b.moc: $(srcdir)/s5b.cpp $(srcdir)/s5b.h - ${TQTMOC} ${MOC} $(srcdir)/s5b.h s5b.moc.h - ${TQTMOC} ${MOC} $(srcdir)/s5b.cpp s5b.moc.cpp + ${TQTMOC} $(srcdir)/s5b.h -o s5b.moc.h + cp $(srcdir)/s5b.cpp s5b.moc.in.cpp + tqt-replace s5b.moc.in.cpp + ${MOC} s5b.moc.in.cpp > s5b.moc.cpp cat s5b.moc.h > $@ cat s5b.moc.cpp >> $@ rm s5b.moc.h rm s5b.moc.cpp + rm s5b.moc.in.cpp diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.am b/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.am index 7ef67ea6..56be2c4e 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.am +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.am @@ -24,11 +24,14 @@ libiris_xmpp_core_la_COMPILE_FIRST = securestream.moc CLEANFILES = securestream.moc securestream.moc: $(srcdir)/securestream.cpp $(srcdir)/securestream.h - ${TQTMOC} ${MOC} $(srcdir)/securestream.h securestream.moc.h - ${TQTMOC} ${MOC} $(srcdir)/securestream.cpp securestream.moc.cpp + ${TQTMOC} $(srcdir)/securestream.h -o securestream.moc.h + cp $(srcdir)/securestream.cpp securestream.moc.in.cpp + tqt-replace securestream.moc.in.cpp + ${MOC} securestream.moc.in.cpp > securestream.moc.cpp cat securestream.moc.h > $@ cat securestream.moc.cpp >> $@ rm securestream.moc.h rm securestream.moc.cpp + rm securestream.moc.in.cpp KDE_OPTIONS = nofinal diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.am b/kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.am index c0ac6721..e943fe5b 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.am +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.am @@ -13,7 +13,10 @@ libiris_xmpp_im_la_SOURCES = \ CLEANFILES = types.moc types.lo: types.moc types.moc: $(top_builddir)/kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile - ${TQTMOC} ${MOC} $(srcdir)/../xmpp-im/types.cpp types.moc + cp $(srcdir)/../xmpp-im/types.cpp types.in.moc + tqt-replace types.in.moc + ${MOC} types.in.moc -o types.moc + rm types.in.moc KDE_OPTIONS = nofinal |