diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-21 19:55:32 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-21 19:55:32 +0000 |
| commit | 43eb60c270ae1ac5fcbbf1b6918074559c95e25b (patch) | |
| tree | 7b2465a53411bb32d1f5265b254eea720a252983 | |
| parent | d3ef65871a6f0b87fc62e3f499732032b3efb394 (diff) | |
| download | tdenetwork-43eb60c270ae1ac5fcbbf1b6918074559c95e25b.tar.gz tdenetwork-43eb60c270ae1ac5fcbbf1b6918074559c95e25b.zip | |
Additional Kopete MOC/Automake fixes
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1166435 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.am | 8 | ||||
| -rw-r--r-- | kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.am | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.am b/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.am index f35b1c68..7ef67ea6 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.am +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.am @@ -24,7 +24,11 @@ libiris_xmpp_core_la_COMPILE_FIRST = securestream.moc CLEANFILES = securestream.moc securestream.moc: $(srcdir)/securestream.cpp $(srcdir)/securestream.h - ${MOC} $(srcdir)/securestream.h > $@ - ${MOC} $(srcdir)/securestream.cpp >> $@ + ${TQTMOC} ${MOC} $(srcdir)/securestream.h securestream.moc.h + ${TQTMOC} ${MOC} $(srcdir)/securestream.cpp securestream.moc.cpp + cat securestream.moc.h > $@ + cat securestream.moc.cpp >> $@ + rm securestream.moc.h + rm securestream.moc.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 c6dff330..66660772 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.am +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.am @@ -13,7 +13,7 @@ libiris_xmpp_im_la_SOURCES = \ CLEANFILES = types.moc types.lo: types.moc types.moc: $(top_builddir)/kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile - ${MOC} -o types.moc $(srcdir)/../xmpp-im/types.cpp + ${TQTMOC} ${MOC} -o types.moc $(srcdir)/../xmpp-im/types.cpp KDE_OPTIONS = nofinal |