From 3db63d0f916f38bec405fbc1736d6b26b55976e0 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Thu, 13 Oct 2016 13:46:28 +0200
Subject: build: merge policy/Makefile.am into parent Makefile.am

---
 Makefile.am        | 16 +++++++++++++++-
 configure.ac       |  1 -
 policy/Makefile.am | 28 ----------------------------
 3 files changed, 15 insertions(+), 30 deletions(-)
 delete mode 100644 policy/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1d522ddbfb..af2eb0babe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,6 @@ SUBDIRS = \
 	dispatcher \
 	clients \
 	tools \
-	policy \
 	data \
 	po \
 	man \
@@ -61,6 +60,19 @@ pkgconfig_DATA = NetworkManager.pc
 
 ###############################################################################
 
+polkit_policydir = $(datadir)/polkit-1/actions
+
+dist_polkit_policy_in_in_files = \
+	policy/org.freedesktop.NetworkManager.policy.in.in
+
+polkit_policy_DATA = $(dist_polkit_policy_in_in_files:.policy.in.in=.policy)
+
+@INTLTOOL_POLICY_RULE@
+
+DISTCLEANFILES += $(polkit_policy_DATA)
+
+###############################################################################
+
 EXTRA_DIST = \
 	CONTRIBUTING \
 	NetworkManager.pc.in \
@@ -101,6 +113,8 @@ CLEANFILES = \
 	\
 	shared/nm-version-macros.h \
 	\
+	policy/*~ \
+	\
 	$(NULL)
 
 ###############################################################################
diff --git a/configure.ac b/configure.ac
index ff0514987e..a245d72934 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1194,7 +1194,6 @@ introspection/Makefile
 man/Makefile
 man/common.ent
 po/Makefile.in
-policy/Makefile
 policy/org.freedesktop.NetworkManager.policy.in
 data/Makefile
 docs/Makefile
diff --git a/policy/Makefile.am b/policy/Makefile.am
deleted file mode 100644
index 37c4344aab..0000000000
--- a/policy/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-polkit_policydir = $(datadir)/polkit-1/actions
-
-dist_polkit_policy_in_in_files = \
-	org.freedesktop.NetworkManager.policy.in.in
-
-polkit_policy_DATA = $(dist_polkit_policy_in_in_files:.policy.in.in=.policy)
-
-@INTLTOOL_POLICY_RULE@
-
-# polkit >= 0.92 doesn't have an updated polkit-policy-file-validate
-#check:
-#	@for f in $(dist_polkit_policy_DATA); do \
-#            echo -n "Validate PolicyKit policy in $$f : "; \
-#            $(POLKIT_POLICY_FILE_VALIDATE) $(srcdir)/$$f ; \
-#	    ret=$$?; \
-#            if  [ "$$ret" = "0" ]; \
-#	      then \
-#                echo ok; \
-#            else \
-#                echo failed; \
-#		exit 1; \
-#            fi; \
-#        done;
-
-clean-local :
-	rm -f *~
-
-DISTCLEANFILES = $(polkit_policy_DATA)
-- 
cgit v1.2.1