diff options
| author | rrelyea <rrelyea@fba4d07e-fe0f-4d7f-8147-e0026e666dc0> | 2006-11-30 22:35:28 +0000 |
|---|---|---|
| committer | rrelyea <rrelyea@fba4d07e-fe0f-4d7f-8147-e0026e666dc0> | 2006-11-30 22:35:28 +0000 |
| commit | 78093de42d6edbc4ef0ff9ce2c2b5b33ec3130da (patch) | |
| tree | f57c971f8561207d1238f7d001de7b991d4b5ca3 /src | |
| parent | 61e1011c5fe010d4dc7c009a9c1d076f02d2df62 (diff) | |
Fix compile problem with log.h
Make pk11install and optionally built feature.
git-svn-id: http://svn.fedorahosted.org/svn/coolkey/trunk@35 fba4d07e-fe0f-4d7f-8147-e0026e666dc0
Diffstat (limited to 'src')
| -rw-r--r-- | src/coolkey/Makefile.in | 2 | ||||
| -rw-r--r-- | src/coolkey/log.h | 2 | ||||
| -rw-r--r-- | src/install/Makefile | 2 | ||||
| -rw-r--r-- | src/install/Makefile.in | 2 | ||||
| -rw-r--r-- | src/libckyapplet/Makefile.am | 1 | ||||
| -rw-r--r-- | src/libckyapplet/Makefile.in | 3 |
6 files changed, 11 insertions, 1 deletions
diff --git a/src/coolkey/Makefile.in b/src/coolkey/Makefile.in index ae97e45..bb16cda 100644 --- a/src/coolkey/Makefile.in +++ b/src/coolkey/Makefile.in @@ -124,6 +124,8 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BUILD_PK11INSTALL_FALSE = @BUILD_PK11INSTALL_FALSE@ +BUILD_PK11INSTALL_TRUE = @BUILD_PK11INSTALL_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ diff --git a/src/coolkey/log.h b/src/coolkey/log.h index a586ced..015c7bf 100644 --- a/src/coolkey/log.h +++ b/src/coolkey/log.h @@ -56,7 +56,7 @@ class FileLog : public Log { class SysLog : public Log { private: SysLog(SysLog &) {} - SysLog * operator=(SysLog &) { return *this; } + SysLog & operator=(SysLog &) { return *this; } public: SysLog() { } void log(const char *msg, ...); diff --git a/src/install/Makefile b/src/install/Makefile index 798eb3b..83a1dac 100644 --- a/src/install/Makefile +++ b/src/install/Makefile @@ -100,6 +100,8 @@ AUTOCONF = ${SHELL} /builds/fedora/coolkey/missing --run autoconf AUTOHEADER = ${SHELL} /builds/fedora/coolkey/missing --run autoheader AUTOMAKE = ${SHELL} /builds/fedora/coolkey/missing --run automake-1.9 AWK = gawk +BUILD_PK11INSTALL_FALSE = # +BUILD_PK11INSTALL_TRUE = CC = gcc CCDEPMODE = depmode=gcc3 CFLAGS = -g -O2 diff --git a/src/install/Makefile.in b/src/install/Makefile.in index f26991d..f644620 100644 --- a/src/install/Makefile.in +++ b/src/install/Makefile.in @@ -100,6 +100,8 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BUILD_PK11INSTALL_FALSE = @BUILD_PK11INSTALL_FALSE@ +BUILD_PK11INSTALL_TRUE = @BUILD_PK11INSTALL_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ diff --git a/src/libckyapplet/Makefile.am b/src/libckyapplet/Makefile.am index 496dc6f..c23d1c1 100644 --- a/src/libckyapplet/Makefile.am +++ b/src/libckyapplet/Makefile.am @@ -24,6 +24,7 @@ SUBDIRS = AM_CFLAGS = # bleh what do I add just to get static but pic libraries? +bogusdir = $(libdir)/bogus lib_LTLIBRARIES = libckyapplet.la libckyapplet_la_SOURCES = \ diff --git a/src/libckyapplet/Makefile.in b/src/libckyapplet/Makefile.in index 2e64426..bc1cccf 100644 --- a/src/libckyapplet/Makefile.in +++ b/src/libckyapplet/Makefile.in @@ -123,6 +123,8 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BUILD_PK11INSTALL_FALSE = @BUILD_PK11INSTALL_FALSE@ +BUILD_PK11INSTALL_TRUE = @BUILD_PK11INSTALL_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -233,6 +235,7 @@ SUBDIRS = AM_CFLAGS = # bleh what do I add just to get static but pic libraries? +bogusdir = $(libdir)/bogus lib_LTLIBRARIES = libckyapplet.la libckyapplet_la_SOURCES = \ cky_applet.c \ |