sipwise
/
rtpengine
mirror of https://github.com/sipwise/rtpengine.git
1
0
Fork 0
Code Issues Releases Wiki Activity

MT#55283 rename build test results from .h

Browse Source 
Fixes duplicate compilation because all targets depend on lib/*.h

Change-Id: Iccf2bfb2467ed4ea82e2471ac9ee7c3782128551
pull/2139/head
Richard Fuchs 2 months ago
parent 61dbd3cc18
commit 887e8bc038
24 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File

4
daemon/codec.c
Unescape View File

@ -20,7 +20,7 @@
#include "mqtt.h"
#include "audio_player.h"
#ifdef WITH_TRANSCODING
#include "fix_frame_channel_layout.h"
#include "fix_frame_channel_layout.compat"
#endif
#include "bufferpool.h"
#include "ng_client.h"
@ -101,7 +101,7 @@ static rtp_pt_list *__codec_store_delete_link(rtp_pt_list *link, struct codec_st
#include <spandsp/logging.h>
#include <spandsp/dtmf.h>
#include "resample.h"
#include "dtmf_rx_fillin.h"
#include "dtmf_rx_fillin.compat"

2
daemon/media_player.c
Unescape View File

@ -19,7 +19,7 @@
#include "main.h"
#include "rtcp.h"
#ifdef WITH_TRANSCODING
#include "fix_frame_channel_layout.h"
#include "fix_frame_channel_layout.compat"
#endif
#include "kernel.h"
#include "bufferpool.h"

2
daemon/t38.c
Unescape View File

@ -4,7 +4,7 @@
#include <assert.h>
#include <spandsp/t30.h>
#include <spandsp/logging.h>
#include "spandsp_logging.h"
#include "spandsp_logging.compat"
#include "codec.h"
#include "call.h"
#include "log_d.h"

1
lib/.gitignore vendored
Unescape View File

@ -2,3 +2,4 @@
dtmf_rx_fillin.h
fix_frame_channel_layout.h
spandsp_logging.h
*.compat

2
lib/codeclib.c
Unescape View File

@ -21,7 +21,7 @@
#include "rtplib.h"
#include "bitstr.h"
#include "dtmflib.h"
#include "fix_frame_channel_layout.h"
#include "fix_frame_channel_layout.compat"

16
lib/common.Makefile
Unescape View File

@ -22,11 +22,13 @@ debug:
$(MAKE) DBG=yes all
BUILD_TEST_ALTS = ../lib/fix_frame_channel_layout.h ../lib/dtmf_rx_fillin.h ../lib/spandsp_logging.h
BUILD_TEST_ALTS := ../lib/fix_frame_channel_layout.compat \
../lib/dtmf_rx_fillin.compat \
../lib/spandsp_logging.compat
clean:
rm -f $(OBJS) $(TARGET) $(MANS) $(ADD_CLEAN) core core.*
rm -f $(BUILD_TEST_ALTS) $(BUILD_TEST_ALTS:.h=-test) *.strhash.c
rm -f $(BUILD_TEST_ALTS) $(BUILD_TEST_ALTS:.compat=-test) *.strhash.c
install:
@ -39,19 +41,19 @@ $(OBJS): Makefile ../include/* ../lib/*.h ../kernel-module/*.h
-M "date:$(BUILD_DATE)" \
-o "$@"
resample.c codeclib.strhash.c mix.c packet.c: ../lib/fix_frame_channel_layout.h
resample.c codeclib.strhash.c mix.c packet.c: ../lib/fix_frame_channel_layout.compat
ifeq ($(with_transcoding),yes)
../daemon/codec.c codec.c: ../lib/dtmf_rx_fillin.h
media_player.c ../daemon/media_player.c ../daemon/codec.c codec.c test-resample.c: ../lib/fix_frame_channel_layout.h
../daemon/codec.c codec.c: ../lib/dtmf_rx_fillin.compat
media_player.c ../daemon/media_player.c ../daemon/codec.c codec.c test-resample.c: ../lib/fix_frame_channel_layout.compat
endif
t38.c ../daemon/t38.c: ../lib/spandsp_logging.h
t38.c ../daemon/t38.c: ../lib/spandsp_logging.compat
%.strhash.c: %.c ../utils/const_str_hash
../utils/const_str_hash "$<" $(CFLAGS) < "$<" > "$@"
$(BUILD_TEST_ALTS): $(wildcard $(subst .h,-*,$(BUILD_TEST_ALTS)))
$(BUILD_TEST_ALTS): $(wildcard $(subst .compat,-*,$(BUILD_TEST_ALTS)))
../utils/build_test_wrapper "$@"
.PHONY: all debug clean install

2
lib/dtmf_rx_fillin-test.c
Unescape View File

@ -1,4 +1,4 @@
#include "dtmf_rx_fillin.h"
#include "dtmf_rx_fillin.compat"
int main(void) {
dtmf_rx_state_t *dsp = NULL;
dtmf_rx_fillin(dsp, 0);

2
lib/fix_frame_channel_layout-test.c
Unescape View File

@ -1,4 +1,4 @@
#include "fix_frame_channel_layout.h"
#include "fix_frame_channel_layout.compat"
int main(void) {
AVFrame *f = NULL;
fix_frame_channel_layout(f);

2
lib/resample.c
Unescape View File

@ -11,7 +11,7 @@
#include <libavutil/frame.h>
#include "loglib.h"
#include "codeclib.h"
#include "fix_frame_channel_layout.h"
#include "fix_frame_channel_layout.compat"

2
lib/spandsp_logging-test.c
Unescape View File

@ -6,7 +6,7 @@
#include <spandsp/telephony.h>
#include <spandsp/logging.h>
#include "compat.h"
#include "spandsp_logging.h"
#include "spandsp_logging.compat"
void logfunc(SPAN_LOG_ARGS) {
return;

2
perf-tester/Makefile
Unescape View File

@ -51,7 +51,7 @@ LIBASM := mvr2s_x64_avx2.S mvr2s_x64_avx512.S
include ../lib/common.Makefile
main.o: ../lib/fix_frame_channel_layout.h
main.o: ../lib/fix_frame_channel_layout.compat
install: $(TARGET)
install -m 0755 -D $(TARGET) $(DESTDIR)/usr/bin/$(TARGET)

2
perf-tester/main.c
Unescape View File

@ -15,7 +15,7 @@
#include "poller.h"
#include "ssllib.h"
#include "obj.h"
#include "fix_frame_channel_layout.h"
#include "fix_frame_channel_layout.compat"
#include "log.h"

2
recording-daemon/mix.c
Unescape View File

@ -13,7 +13,7 @@
#include "output.h"
#include "resample.h"
#include "main.h"
#include "fix_frame_channel_layout.h"
#include "fix_frame_channel_layout.compat"

2
recording-daemon/output.c
Unescape View File

@ -13,7 +13,7 @@
#include "recaux.h"
#include "notify.h"
#include "resample.h"
#include "fix_frame_channel_layout.h"
#include "fix_frame_channel_layout.compat"
#include "s3.h"
#include "gcs.h"

2
recording-daemon/packet.c
Unescape View File

@ -17,7 +17,7 @@
#include "streambuf.h"
#include "resample.h"
#include "tag.h"
#include "fix_frame_channel_layout.h"
#include "fix_frame_channel_layout.compat"
#include "tls_send.h"
#include "mix.h"

2
recording-daemon/tls_send.c
Unescape View File

@ -8,7 +8,7 @@
#include "resample.h"
#include "main.h"
#include "streambuf.h"
#include "fix_frame_channel_layout.h"
#include "fix_frame_channel_layout.compat"
#include "output.h"
#include "tag.h"

8
t/Makefile
Unescape View File

@ -499,7 +499,7 @@ tests-preload.so: tests-preload.c
time-fudge-preload.so: time-fudge-preload.c
$(CC) $(PRELOAD_CFLAGS) -o $@ -shared -fPIC $< $(PRELOAD_LIBS)
spandsp_send_fax_pcm.c: ../lib/spandsp_logging.h
spandsp_send_fax_t38.c: ../lib/spandsp_logging.h
spandsp_recv_fax_t38.c: ../lib/spandsp_logging.h
spandsp_recv_fax_pcm.c: ../lib/spandsp_logging.h
spandsp_send_fax_pcm.c: ../lib/spandsp_logging.compat
spandsp_send_fax_t38.c: ../lib/spandsp_logging.compat
spandsp_recv_fax_t38.c: ../lib/spandsp_logging.compat
spandsp_recv_fax_pcm.c: ../lib/spandsp_logging.compat

2
t/spandsp_recv_fax_pcm.c
Unescape View File

@ -13,7 +13,7 @@
#include <spandsp/t30_api.h>
#include <spandsp/fax.h>
#include "compat.h"
#include "spandsp_logging.h"
#include "spandsp_logging.compat"

2
t/spandsp_recv_fax_t38.c
Unescape View File

@ -16,7 +16,7 @@
#include <spandsp/t38_terminal.h>
#include <spandsp/fax.h>
#include "compat.h"
#include "spandsp_logging.h"
#include "spandsp_logging.compat"

2
t/spandsp_send_fax_pcm.c
Unescape View File

@ -13,7 +13,7 @@
#include <spandsp/t30_api.h>
#include <spandsp/fax.h>
#include "compat.h"
#include "spandsp_logging.h"
#include "spandsp_logging.compat"

2
t/spandsp_send_fax_t38.c
Unescape View File

@ -16,7 +16,7 @@
#include <spandsp/t38_terminal.h>
#include <spandsp/fax.h>
#include "compat.h"
#include "spandsp_logging.h"
#include "spandsp_logging.compat"

2
t/test-amr-encode.c
Unescape View File

@ -1,6 +1,6 @@
#include "codeclib.h"
#include "str.h"
#include "fix_frame_channel_layout.h"
#include "fix_frame_channel_layout.compat"
#include "main.h"
#include <assert.h>

2
t/test-resample.c
Unescape View File

@ -3,7 +3,7 @@
#include <assert.h>
#include "resample.h"
#include "codeclib.h"
#include "fix_frame_channel_layout.h"
#include "fix_frame_channel_layout.compat"
#include "main.h"
struct rtpengine_config rtpe_config;

2
utils/build_test_wrapper
Unescape View File

@ -1,6 +1,6 @@
#!/bin/sh
TARGET=$1
ROOT=$(echo "$TARGET" | sed 's/\.h$//')
ROOT=$(echo "$TARGET" | sed 's/\.compat$//')
if test "$MAKE" = ""; then
# shellcheck disable=SC2209
MAKE=make

Write Preview
Loading…
Cancel
Save