From 3c813acacc6f0465cd25d01290aafb41f4080da8 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Thu, 6 Apr 2017 18:29:50 +0200 Subject: [PATCH] support wheezy build reported at #343 (cherry picked from commit db7537b1f0499ca35bc58f61522e2eb3be91a7aa) --- Makefile | 4 ++-- daemon/Makefile | 3 ++- debian/rules | 2 ++ iptables-extension/Makefile | 4 +++- kernel-module/Makefile | 4 +++- recording-daemon/Makefile | 3 ++- 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 680c5dc18..3564c2192 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ RTPENGINE_ROOT_DIR=. include lib/lib.Makefile -.PHONY: all clean coverity +.PHONY: all distclean clean coverity all: $(MAKE) -C daemon @@ -13,7 +13,7 @@ with-kernel: $(MAKE) $(MAKE) -C kernel-module -clean: +distclean clean: $(MAKE) -C daemon clean $(MAKE) -C recording-daemon clean $(MAKE) -C iptables-extension clean diff --git a/daemon/Makefile b/daemon/Makefile index d76e8b132..ce91f6ddd 100644 --- a/daemon/Makefile +++ b/daemon/Makefile @@ -43,7 +43,7 @@ LIBSRCS= loglib.c auxlib.c rtplib.c OBJS= $(SRCS:.c=.o) $(LIBSRCS:.c=.o) -.PHONY: all dep clean tests debug +.PHONY: all dep clean debug install all: $(MAKE) $(TARGET) @@ -67,5 +67,6 @@ $(OBJS): Makefile $(LIBSRCS): ln -fs ../lib/$@ +install: include .depend diff --git a/debian/rules b/debian/rules index 288c6ad33..30c151ef8 100755 --- a/debian/rules +++ b/debian/rules @@ -62,3 +62,5 @@ override_dh_auto_install-indep: .PHONY: override_dh_strip override_dh_strip: dh_strip --dbg-package=ngcp-rtpengine-dbg + +override_dh_auto_test: diff --git a/iptables-extension/Makefile b/iptables-extension/Makefile index dc1f0bdaf..8aeb2ae24 100644 --- a/iptables-extension/Makefile +++ b/iptables-extension/Makefile @@ -17,7 +17,7 @@ IP6TABLES = $(shell test -e /usr/include/ip6tables.h && echo 1) WORK=0 -.PHONY: all module clean +.PHONY: all module clean install all: module @@ -55,3 +55,5 @@ endif clean: rm -f libxt_RTPENGINE.so libipt_RTPENGINE.so libip6t_RTPENGINE.so + +install: diff --git a/kernel-module/Makefile b/kernel-module/Makefile index 9b1528c96..eb2527d89 100644 --- a/kernel-module/Makefile +++ b/kernel-module/Makefile @@ -28,7 +28,7 @@ EXTRA_CFLAGS += -D__RE_EXTERNAL obj-m += xt_RTPENGINE.o -.PHONY: modules clean patch +.PHONY: modules clean patch install modules: make -C $(KBUILD) M=$(PWD) O=$(KBUILD) modules @@ -38,3 +38,5 @@ clean: patch: ../utils/patch-kernel magic "$(PWD)" "$(KERNEL)" "$(RTPENGINE_VERSION)" + +install: diff --git a/recording-daemon/Makefile b/recording-daemon/Makefile index d8e066264..82d84e380 100644 --- a/recording-daemon/Makefile +++ b/recording-daemon/Makefile @@ -30,7 +30,7 @@ LIBSRCS= loglib.c auxlib.c rtplib.c OBJS= $(SRCS:.c=.o) $(LIBSRCS:.c=.o) -.PHONY: all dep clean tests debug +.PHONY: all dep clean debug install all: $(MAKE) $(TARGET) @@ -54,5 +54,6 @@ $(OBJS): Makefile $(LIBSRCS): ln -fs ../lib/$@ +install: include .depend