[network-manager-netbook/MplPanelClient] Package changes
- From: Tambet Ingo <tambeti src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [network-manager-netbook/MplPanelClient] Package changes
- Date: Fri, 13 Nov 2009 09:24:50 +0000 (UTC)
commit 2133dd710a6c6f0f8d90d15d10c0ba71386d9a0a
Author: Tambet Ingo <tambet gmail com>
Date: Thu Nov 12 10:46:14 2009 +0200
Package changes
Move the binary to libexec directory, it's not meant to be run by users.
Create the theme file while building, not when making dist.
Add DBus service file so that mutter-moblin can autorun us.
Makefile.am | 20 +++++++++++++++++---
org.moblin.UX.Shell.Panels.network.service.in | 3 +++
src/Makefile.am | 2 +-
3 files changed, 21 insertions(+), 4 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index cfbc576..909e9ad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,15 @@ SUBDIRS = icons src po
autostartdir = $(sysconfdir)/xdg/autostart
autostart_DATA = network-manager-netbook.desktop
+servicedir = $(datadir)/dbus-1/services
+service_in_files = org.moblin.UX.Shell.Panels.network.service.in
+service_DATA = org.moblin.UX.Shell.Panels.network.service
+
+%.service: %.service.in
+ $(AM_V_GEN) sed -e "s|\ libexecdir\@|$(libexecdir)|" $< > $@
+
themedir = $(pkgdatadir)/theme
+theme_in_files = network-manager-netbook.css.in
theme_DATA = network-manager-netbook.css
%.css: %.css.in
@@ -11,10 +19,16 @@ theme_DATA = network-manager-netbook.css
EXTRA_DIST = \
$(autostart_DATA) \
- $(theme_DATA) \
+ $(service_in_files) \
+ $(theme_in_files) \
intltool-extract.in \
intltool-merge.in \
intltool-update.in
-DISTCLEANFILES = intltool-extract intltool-merge intltool-update network-manager-netbook.css
-
+DISTCLEANFILES = \
+ $(service_DATA) \
+ $(theme_DATA) \
+ intltool-extract \
+ intltool-merge \
+ intltool-update \
+ network-manager-netbook.css
diff --git a/org.moblin.UX.Shell.Panels.network.service.in b/org.moblin.UX.Shell.Panels.network.service.in
new file mode 100644
index 0000000..c811bfd
--- /dev/null
+++ b/org.moblin.UX.Shell.Panels.network.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.moblin.UX.Shell.Panels.network
+Exec= libexecdir@/network-manager-netbook
diff --git a/src/Makefile.am b/src/Makefile.am
index a6d6f02..5dd2d8b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = marshallers gconf-helpers wireless-security
NULL=
-bin_PROGRAMS = network-manager-netbook
+libexec_PROGRAMS = network-manager-netbook
network_manager_netbook_CPPFLAGS = \
$(NMN_CFLAGS) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]