From c2432800b1d387c5512e605ba92060d4827b7606 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago@kde.org>
Date: Wed, 15 Feb 2006 16:25:12 +0000
Subject: Merge the changes to the bindings from the KDE Subversion server.

This is a major change: library is source- and binary-incompatible to
what it used to be.

All testcases are green, functionality is preserved.

It is not feature-complete. Development will continue in the branch in the
Subversion server for a while.
---
 qt/Makefile.am | 57 +++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 41 insertions(+), 16 deletions(-)

(limited to 'qt/Makefile.am')

diff --git a/qt/Makefile.am b/qt/Makefile.am
index 9247ba1e..9117d27e 100644
--- a/qt/Makefile.am
+++ b/qt/Makefile.am
@@ -6,11 +6,19 @@ dbusincludedir=$(includedir)/dbus-1.0/dbus
 lib_LTLIBRARIES=libdbus-qt4-1.la
 
 dbusinclude_HEADERS=	\
-	qdbuserror.h \
-	qdbusmessage.h \
-	qdbusserver.h \
+	qdbusmacros.h	\
+	qdbuserror.h 	\
+	qdbusmessage.h	\
+	qdbusserver.h	\
 	qdbusconnection.h \
-	qdbusvariant.h
+	qdbusvariant.h	\
+	qdbusobject.h	\
+	qdbusinterface.h \
+	qdbustype.h	\
+	qdbusstandardinterfaces.h \
+	qdbusutil.h	\
+	qdbusintrospection.h \
+	qdbusabstractadaptor.h
 
 libdbus_qt4_1_la_SOURCES = 			\
 	$(top_srcdir)/qt/qdbusconnection.cpp    \
@@ -19,29 +27,46 @@ libdbus_qt4_1_la_SOURCES = 			\
 	$(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        \
+						\
+	$(top_srcdir)/dbus/qdbus.h              \
+	$(top_srcdir)/qt/qdbusabstractadaptor.h \
 	$(top_srcdir)/qt/qdbusconnection.h      \
-	$(top_srcdir)/qt/qdbuserror.h           \
-	$(top_srcdir)/qt/qdbusmessage.h         \
-	$(top_srcdir)/qt/qdbusserver.h          \
 	$(top_srcdir)/qt/qdbusconnection_p.h    \
-	$(top_srcdir)/dbus/qdbus.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/qdbusvariant.h
+	$(top_srcdir)/qt/qdbusobject.h          \
+	$(top_srcdir)/qt/qdbusobject_p.h        \
+	$(top_srcdir)/qt/qdbusserver.h          \
+	$(top_srcdir)/qt/qdbusstandardinterfaces.
+	$(top_srcdir)/qt/qdbustype.h            \
+	$(top_srcdir)/qt/qdbusvariant.h		\
+	$(top_srcdir)/qt/qdbusxmlparser_p.h     
 
 
-$(top_srcdir)/qt/qdbusserver.cpp: qdbusserver.moc
-$(top_srcdir)/qt/qdbusconnection.cpp: qdbusconnection.moc
+$(top_srcdir)/qt/qdbusabstractadaptor.lo: qdbusabstractadaptor.moc
+$(top_srcdir)/qt/qdbusserver.lo: qdbusserver.moc
+$(top_srcdir)/qt/qdbusconnection.lo: qdbusconnection_p.moc
 
-CLEANFILES=qdbusserver.moc qdbusconnection.moc
+CLEANFILES=qdbusabstractadaptor.moc qdbusserver.moc qdbusconnection.moc
 
 libdbus_qt4_1_la_LIBADD= $(DBUS_QT_LIBS) $(top_builddir)/dbus/libdbus-1.la
 libdbus_qt4_1_la_LDFLAGS= -version-info 1:0 -no-undefined
 
-# _p.h files are a exception
-qdbusconnection.moc: qdbusconnection_p.h
-	$(QT_MOC) -o qdbusconnection.moc $(top_srcdir)/qt/qdbusconnection_p.h
-
 %.moc: %.h
 	$(QT_MOC) $< > $@
 endif
-- 
cgit