dbus/qt Makefile.am,1.15,1.16

Thiago J. Macieira thiago at kemper.freedesktop.org
Tue Feb 28 06:19:57 PST 2006


Update of /cvs/dbus/dbus/qt
In directory kemper:/tmp/cvs-serv11497/qt

Modified Files:
	Makefile.am 
Log Message:
2006-02-28  Thiago Macieira <thiago.macieira at trolltech.com>

	* qt/Makefile.am: Patch by Sjoerd Simons. More .moc issues:
        make/automake don't detect that we're talking about the same
        .lo file if I specify the full path to the source files.



Index: Makefile.am
===================================================================
RCS file: /cvs/dbus/dbus/qt/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile.am	25 Feb 2006 19:54:56 -0000	1.15
+++ Makefile.am	28 Feb 2006 14:19:55 -0000	1.16
@@ -21,41 +21,40 @@
 	qdbusabstractadaptor.h
 
 libdbus_qt4_1_la_SOURCES = 			\
-	$(top_srcdir)/qt/qdbusconnection.cpp    \
-	$(top_srcdir)/qt/qdbuserror.cpp         \
-	$(top_srcdir)/qt/qdbusintegrator.cpp    \
-	$(top_srcdir)/qt/qdbusmarshall.cpp      \
-	$(top_srcdir)/qt/qdbusmessage.cpp       \
-	$(top_srcdir)/qt/qdbusserver.cpp        \
-	$(top_srcdir)/qt/qdbustype.cpp          \
-	$(top_srcdir)/qt/qdbusobject.cpp        \
-	$(top_srcdir)/qt/qdbusinterface.cpp     \
-	$(top_srcdir)/qt/qdbusstandardinterfaces.cpp	\
-	$(top_srcdir)/qt/qdbusxmlparser.cpp     \
-	$(top_srcdir)/qt/qdbusutil.cpp          \
-	$(top_srcdir)/qt/qdbusintrospection.cpp \
-	$(top_srcdir)/qt/qdbusabstractadaptor.cpp	\
-	$(top_srcdir)/qt/qdbusthread.cpp        \
+	qdbusconnection.cpp    \
+	qdbuserror.cpp         \
+	qdbusintegrator.cpp    \
+	qdbusmarshall.cpp      \
+	qdbusmessage.cpp       \
+	qdbusserver.cpp        \
+	qdbustype.cpp          \
+	qdbusobject.cpp        \
+	qdbusinterface.cpp     \
+	qdbusstandardinterfaces.cpp	\
+	qdbusxmlparser.cpp     \
+	qdbusutil.cpp          \
+	qdbusintrospection.cpp \
+	qdbusabstractadaptor.cpp	\
+	qdbusthread.cpp        \
 						\
-	$(top_srcdir)/dbus/qdbus.h              \
-	$(top_srcdir)/qt/qdbusabstractadaptor.h \
-	$(top_srcdir)/qt/qdbusconnection.h      \
-	$(top_srcdir)/qt/qdbusconnection_p.h    \
-	$(top_srcdir)/qt/qdbuserror.h           \
-	$(top_srcdir)/qt/qdbusinterface.h       \
-	$(top_srcdir)/qt/qdbusinterface_p.h     \
-	$(top_srcdir)/qt/qdbusintrospection.h   \
-	$(top_srcdir)/qt/qdbusmacros.h          \
-	$(top_srcdir)/qt/qdbusmarshall.h        \
-	$(top_srcdir)/qt/qdbusmessage.h         \
-	$(top_srcdir)/qt/qdbusmessage_p.h       \
-	$(top_srcdir)/qt/qdbusobject.h          \
-	$(top_srcdir)/qt/qdbusobject_p.h        \
-	$(top_srcdir)/qt/qdbusserver.h          \
-	$(top_srcdir)/qt/qdbusstandardinterfaces.h \
-	$(top_srcdir)/qt/qdbustype.h            \
-	$(top_srcdir)/qt/qdbusvariant.h		\
-	$(top_srcdir)/qt/qdbusxmlparser_p.h     
+	qdbusabstractadaptor.h \
+	qdbusconnection.h      \
+	qdbusconnection_p.h    \
+	qdbuserror.h           \
+	qdbusinterface.h       \
+	qdbusinterface_p.h     \
+	qdbusintrospection.h   \
+	qdbusmacros.h          \
+	qdbusmarshall.h        \
+	qdbusmessage.h         \
+	qdbusmessage_p.h       \
+	qdbusobject.h          \
+	qdbusobject_p.h        \
+	qdbusserver.h          \
+	qdbusstandardinterfaces.h \
+	qdbustype.h            \
+	qdbusvariant.h		\
+	qdbusxmlparser_p.h     
 
 
 qdbusabstractadaptor.lo: qdbusabstractadaptor.moc



More information about the dbus-commit mailing list