diff options
| author | Thiago Macieira <thiago@kde.org> | 2006-06-09 21:43:14 +0000 |
|---|---|---|
| committer | Thiago Macieira <thiago@kde.org> | 2006-06-09 21:43:14 +0000 |
| commit | a0ccd8a2a0cca7095fc1a9c5e1027e10a44caeee (patch) | |
| tree | f53dcda9ec6e348d71874bed5a5dca7707f1281b | |
| parent | d062db4c27d7937ca0fb5367cb5a467554d47ee8 (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-- | ChangeLog | 11 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | qt/Makefile.am | 2 | ||||
| -rw-r--r-- | qt/dbus/Makefile.am | 23 | ||||
| -rw-r--r-- | qt/src/Makefile.am | 2 |
5 files changed, 38 insertions, 1 deletions
@@ -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 efb73a9d..81588017 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 835059b8..83d3d9ff 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 00000000..071234d9 --- /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 99b1788b..a1420116 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) $< > $@ |