2007-09-07 Marcus Brinkmann <marcus@g10code.de>

	* Makefile.am (libgpgme_qt_la_SOURCES): Move
	moc_kdpipeiodevice.cpp to EXTRA_DIST, as this is only included by
	another file (it's more like a header file than a cpp file, but
	automake doesn't know that).

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 75bd6a2ee939e52202264b83f22015bf8babfb78..4605d67d4eef1e4784d3e0b34d06a1ee672729e4 100644 (file)
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,5 +1,10 @@
 2007-09-07  Marcus Brinkmann  <marcus@g10code.de>
 
+       * Makefile.am (libgpgme_qt_la_SOURCES): Move
+       moc_kdpipeiodevice.cpp to EXTRA_DIST, as this is only included by
+       another file (it's more like a header file than a cpp file, but
+       automake doesn't know that).
+
        * w32-qt-io.cpp (_gpgme_io_spawn): Fix several cast errors and typos.
        * w32-io.c (_gpgme_io_write): Use TRACE_SYSRES instead of TRACE_SYS.
        (libgpgme_qt_la_LIBADD): Add QT4_CORE_LIBS, not QT4_CORE_LIB.

diff --git a/gpgme/Makefile.am b/gpgme/Makefile.am
index 8668b36e2037e92d214d29547565d0f70ee4e048..18b44deccd3dafc767b2779c46472d57b95c1548 100644 (file)
--- a/gpgme/Makefile.am
+++ b/gpgme/Makefile.am
@@ -19,8 +19,9 @@
 
 ## Process this file with automake to produce Makefile.in
 
+# Note: moc_kdpipeiodevice should actually be a dependcy below.
 EXTRA_DIST = gpgme-config.in gpgme.m4 mkstatus libgpgme.vers \
-            versioninfo.rc.in gpgme.def
+            versioninfo.rc.in gpgme.def moc_kdpipeiodevice.cpp
 BUILT_SOURCES = status-table.h
 MOSTLYCLEANFILES = status-table.h
 bin_SCRIPTS = gpgme-config
@@ -115,8 +116,8 @@ endif
 
 if BUILD_W32_QT
 libgpgme_qt_la_SOURCES = $(main_sources) ath.h ath.c w32-qt-io.cpp \
-       kdpipeiodevice.h kdpipeiodevice.cpp moc_kdpipeiodevice.cpp \
-       kdpipeiodevice.moc
+       kdpipeiodevice.h kdpipeiodevice.cpp kdpipeiodevice.moc
+# FIXME: Add extra depedency: moc_kdpipeiodevice.cpp
 
 # These are built sources (normally).
 # moc_kdpipeiodevice.cpp: kdpipeiodevice.h

diff --git a/gpgme/gpgme.h b/gpgme/gpgme.h
index d15b921ccd509103266ca6c527a13f06f4527436..5bdd103591b32d8ba0cedeb041e7076a733f3e86 100644 (file)
--- a/gpgme/gpgme.h
+++ b/gpgme/gpgme.h
@@ -73,7 +73,7 @@ extern "C" {
    AM_PATH_GPGME macro) check that this header matches the installed
    library.  Warning: Do not edit the next line.  configure will do
    that for you!  */
-#define GPGME_VERSION "1.1.5-cvs1250"
+#define GPGME_VERSION "1.1.5-cvs1251"
 
 
 \f