build: merge policy/Makefile.am into parent Makefile.am
This commit is contained in:
16
Makefile.am
16
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)
|
||||
|
||||
###############################################################################
|
||||
|
@@ -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
|
||||
|
@@ -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)
|
Reference in New Issue
Block a user