diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | qt/Makefile.am | 67 | 
2 files changed, 39 insertions, 34 deletions
| @@ -1,3 +1,9 @@ +2006-02-28  Thiago Macieira <thiago.macieira@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. +  2006-02-26  Havoc Pennington  <hp@redhat.com>  	* bus/dbus-daemon.1.in: improve the language in a couple spots I noticed diff --git a/qt/Makefile.am b/qt/Makefile.am index 4a7e889d..f1719fd4 100644 --- a/qt/Makefile.am +++ b/qt/Makefile.am @@ -21,41 +21,40 @@ dbusinclude_HEADERS=	\  	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 | 
