diff options
| author | Thiago Macieira <thiago@kde.org> | 2006-02-15 16:25:12 +0000 |
|---|---|---|
| committer | Thiago Macieira <thiago@kde.org> | 2006-02-15 16:25:12 +0000 |
| commit | c2432800b1d387c5512e605ba92060d4827b7606 (patch) | |
| tree | 859ad5945d12efbfecdbd0fb1244642de6ae51c6 /qt/Makefile.am | |
| parent | 120d4ae484acde0d8684a2ba72874bd1c3017b97 (diff) | |
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.
Diffstat (limited to 'qt/Makefile.am')
| -rw-r--r-- | qt/Makefile.am | 57 |
1 files changed, 41 insertions, 16 deletions
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 |