GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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).
This commit is contained in:
Marcus Brinkmann 2007-09-07 20:54:12 +00:00
parent 414212ea5e
commit dc9b29175f
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gpgme/ChangeLog
View File

@ -1,5 +1,10 @@
2007-09-07 Marcus Brinkmann <marcus@g10code.de> 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-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. * 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. (libgpgme_qt_la_LIBADD): Add QT4_CORE_LIBS, not QT4_CORE_LIB.

7
gpgme/Makefile.am
View File

@ -19,8 +19,9 @@
## Process this file with automake to produce Makefile.in ## 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 \ 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 BUILT_SOURCES = status-table.h
MOSTLYCLEANFILES = status-table.h MOSTLYCLEANFILES = status-table.h
bin_SCRIPTS = gpgme-config bin_SCRIPTS = gpgme-config
@ -115,8 +116,8 @@ endif
if BUILD_W32_QT if BUILD_W32_QT
libgpgme_qt_la_SOURCES = $(main_sources) ath.h ath.c w32-qt-io.cpp \ libgpgme_qt_la_SOURCES = $(main_sources) ath.h ath.c w32-qt-io.cpp \
kdpipeiodevice.h kdpipeiodevice.cpp moc_kdpipeiodevice.cpp \ kdpipeiodevice.h kdpipeiodevice.cpp kdpipeiodevice.moc
kdpipeiodevice.moc # FIXME: Add extra depedency: moc_kdpipeiodevice.cpp
# These are built sources (normally). # These are built sources (normally).
# moc_kdpipeiodevice.cpp: kdpipeiodevice.h # moc_kdpipeiodevice.cpp: kdpipeiodevice.h

2
gpgme/gpgme.h
View File

@ -73,7 +73,7 @@ extern "C" {
AM_PATH_GPGME macro) check that this header matches the installed AM_PATH_GPGME macro) check that this header matches the installed
library. Warning: Do not edit the next line. configure will do library. Warning: Do not edit the next line. configure will do
that for you! */ that for you! */
#define GPGME_VERSION "1.1.5-cvs1250" #define GPGME_VERSION "1.1.5-cvs1251"