[network-manager-openswan/dcbw/libreswan: 8/11] build: remove .desktop file
- From: Dan Williams <dcbw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-openswan/dcbw/libreswan: 8/11] build: remove .desktop file
- Date: Fri, 12 Dec 2014 19:19:14 +0000 (UTC)
commit 74f4d040ddf7393c226516f8368bcff9bdc97c20
Author: Dan Williams <dcbw redhat com>
Date: Mon Dec 1 12:04:00 2014 -0600
build: remove .desktop file
They aren't used for anything, and weren't installed by the makefile.
Makefile.am | 18 +-----------------
nm-openswan.desktop.in | 11 -----------
po/POTFILES.in | 1 -
3 files changed, 1 insertions(+), 29 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 1cec43d..536f705 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,20 +12,6 @@ dbusservice_DATA = nm-openswan-service.conf
nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN
nmvpnservice_DATA = nm-openswan-service.name
-desktopfile = nm-openswan.desktop.in
-#iconfile = gnome-mime-application-x-openswan-ipsec-vpn-settings.png
-
-if WITH_GNOME
-# FIXME: uncomment when nmce gets --import support
-#desktopdir = $(datadir)/applications
-#desktop_in_files = $(desktopfile)
-#desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-# INTLTOOL_DESKTOP_RULE@
-
-icondir = $(datadir)/icons/hicolor/48x48/apps
-#icon_DATA = $(iconfile)
-endif
-
nm-openswan-service.name: $(srcdir)/nm-openswan-service.name.in
sed -e 's|[ ]LIBEXECDIR[@]|$(libexecdir)|g' \
-e 's|[ ]PLUGINDIR[@]|$(libdir)/NetworkManager|g' \
@@ -35,14 +21,12 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-more-warnings=yes
EXTRA_DIST = nm-openswan-service.name.in \
$(dbusservice_DATA) \
- $(desktopfile) \
- #$(iconfile) \
intltool-extract.in \
intltool-merge.in \
intltool-update.in \
nm-test-helpers.h
-CLEANFILES = $(nmvpnservice_DATA) $(desktop_DATA) *~
+CLEANFILES = $(nmvpnservice_DATA) *~
DISTCLEANFILES = intltool-extract intltool-merge intltool-update
ACLOCAL_AMFLAGS = -I m4
diff --git a/po/POTFILES.in b/po/POTFILES.in
index da3f3ca..eeeb16f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,7 +2,6 @@
# Please keep this file sorted alphabetically.
auth-dialog/main.c
auth-dialog/nm-openswan-auth-dialog.desktop.in.in
-nm-openswan.desktop.in
properties/nm-openswan.c
[type: gettext/glade]properties/nm-openswan-dialog.ui
src/nm-openswan-service.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]