[nanny] Flaged posix support
- From: Roberto Majadas <telemaco src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nanny] Flaged posix support
- Date: Sun, 23 Jan 2011 18:00:25 +0000 (UTC)
commit 188471be545514ab7aa76fc4f6e6fad25a51cddc
Author: Roberto Majadas <roberto majadas openshine com>
Date: Tue Sep 14 13:27:35 2010 +0200
Flaged posix support
client/gnome/systray/data/Makefile.am | 4 +++-
daemon/data/Makefile.am | 4 ++++
daemon/data/applists/Makefile.am | 4 +++-
daemon/data/dbus/Makefile.am | 4 +++-
daemon/data/init.d/debian/Makefile.am | 2 ++
daemon/data/init.d/mandriva/Makefile.am | 2 ++
daemon/data/init.d/redhat/Makefile.am | 2 ++
daemon/data/init.d/suse/Makefile.am | 2 ++
help/Makefile.am | 11 ++++++++++-
9 files changed, 31 insertions(+), 4 deletions(-)
---
diff --git a/client/gnome/systray/data/Makefile.am b/client/gnome/systray/data/Makefile.am
index f8964ec..1f4fdb4 100644
--- a/client/gnome/systray/data/Makefile.am
+++ b/client/gnome/systray/data/Makefile.am
@@ -1,4 +1,6 @@
+if NANNY_POSIX_SUPPORT
systraydir = $(sysconfdir)/xdg/autostart/
systray_DATA = nanny-systray.desktop
+endif
-EXTRA_DIST=$(systray_DATA)
+EXTRA_DIST=nanny-systray.desktop
diff --git a/daemon/data/Makefile.am b/daemon/data/Makefile.am
index 92cb3ab..3dae9e3 100644
--- a/daemon/data/Makefile.am
+++ b/daemon/data/Makefile.am
@@ -1,10 +1,14 @@
SUBDIRS=applists dbus init.d
+if NANNY_POSIX_SUPPORT
policy_in_files = org.gnome.nanny.policy.in
policydir = $(POLKIT_POLICY_DIR)
policy_DATA = $(policy_in_files:.policy.in=.policy)
@INTLTOOL_POLICY_RULE@
CLEANFILES = org.gnome.nanny.policy
+endif
+
EXTRA_DIST= org.gnome.nanny.policy.in
+
diff --git a/daemon/data/applists/Makefile.am b/daemon/data/applists/Makefile.am
index a50fb53..24b2eb3 100644
--- a/daemon/data/applists/Makefile.am
+++ b/daemon/data/applists/Makefile.am
@@ -1,4 +1,6 @@
+if NANNY_POSIX_SUPPORT
dbusdir = $(sysconfdir)/nanny/applists/
dbus_DATA = browsers email im
+endif
-EXTRA_DIST=$(dbus_DATA)
+EXTRA_DIST = browsers email im
diff --git a/daemon/data/dbus/Makefile.am b/daemon/data/dbus/Makefile.am
index 7497488..07f5cc9 100644
--- a/daemon/data/dbus/Makefile.am
+++ b/daemon/data/dbus/Makefile.am
@@ -1,4 +1,6 @@
+if NANNY_POSIX_SUPPORT
dbusdir = $(sysconfdir)/dbus-1/system.d/
dbus_DATA = nanny-daemon.conf
+endif
-EXTRA_DIST=$(dbus_DATA)
+EXTRA_DIST= nanny-daemon.conf
diff --git a/daemon/data/init.d/debian/Makefile.am b/daemon/data/init.d/debian/Makefile.am
index f9bfe30..715769a 100644
--- a/daemon/data/init.d/debian/Makefile.am
+++ b/daemon/data/init.d/debian/Makefile.am
@@ -1,3 +1,4 @@
+if NANNY_POSIX_SUPPORT
if NANNY_INIT_SCRIPTS_DEBIAN
initddir=$(sysconfdir)/init.d
@@ -6,5 +7,6 @@ initd_SCRIPTS= \
nanny
endif
+endif
EXTRA_DIST=nanny
diff --git a/daemon/data/init.d/mandriva/Makefile.am b/daemon/data/init.d/mandriva/Makefile.am
index 594c29c..cb5b0a9 100644
--- a/daemon/data/init.d/mandriva/Makefile.am
+++ b/daemon/data/init.d/mandriva/Makefile.am
@@ -1,3 +1,4 @@
+if NANNY_POSIX_SUPPORT
if NANNY_INIT_SCRIPTS_MANDRIVA
initddir=$(sysconfdir)/init.d
@@ -5,5 +6,6 @@ initddir=$(sysconfdir)/init.d
initd_SCRIPTS= \
nanny
endif
+endif
EXTRA_DIST=nanny
diff --git a/daemon/data/init.d/redhat/Makefile.am b/daemon/data/init.d/redhat/Makefile.am
index 07a6d5b..a3de1f8 100644
--- a/daemon/data/init.d/redhat/Makefile.am
+++ b/daemon/data/init.d/redhat/Makefile.am
@@ -1,3 +1,4 @@
+if NANNY_POSIX_SUPPORT
if NANNY_INIT_SCRIPTS_RED_HAT
initddir=$(sysconfdir)/rc.d/init.d
@@ -5,5 +6,6 @@ initddir=$(sysconfdir)/rc.d/init.d
initd_SCRIPTS= \
nanny
endif
+endif
EXTRA_DIST=nanny
diff --git a/daemon/data/init.d/suse/Makefile.am b/daemon/data/init.d/suse/Makefile.am
index 9e17278..085e87c 100644
--- a/daemon/data/init.d/suse/Makefile.am
+++ b/daemon/data/init.d/suse/Makefile.am
@@ -1,3 +1,4 @@
+if NANNY_POSIX_SUPPORT
if NANNY_INIT_SCRIPTS_SUSE
initddir=$(sysconfdir)/init.d
@@ -5,5 +6,6 @@ initddir=$(sysconfdir)/init.d
initd_SCRIPTS= \
nanny
endif
+endif
EXTRA_DIST=nanny
diff --git a/help/Makefile.am b/help/Makefile.am
index cd00b46..2f920a9 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,3 +1,5 @@
+if NANNY_POSIX_SUPPORT
+
include $(top_srcdir)/gnome-doc-utils.make
dist-hook: doc-dist-hook
@@ -17,5 +19,12 @@ help_DATA = C/nanny.xml \
C/figures/nanny-session.png \
C/figures/nanny-web-content-filter-blacklists.png
-EXTRA_DIST=$(help_DATA)
+endif
+
+EXTRA_DIST = C/nanny.xml \
+ C/figures/nanny-add-forbidden-site.png \
+ C/figures/nanny-select-file-to-import.png \
+ C/figures/nanny-session.png \
+ C/figures/nanny-web-content-filter-blacklists.png
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]