From ab54b774ed72293a6b421f24c4e974b44625fcbf Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Mon, 8 Feb 2021 14:14:22 -0500 Subject: [PATCH] TT#14008 remove .depend from make system The dependency tracker is causing more problems than what it's worth, so just remove it. Change-Id: I5db8cae57400cd644add08447406a4526da03f65 --- daemon/Makefile | 5 ++--- lib/common.Makefile | 11 +++-------- recording-daemon/Makefile | 2 -- t/Makefile | 7 ++----- 4 files changed, 7 insertions(+), 18 deletions(-) diff --git a/daemon/Makefile b/daemon/Makefile index 62ccb353d..89860063d 100644 --- a/daemon/Makefile +++ b/daemon/Makefile @@ -92,7 +92,6 @@ MANS= $(PODS:.pod=.8) include ../lib/common.Makefile ifeq ($(with_transcoding),yes) -.depend: dtmf_rx_fillin.h spandsp_logging.h +codec.c: dtmf_rx_fillin.h +t38.c: spandsp_logging.h endif - -include .depend diff --git a/lib/common.Makefile b/lib/common.Makefile index 986fa60e0..2a2f52816 100644 --- a/lib/common.Makefile +++ b/lib/common.Makefile @@ -3,23 +3,18 @@ include ../lib/lib.Makefile all: $(MAKE) $(TARGET) $(MANS) -$(TARGET): $(OBJS) .depend Makefile +$(TARGET): $(OBJS) Makefile $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(LDLIBS) debug: $(MAKE) DBG=yes all -dep: .depend - BUILD_TEST_ALTS = fix_frame_channel_layout.h dtmf_rx_fillin.h spandsp_logging.h clean: - rm -f $(OBJS) $(TARGET) $(LIBSRCS) $(DAEMONSRCS) $(MANS) $(ADD_CLEAN) .depend core core.* + rm -f $(OBJS) $(TARGET) $(LIBSRCS) $(DAEMONSRCS) $(MANS) $(ADD_CLEAN) core core.* rm -f $(BUILD_TEST_ALTS) $(BUILD_TEST_ALTS:.h=-test.c) $(BUILD_TEST_ALTS:.h=-test) *.strhash.c $(HASHSRCS) -.depend: $(SRCS) $(LIBSRCS) $(DAEMONSRCS) Makefile - $(CC) $(CFLAGS) -M $(SRCS) $(LIBSRCS) $(DAEMONSRCS) | sed -e 's/:/ .depend:/' > .depend - install: $(OBJS): Makefile @@ -60,4 +55,4 @@ $(BUILD_TEST_ALTS): ../lib/$(@:.h=-*) rm -f $(@:.h=-test{.c,}); \ test -f "$@" -.PHONY: all debug dep clean install +.PHONY: all debug clean install diff --git a/recording-daemon/Makefile b/recording-daemon/Makefile index 8f934e41c..b5f7c585d 100644 --- a/recording-daemon/Makefile +++ b/recording-daemon/Makefile @@ -36,5 +36,3 @@ PODS= rtpengine-recording.pod MANS= $(PODS:.pod=.8) include ../lib/common.Makefile - -include .depend diff --git a/t/Makefile b/t/Makefile index 1b6e832d7..544635991 100644 --- a/t/Makefile +++ b/t/Makefile @@ -82,8 +82,6 @@ COMMONOBJS= str.o auxlib.o rtplib.o loglib.o include ../lib/common.Makefile -include .depend - .PHONY: all-tests unit-tests daemon-tests all-daemon-tests \ daemon-tests-main daemon-tests-jb daemon-tests-reorder @@ -174,6 +172,5 @@ test-const_str_hash.strhash: test-const_str_hash.strhash.o $(COMMONOBJS) tests-preload.so: tests-preload.c $(CC) -g -D_GNU_SOURCE -std=c99 -o $@ -Wall -shared -fPIC $< -ldl -ifeq ($(with_transcoding),yes) -.depend: dtmf_rx_fillin.h spandsp_logging.h -endif +codec.c: dtmf_rx_fillin.h +t38.c: spandsp_logging.h