Patch from Timo Hoenig <thoenig@suse.de>.

        * qt/dbus/Makefile.am: New file.  Fix "make dist", add all
        headers required during build to EXTRA_DIST.
        * qt/src/Makefile.am: Fix "make dist", add 'qdbus.h' to
        EXTRA_DIST.
        * qt/Makefile.am: Fix "make dist", add 'dbus' to DIST_SUBDIRS.
        * configure.in: Fix "make dist", take care that the Makefile
        for qt/dbus is being generated.

diff --git a/ChangeLog b/ChangeLog
index b25865a651dfcffce78e3636d23bb51f45a2f775..58a977fa6bef480356d8ddcd0e5d369578954bfb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-06-09  Thiago Macieira <thiago.macieira@trolltech.com>
+
+       Patch from Timo Hoenig <thoenig@suse.de>.
+
+       * qt/dbus/Makefile.am: New file.  Fix "make dist", add all headers
+       required during build to EXTRA_DIST.
+       * qt/src/Makefile.am: Fix "make dist", add 'qdbus.h' to EXTRA_DIST.
+       * qt/Makefile.am: Fix "make dist", add 'dbus' to DIST_SUBDIRS.
+       * configure.in: Fix "make dist", take care that the Makefile for
+       qt/dbus is being generated.
+
 2006-06-07  John (J5) Palmieri  <johnp@redhat.com>
 
        * bus/bus.c: Fix eavesdropping on method calls

diff --git a/configure.in b/configure.in
index efb73a9db632d9479151f837704b597f2e831a25..81588017338c47c13db5d40b5f64311e031282eb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1438,6 +1438,7 @@ glib/examples/statemachine/Makefile
 python/Makefile
 python/examples/Makefile
 qt/Makefile
+qt/dbus/Makefile
 qt/src/Makefile
 qt/tools/Makefile
 qt/examples/Makefile

diff --git a/qt/Makefile.am b/qt/Makefile.am
index 835059b81883193f2e9cc5a42ae784402ad92216..83d3d9ffb4721ab3eaa1517e8befbab611347517 100644 (file)
--- a/qt/Makefile.am
+++ b/qt/Makefile.am
@@ -1,4 +1,4 @@
-DIST_SUBDIRS = src tools examples
+DIST_SUBDIRS = dbus src tools examples
 
 if HAVE_QT
 QT_SUBDIRS = src tools examples

diff --git a/qt/dbus/Makefile.am b/qt/dbus/Makefile.am
new file mode 100644 (file)
index 0000000..071234d
--- /dev/null
+++ b/qt/dbus/Makefile.am
@@ -0,0 +1,23 @@
+EXTRA_DIST = qdbusabstractadaptor.h \
+             qdbusabstractadaptor_p.h \
+             qdbusabstractinterface.h \
+             qdbusabstractinterface_p.h \
+             qdbusbus.h \
+             qdbusconnection.h \
+             qdbusconnection_p.h \
+             qdbuserror.h \
+             qdbus.h \
+             qdbusinterface.h \
+             qdbusinterface_p.h \
+             qdbusintrospection_p.h \
+             qdbusmacros.h \
+             qdbusmarshall_p.h \
+             qdbusmessage.h \
+             qdbusmessage_p.h \
+             qdbusmetaobject_p.h \
+             qdbusreply.h \
+             qdbusserver.h \
+             qdbustypehelper_p.h \
+             qdbustype_p.h \
+             qdbusutil.h \
+             qdbusxmlparser_p.h

diff --git a/qt/src/Makefile.am b/qt/src/Makefile.am
index 99b1788b26dcf013f8e9ab4db17f42aec3c2fe51..a1420116257f85e22ffdff3a1efc19c047051ba6 100644 (file)
--- a/qt/src/Makefile.am
+++ b/qt/src/Makefile.am
@@ -64,5 +64,7 @@ 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
 libdbus_qt4_1_la_CPPFLAGS= -DQDBUS_MAKEDLL
 
+EXTRA_DIST = qdbus.h
+
 %.moc: %.h
        $(QT_MOC) $< > $@