summaryrefslogtreecommitdiff
path: root/cmdline/makefile
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-02-22 18:07:43 +0100
committerMichael Vogt <mvo@debian.org>2014-02-22 18:07:57 +0100
commit46a78c652d80818b4643c471432ae961b1ca5bd9 (patch)
treefdc1efade1457746e8ec12d1ad7efbb647157494 /cmdline/makefile
parent1c93747533dcf1cbbb2c743d0028ad157a7684a4 (diff)
downloadapt-46a78c652d80818b4643c471432ae961b1ca5bd9.tar.gz
remove auto-generated apt-key and sources.list on clean (closes: 739749)
Diffstat (limited to 'cmdline/makefile')
-rw-r--r--cmdline/makefile33
1 files changed, 19 insertions, 14 deletions
diff --git a/cmdline/makefile b/cmdline/makefile
index 06f170b6a..f89192e10 100644
--- a/cmdline/makefile
+++ b/cmdline/makefile
@@ -40,20 +40,6 @@ LIB_MAKES = apt-pkg/makefile
SOURCE = apt-cdrom.cc
include $(PROGRAM_H)
-# The apt-key program
-apt-key: apt-key.in
- sed -e "s#&keyring-filename;#$(shell ../vendor/getinfo keyring-filename)#" \
- -e "s#&keyring-removed-filename;#$(shell ../vendor/getinfo keyring-removed-filename)#" \
- -e "s#&keyring-master-filename;#$(shell ../vendor/getinfo keyring-master-filename)#" \
- -e "s#&keyring-uri;#$(shell ../vendor/getinfo keyring-uri)#" \
- -e "s#&keyring-package;#$(shell ../vendor/getinfo keyring-package)#" $< > $@
- chmod 755 $@
-
-SOURCE=apt-key
-TO=$(BIN)
-TARGET=program
-include $(COPY_H)
-
# The apt-mark program
PROGRAM=apt-mark
SLIBS = -lapt-pkg -lapt-private $(INTLLIBS)
@@ -99,3 +85,22 @@ SLIBS = -lapt-pkg $(INTLLIBS)
LIB_MAKES = apt-pkg/makefile
SOURCE = apt-dump-solver.cc
include $(PROGRAM_H)
+
+# The apt-key program
+apt-key: apt-key.in
+ sed -e "s#&keyring-filename;#$(shell ../vendor/getinfo keyring-filename)#" \
+ -e "s#&keyring-removed-filename;#$(shell ../vendor/getinfo keyring-removed-filename)#" \
+ -e "s#&keyring-master-filename;#$(shell ../vendor/getinfo keyring-master-filename)#" \
+ -e "s#&keyring-uri;#$(shell ../vendor/getinfo keyring-uri)#" \
+ -e "s#&keyring-package;#$(shell ../vendor/getinfo keyring-package)#" $< > $@
+ chmod 755 $@
+
+SOURCE=apt-key
+TO=$(BIN)
+TARGET=program
+include $(COPY_H)
+
+clean: clean/apt-key
+
+clean/apt-key:
+ rm -f apt-key