From e4a1a556fa7bc2ca1968151532be0419076baf9c Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Thu, 20 Dec 2018 14:02:35 +0100 Subject: [PATCH] TT#49106 Rely on upstream Makefile for building and cleaning Move the Debian specific cleaning into a debian/clean file to avoid having to add an override. And rely on the upstream Makefile which should always be doing the correct job. Change-Id: I6eb554428eafdcad13ea0490fca745ae72390f9c --- debian/.gitignore | 2 ++ debian/clean | 2 ++ debian/rules | 16 ---------------- 3 files changed, 4 insertions(+), 16 deletions(-) create mode 100644 debian/clean diff --git a/debian/.gitignore b/debian/.gitignore index 6fad2ea3c..270fb6f99 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -11,3 +11,5 @@ /ngcp-rtpengine-recording-daemon/ /ngcp-rtpengine-utils/ /ngcp-rtpengine/ +README.html.gz +README.md.gz diff --git a/debian/clean b/debian/clean new file mode 100644 index 000000000..934cc4739 --- /dev/null +++ b/debian/clean @@ -0,0 +1,2 @@ +debian/README.html.gz +debian/README.md.gz diff --git a/debian/rules b/debian/rules index 9f1cb4490..c21f1820f 100755 --- a/debian/rules +++ b/debian/rules @@ -24,20 +24,6 @@ XTABLES_DIR:=$(shell pkg-config xtables --variable=xtlibdir || echo /lib/xtables %: dh $@ -override_dh_auto_build-arch: - $(MAKE) -C iptables-extension - $(MAKE) -C daemon - $(MAKE) -C recording-daemon - -override_dh_auto_clean: - (cd daemon && $(MAKE) clean) - (cd recording-daemon && $(MAKE) clean) - (cd iptables-extension && $(MAKE) clean) - rm -f daemon/build_time.h kernel-module/.xt_RTPENGINE.o.d - rm -rf kernel-module/.tmp_versions - rm -f debian/README.html.gz debian/README.md.gz - dh_auto_clean - override_dh_auto_install-indep: # Create the directories to install the source into dh_installdirs -p$(psource) usr/src/modules/$(sname)/debian @@ -82,5 +68,3 @@ override_dh_systemd_enable: override_dh_systemd_start: dh_systemd_start --no-start dh_systemd_start -pngcp-rtpengine-recording-daemon --name=ngcp-rtpengine-recording-nfs-mount --no-start - -override_dh_auto_test: