From 6d3403edacbf547c31085acb0d542ec7f56c6e90 Mon Sep 17 00:00:00 2001 From: Gabe Date: Tue, 9 Dec 2014 18:40:52 -0700 Subject: [PATCH] Remove usage of app_PYTHON in ipaserver Makefiles - Remove ChangeLog from ipa-client/Makefile.am https://fedorahosted.org/freeipa/ticket/4700 Reviewed-By: Martin Basti --- ipa-client/Makefile.am | 20 -------------------- ipaserver/install/Makefile.am | 27 --------------------------- ipaserver/install/plugins/Makefile.am | 24 ------------------------ 3 files changed, 71 deletions(-) delete mode 100644 ipaserver/install/Makefile.am delete mode 100644 ipaserver/install/plugins/Makefile.am diff --git a/ipa-client/Makefile.am b/ipa-client/Makefile.am index b9c7020f3..0da351c6a 100644 --- a/ipa-client/Makefile.am +++ b/ipa-client/Makefile.am @@ -97,7 +97,6 @@ EXTRA_DIST = \ README \ HACKING \ NEWS \ - ChangeLog \ $(NULL) DISTCLEANFILES = \ @@ -125,22 +124,3 @@ MAINTAINERCLEANFILES = \ py-compile \ $(NULL) -# Creating ChangeLog from hg log (taken from cairo/Makefile.am): - -ChangeLog: $(srcdir)/ChangeLog - -$(srcdir)/ChangeLog: - @if test -d "$(srcdir)/../.hg"; then \ - (cd "$(srcdir)" && \ - ./missing --run hg log --verbose) | fmt --split-only > $@.tmp \ - && mv -f $@.tmp $@ \ - || ($(RM) $@.tmp; \ - echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \ - (test -f $@ || echo hg log is required to generate this file >> $@)); \ - else \ - test -f $@ || \ - (echo A hg checkout and hg -log is required to generate ChangeLog >&2 && \ - echo A hg checkout and hg log is required to generate this file >> $@); \ - fi - -.PHONY: ChangeLog $(srcdir)/ChangeLog diff --git a/ipaserver/install/Makefile.am b/ipaserver/install/Makefile.am deleted file mode 100644 index 9fcad4e77..000000000 --- a/ipaserver/install/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -NULL = - -appdir = $(pythondir)/ipaserver -app_PYTHON = \ - __init__.py \ - bindinstance.py \ - cainstance.py \ - dsinstance.py \ - ipaldap.py \ - krbinstance.py \ - httpinstance.py \ - ntpinstance.py \ - adtrustinstance.py \ - service.py \ - installutils.py \ - replication.py \ - certs.py \ - ldapupdate.py \ - certmonger.py \ - $(NULL) - -EXTRA_DIST = \ - $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in diff --git a/ipaserver/install/plugins/Makefile.am b/ipaserver/install/plugins/Makefile.am deleted file mode 100644 index d651297ac..000000000 --- a/ipaserver/install/plugins/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -NULL = - -appdir = $(pythondir)/ipaserver/install -app_PYTHON = \ - __init__.py \ - baseupdate.py \ - fix_replica_agreements.py \ - rename_managed.py \ - dns.py \ - updateclient.py \ - update_services.py \ - update_anonymous_aci.py \ - update_pacs.py \ - update_referint.py \ - ca_renewal_master.py \ - update_uniqueness.py \ - $(NULL) - -EXTRA_DIST = \ - $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in