diff options
| -rw-r--r-- | libck-connector/Makefile.am | 2 | ||||
| -rw-r--r-- | pam-ck-connector/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/ck-log-event.c | 14 | ||||
| -rw-r--r-- | tools/Makefile.am | 4 | ||||
| -rw-r--r-- | tools/ck-log-system-start.c | 2 |
6 files changed, 8 insertions, 18 deletions
diff --git a/libck-connector/Makefile.am b/libck-connector/Makefile.am index 5654363..e4faf61 100644 --- a/libck-connector/Makefile.am +++ b/libck-connector/Makefile.am @@ -1,6 +1,6 @@ NULL = -INCLUDES = \ +AM_CFLAGS = \ -I. \ $(LIBDBUS_CFLAGS) \ $(NULL) diff --git a/pam-ck-connector/Makefile.am b/pam-ck-connector/Makefile.am index 9d32639..81665b3 100644 --- a/pam-ck-connector/Makefile.am +++ b/pam-ck-connector/Makefile.am @@ -2,7 +2,7 @@ NULL = if ENABLE_PAM_MODULE -INCLUDES = \ +AM_CFLAGS = \ $(LIBDBUS_CFLAGS) \ -I$(top_builddir)/libck-connector \ $(NULL) diff --git a/src/Makefile.am b/src/Makefile.am index 217e531..ebe32f1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,7 +6,7 @@ NULL = SUBDIRS = \ $(NULL) -INCLUDES = \ +AM_CFLAGS = \ -I. \ -I$(srcdir) \ $(CONSOLE_KIT_CFLAGS) \ diff --git a/src/ck-log-event.c b/src/ck-log-event.c index 5cc88ce..2bbb205 100644 --- a/src/ck-log-event.c +++ b/src/ck-log-event.c @@ -453,18 +453,14 @@ static void add_log_for_system_stop (GString *str, CkLogEvent *event) { - CkLogSystemStopEvent *e; - - e = (CkLogSystemStopEvent *)event; + /* TODO: Not implemented */ } static void add_log_for_system_restart (GString *str, CkLogEvent *event) { - CkLogSystemRestartEvent *e; - - e = (CkLogSystemRestartEvent *)event; + /* TODO: Not implemented */ } @@ -822,7 +818,6 @@ parse_log_for_system_stop (const GString *str, { gboolean ret; const char *s; - CkLogSystemStopEvent *e; ret = FALSE; @@ -831,8 +826,6 @@ parse_log_for_system_stop (const GString *str, goto out; } - e = (CkLogSystemStopEvent *)event; - ret = TRUE; out: @@ -845,7 +838,6 @@ parse_log_for_system_restart (const GString *str, { gboolean ret; const char *s; - CkLogSystemRestartEvent *e; ret = FALSE; @@ -854,8 +846,6 @@ parse_log_for_system_restart (const GString *str, goto out; } - e = (CkLogSystemRestartEvent *)event; - ret = TRUE; out: diff --git a/tools/Makefile.am b/tools/Makefile.am index 74a4634..ccadcb2 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -24,7 +24,7 @@ DIST_SUBDIRS = \ solaris \ $(NULL) -INCLUDES = \ +AM_CFLAGS = \ -I. \ -I$(srcdir) \ -I$(top_srcdir)/src \ @@ -147,7 +147,7 @@ if ENABLE_UDEV_ACL udevrulesdir = $(UDEVDIR)/rules.d dist_udevrules_DATA = 70-udev-acl.rules -libexec_PROGRAMS = udev-acl +libexec_PROGRAMS += udev-acl udev_acl_SOURCES = udev-acl.c udev_acl_LDADD = $(UDEV_ACL_LIBS) diff --git a/tools/ck-log-system-start.c b/tools/ck-log-system-start.c index 6d46acc..22365e5 100644 --- a/tools/ck-log-system-start.c +++ b/tools/ck-log-system-start.c @@ -26,7 +26,7 @@ #include <unistd.h> #include <errno.h> #include <fcntl.h> -#ifdef __FreeBSD__ || defined(__FreeBSD_kernel__) +#ifdef __FreeBSD__ #include <kenv.h> #endif #include <sys/types.h> |