bring Qt3 library back. Some apps that are not in the KDE trunk are using it.

[platform/upstream/dbus.git] / qt / Makefile.am

diff --git a/qt/Makefile.am b/qt/Makefile.am
index 71ae352..9247ba1 100644 (file)
--- a/qt/Makefile.am
+++ b/qt/Makefile.am
@@ -1,20 +1,18 @@
 if HAVE_QT
-INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_QT_CFLAGS)
+INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_QT_CFLAGS) -DDBUS_COMPILATION
 
 dbusincludedir=$(includedir)/dbus-1.0/dbus
 
-lib_LTLIBRARIES=libdbus-qt-1.la
+lib_LTLIBRARIES=libdbus-qt4-1.la
 
 dbusinclude_HEADERS=   \
        qdbuserror.h \
-       qdbusmacros.h \
        qdbusmessage.h \
        qdbusserver.h \
-       qdbus.h \
-       qdbusmarshall.h \
+       qdbusconnection.h \
        qdbusvariant.h
 
-libdbus_qt_1_la_SOURCES =                      \
+libdbus_qt4_1_la_SOURCES =                     \
        $(top_srcdir)/qt/qdbusconnection.cpp    \
        $(top_srcdir)/qt/qdbuserror.cpp         \
        $(top_srcdir)/qt/qdbusintegrator.cpp    \
@@ -23,11 +21,10 @@ libdbus_qt_1_la_SOURCES =                   \
        $(top_srcdir)/qt/qdbusserver.cpp        \
        $(top_srcdir)/qt/qdbusconnection.h      \
        $(top_srcdir)/qt/qdbuserror.h           \
-       $(top_srcdir)/qt/qdbusmacros.h          \
        $(top_srcdir)/qt/qdbusmessage.h         \
        $(top_srcdir)/qt/qdbusserver.h          \
        $(top_srcdir)/qt/qdbusconnection_p.h    \
-       $(top_srcdir)/qt/qdbus.h                \
+       $(top_srcdir)/dbus/qdbus.h              \
        $(top_srcdir)/qt/qdbusmarshall.h        \
        $(top_srcdir)/qt/qdbusmessage_p.h       \
        $(top_srcdir)/qt/qdbusvariant.h
@@ -38,8 +35,8 @@ $(top_srcdir)/qt/qdbusconnection.cpp: qdbusconnection.moc
 
 CLEANFILES=qdbusserver.moc qdbusconnection.moc
 
-libdbus_qt_1_la_LIBADD= $(DBUS_QT_LIBS) $(top_builddir)/dbus/libdbus-1.la
-libdbus_qt_1_la_LDFLAGS= -version-info 1:0 -no-undefined
+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