diff options
| -rw-r--r-- | gpgme/ChangeLog | 5 | ||||
| -rw-r--r-- | gpgme/Makefile.am | 7 | ||||
| -rw-r--r-- | gpgme/gpgme.h | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index 75bd6a2e..4605d67d 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,5 +1,10 @@ 2007-09-07 Marcus Brinkmann <[email protected]> + * 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 8668b36e..18b44dec 100644 --- 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 d15b921c..5bdd1035 100644 --- 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" |