diff options
| author | Harri Porten <porten@kde.org> | 2002-12-28 09:10:43 +0000 |
|---|---|---|
| committer | Harri Porten <porten@kde.org> | 2002-12-28 09:10:43 +0000 |
| commit | b7354d91569384ba884bd3e391210019037ada2c (patch) | |
| tree | 7ecb6a83c969afc11b740f687bdd11bda1d14aac /qt | |
| parent | ebd603e725695b58215d2928292c9f1cadd6f3e4 (diff) | |
very basic check for Qt integration. Another proof that Qt's build
system needs more work for people using it.
I didn't want to copy all of KDEs autoconf magic so this is far from
perfect, yet. Can we use pkg-config here ?
Diffstat (limited to 'qt')
| -rw-r--r-- | qt/.cvsignore | 7 | ||||
| -rw-r--r-- | qt/Makefile.am | 9 | ||||
| -rw-r--r-- | qt/dbus-qthread.cpp (renamed from qt/dbus-qthread.cc) | 8 |
3 files changed, 22 insertions, 2 deletions
diff --git a/qt/.cvsignore b/qt/.cvsignore new file mode 100644 index 00000000..9626b600 --- /dev/null +++ b/qt/.cvsignore @@ -0,0 +1,7 @@ +.deps +.libs +Makefile +Makefile.in +*.lo +*.la + diff --git a/qt/Makefile.am b/qt/Makefile.am new file mode 100644 index 00000000..f23e1ddd --- /dev/null +++ b/qt/Makefile.am @@ -0,0 +1,9 @@ +INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_QT_CXXFLAGS) + +lib_LTLIBRARIES=libdbus-qt-1.la + +libdbus_qt_1_la_SOURCES = \ + dbus-qthread.cpp + +libdbus_qt_1_la_LIBADD= $(DBUS_QT_LIBS) $(top_builddir)/dbus/libdbus-1.la +libdbus_qt_1_la_LDFLAGS= -version-info 1:0 diff --git a/qt/dbus-qthread.cc b/qt/dbus-qthread.cpp index ab266284..5aa0fa1e 100644 --- a/qt/dbus-qthread.cc +++ b/qt/dbus-qthread.cpp @@ -1,5 +1,5 @@ /* -*- mode: C; c-file-style: "gnu" -*- */ -/* dbus-qthread.c Qt threads integration +/* dbus-qthread.cpp Qt threads integration * * Copyright (C) 2002 Zack Rusin <zack@kde.org> * @@ -21,8 +21,10 @@ * */ -#include <qmutex.h> #include <dbus/dbus.h> +#include <qmutex.h> + +#if defined(QT_THREAD_SUPPORT) static DBusMutex * dbus_qmutex_new (void); static void dbus_qmutex_free (DBusMutex *mutex); @@ -83,3 +85,5 @@ dbus_qthread_init (void) } } + +#endif // QT_THREAD_SUPPORT |