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

List:       freedesktop-dbus
Subject:    Patch to fix qt build failure in 'make distcheck'
From:       Chris Lee <clee () kde ! org>
Date:       2005-03-07 18:11:45
Message-ID: 422C9961.3090309 () kde ! org
[Download RAW message or body]

Attached.

(This is a builddir != srcdir issue; I'm not convinced that my patch is
completely correct but it does allow 'make distcheck' with --enable-qt
to pass.)

I'm kinda confused as to some other issues involved with this, too - why
are the Qt bindings only enabled if the KDE development packages are
installed? They should be usable without any KDE software.

-clee



["tmp-fix.diff" (text/x-patch)]

Index: Makefile.am
===================================================================
RCS file: /cvs/dbus/dbus/qt/Makefile.am,v
retrieving revision 1.7
diff -u -3 -r1.7 Makefile.am
--- Makefile.am	6 Jul 2004 15:15:58 -0000	1.7
+++ Makefile.am	7 Mar 2005 17:55:15 -0000
@@ -10,12 +10,15 @@
 	server.h
 
 libdbus_qt_1_la_SOURCES = 			\
-	dbus-qthread.cpp message.cpp connection.cpp \
-	integrator.cpp server.cpp integrator.h
+	dbus-qthread.cpp \
+	$(top_srcdir)/qt/message.cpp \
+	$(top_srcdir)/qt/connection.cpp \
+	$(top_srcdir)/qt/integrator.cpp \
+	$(top_srcdir)/qt/server.cpp 
 
-connection.cpp: connection.moc
-integrator.cpp: integrator.moc
-server.cpp: server.moc
+$(top_srcdir)/qt/connection.cpp: connection.moc
+$(top_srcdir)/qt/integrator.cpp: integrator.moc
+$(top_srcdir)/qt/server.cpp: server.moc
 
 CLEANFILES=connection.moc integrator.moc server.moc
 




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