Skip to content

Commit 887e8bc

Browse files
committed
MT#55283 rename build test results from .h
Fixes duplicate compilation because all targets depend on lib/*.h Change-Id: Iccf2bfb2467ed4ea82e2471ac9ee7c3782128551
1 parent 61dbd3c commit 887e8bc

24 files changed

Lines changed: 36 additions & 33 deletions

daemon/codec.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "mqtt.h"
2121
#include "audio_player.h"
2222
#ifdef WITH_TRANSCODING
23-
#include "fix_frame_channel_layout.h"
23+
#include "fix_frame_channel_layout.compat"
2424
#endif
2525
#include "bufferpool.h"
2626
#include "ng_client.h"
@@ -101,7 +101,7 @@ static rtp_pt_list *__codec_store_delete_link(rtp_pt_list *link, struct codec_st
101101
#include <spandsp/logging.h>
102102
#include <spandsp/dtmf.h>
103103
#include "resample.h"
104-
#include "dtmf_rx_fillin.h"
104+
#include "dtmf_rx_fillin.compat"
105105

106106

107107

daemon/media_player.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "main.h"
2020
#include "rtcp.h"
2121
#ifdef WITH_TRANSCODING
22-
#include "fix_frame_channel_layout.h"
22+
#include "fix_frame_channel_layout.compat"
2323
#endif
2424
#include "kernel.h"
2525
#include "bufferpool.h"

daemon/t38.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <assert.h>
55
#include <spandsp/t30.h>
66
#include <spandsp/logging.h>
7-
#include "spandsp_logging.h"
7+
#include "spandsp_logging.compat"
88
#include "codec.h"
99
#include "call.h"
1010
#include "log_d.h"

lib/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
dtmf_rx_fillin.h
33
fix_frame_channel_layout.h
44
spandsp_logging.h
5+
*.compat

lib/codeclib.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "rtplib.h"
2222
#include "bitstr.h"
2323
#include "dtmflib.h"
24-
#include "fix_frame_channel_layout.h"
24+
#include "fix_frame_channel_layout.compat"
2525

2626

2727

lib/common.Makefile

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,13 @@ debug:
2222
$(MAKE) DBG=yes all
2323

2424

25-
BUILD_TEST_ALTS = ../lib/fix_frame_channel_layout.h ../lib/dtmf_rx_fillin.h ../lib/spandsp_logging.h
25+
BUILD_TEST_ALTS := ../lib/fix_frame_channel_layout.compat \
26+
../lib/dtmf_rx_fillin.compat \
27+
../lib/spandsp_logging.compat
2628

2729
clean:
2830
rm -f $(OBJS) $(TARGET) $(MANS) $(ADD_CLEAN) core core.*
29-
rm -f $(BUILD_TEST_ALTS) $(BUILD_TEST_ALTS:.h=-test) *.strhash.c
31+
rm -f $(BUILD_TEST_ALTS) $(BUILD_TEST_ALTS:.compat=-test) *.strhash.c
3032

3133
install:
3234

@@ -39,19 +41,19 @@ $(OBJS): Makefile ../include/* ../lib/*.h ../kernel-module/*.h
3941
-M "date:$(BUILD_DATE)" \
4042
-o "$@"
4143

42-
resample.c codeclib.strhash.c mix.c packet.c: ../lib/fix_frame_channel_layout.h
44+
resample.c codeclib.strhash.c mix.c packet.c: ../lib/fix_frame_channel_layout.compat
4345

4446
ifeq ($(with_transcoding),yes)
45-
../daemon/codec.c codec.c: ../lib/dtmf_rx_fillin.h
46-
media_player.c ../daemon/media_player.c ../daemon/codec.c codec.c test-resample.c: ../lib/fix_frame_channel_layout.h
47+
../daemon/codec.c codec.c: ../lib/dtmf_rx_fillin.compat
48+
media_player.c ../daemon/media_player.c ../daemon/codec.c codec.c test-resample.c: ../lib/fix_frame_channel_layout.compat
4749
endif
4850

49-
t38.c ../daemon/t38.c: ../lib/spandsp_logging.h
51+
t38.c ../daemon/t38.c: ../lib/spandsp_logging.compat
5052

5153
%.strhash.c: %.c ../utils/const_str_hash
5254
../utils/const_str_hash "$<" $(CFLAGS) < "$<" > "$@"
5355

54-
$(BUILD_TEST_ALTS): $(wildcard $(subst .h,-*,$(BUILD_TEST_ALTS)))
56+
$(BUILD_TEST_ALTS): $(wildcard $(subst .compat,-*,$(BUILD_TEST_ALTS)))
5557
../utils/build_test_wrapper "$@"
5658

5759
.PHONY: all debug clean install

lib/dtmf_rx_fillin-test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "dtmf_rx_fillin.h"
1+
#include "dtmf_rx_fillin.compat"
22
int main(void) {
33
dtmf_rx_state_t *dsp = NULL;
44
dtmf_rx_fillin(dsp, 0);

lib/fix_frame_channel_layout-test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "fix_frame_channel_layout.h"
1+
#include "fix_frame_channel_layout.compat"
22
int main(void) {
33
AVFrame *f = NULL;
44
fix_frame_channel_layout(f);

lib/resample.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include <libavutil/frame.h>
1212
#include "loglib.h"
1313
#include "codeclib.h"
14-
#include "fix_frame_channel_layout.h"
14+
#include "fix_frame_channel_layout.compat"
1515

1616

1717

lib/spandsp_logging-test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <spandsp/telephony.h>
77
#include <spandsp/logging.h>
88
#include "compat.h"
9-
#include "spandsp_logging.h"
9+
#include "spandsp_logging.compat"
1010

1111
void logfunc(SPAN_LOG_ARGS) {
1212
return;

0 commit comments

Comments
 (0)