summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@trolltech.com>2006-06-09 21:43:14 +0000
committerThiago Macieira <thiago.macieira@trolltech.com>2006-06-09 21:43:14 +0000
commit79c4fc883e8ef0f33c0ecaaba924ab31836ff053 (patch)
tree33a36f63ee0fdc399a53bfabdca8ee833253a5b7
parent692fdf306cbcf43b0ef6e3a5f742c9a0d7eb1493 (diff)
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.
-rw-r--r--ChangeLog11
-rw-r--r--configure.in1
-rw-r--r--qt/Makefile.am2
-rw-r--r--qt/dbus/Makefile.am23
-rw-r--r--qt/src/Makefile.am2
5 files changed, 38 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b25865a..58a977f 100644
--- 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 efb73a9..8158801 100644
--- 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 835059b..83d3d9f 100644
--- 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
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 99b1788..a142011 100644
--- 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) $< > $@