[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/trinity/kdenetwork/kopete/protocols/jabber/libiris/iris
From:       Timothy Pearson <kb9vqf () pearsoncomputing ! net>
Date:       2011-10-29 2:08:30
Message-ID: 20111029020830.0D67DAC889 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1261215 by tpearson:

Fix Kopete Jabber plugin failing to load
This closes Bug 556


 M  +5 -2      jabber/Makefile.am  
 M  +5 -2      xmpp-core/Makefile.am  
 M  +4 -1      xmpp-im/Makefile.am  


--- branches/trinity/kdenetwork/kopete/protocols/jabber/libiris/iris/jabber/Makefile.am \
#1261214:1261215 @@ -11,9 +11,12 @@
 
 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
--- branches/trinity/kdenetwork/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.am \
#1261214:1261215 @@ -24,11 +24,14 @@
 
 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
--- branches/trinity/kdenetwork/kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.am \
#1261214:1261215 @@ -13,7 +13,10 @@
 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
 


[prev in list] [next in list] [prev in thread] [next in thread]