From daa0bf932ed64aea20a0db6fc6596a7d49f14d44 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Fri, 22 Feb 2019 14:32:04 -0500 Subject: [PATCH] fix tests compilation for with_transcoding=no fixes #707 Change-Id: Ieb8b5365aab6b07967eb1576626fbf9dc0df27ad --- t/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/t/Makefile b/t/Makefile index 6786cb7ec..e9468532d 100644 --- a/t/Makefile +++ b/t/Makefile @@ -9,6 +9,7 @@ CFLAGS+= $(shell pkg-config --cflags gthread-2.0) CFLAGS+= $(shell pkg-config --cflags openssl) CFLAGS+= -I. -I../lib/ -I../kernel-module/ -I../include/ CFLAGS+= -D_GNU_SOURCE +CFLAGS+= $(shell pkg-config --cflags libpcre) ifeq ($(with_transcoding),yes) CFLAGS+= $(shell pkg-config --cflags libavcodec) CFLAGS+= $(shell pkg-config --cflags libavformat) @@ -16,7 +17,6 @@ CFLAGS+= $(shell pkg-config --cflags libavutil) CFLAGS+= $(shell pkg-config --cflags libswresample) CFLAGS+= $(shell pkg-config --cflags libavfilter) CFLAGS+= -DWITH_TRANSCODING -CFLAGS+= $(shell pkg-config --cflags libpcre) CFLAGS+= $(shell pkg-config --cflags zlib) CFLAGS+= $(shell pkg-config --cflags json-glib-1.0) CFLAGS+= $(shell pkg-config --cflags libevent_pthreads) @@ -32,13 +32,13 @@ LDLIBS+= $(shell pkg-config --libs glib-2.0) LDLIBS+= $(shell pkg-config --libs gthread-2.0) LDLIBS+= $(shell pkg-config --libs libcrypto) LDLIBS+= $(shell pkg-config --libs openssl) +LDLIBS+= $(shell pkg-config --libs libpcre) ifeq ($(with_transcoding),yes) LDLIBS+= $(shell pkg-config --libs libavcodec) LDLIBS+= $(shell pkg-config --libs libavformat) LDLIBS+= $(shell pkg-config --libs libavutil) LDLIBS+= $(shell pkg-config --libs libswresample) LDLIBS+= $(shell pkg-config --libs libavfilter) -LDLIBS+= $(shell pkg-config --libs libpcre) LDLIBS+= $(shell pkg-config --libs zlib) LDLIBS+= $(shell pkg-config --libs json-glib-1.0) LDLIBS+= -lpcap @@ -51,15 +51,15 @@ endif SRCS= bitstr-test.c aes-crypt.c payload-tracker-test.c const_str_hash-test.strhash.c LIBSRCS= loglib.c auxlib.c str.c rtplib.c -DAEMONSRCS= crypto.c +DAEMONSRCS= crypto.c ssrc.c aux.c rtp.c HASHSRCS= ifeq ($(with_transcoding),yes) SRCS+= amr-decode-test.c amr-encode-test.c transcode-test.c LIBSRCS+= codeclib.c resample.c -DAEMONSRCS+= codec.c ssrc.c call.c ice.c aux.c kernel.c media_socket.c stun.c bencode.c socket.c poller.c \ +DAEMONSRCS+= codec.c call.c ice.c kernel.c media_socket.c stun.c bencode.c socket.c poller.c \ dtls.c recording.c statistics.c rtcp.c redis.c iptables.c graphite.c \ - rtp.c streambuf.c cookie_cache.c udp_listener.c homer.c load.c cdr.c dtmf.c + streambuf.c cookie_cache.c udp_listener.c homer.c load.c cdr.c dtmf.c HASHSRCS+= call_interfaces.c control_ng.c sdp.c endif