Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
mediastreamer2
Commits
f73df65b
Commit
f73df65b
authored
Sep 07, 2012
by
Ghislain MARY
Browse files
Deactivate compilation of RTP dependent parts when using --disable-ortp option.
parent
61ebabd0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
9 deletions
+30
-9
src/Makefile.am
src/Makefile.am
+18
-8
tests/Makefile.am
tests/Makefile.am
+12
-1
No files found.
src/Makefile.am
View file @
f73df65b
...
...
@@ -31,9 +31,7 @@ libmediastreamer_la_SOURCES= mscommon.c $(GITVERSION_FILE) \
alaw.c
\
ulaw.c
\
mssndcard.c
\
msrtp.c
\
dtmfgen.c
\
ice.c
\
tee.c
\
msconf.c
\
msjoin.c
\
...
...
@@ -53,22 +51,32 @@ libmediastreamer_la_SOURCES= mscommon.c $(GITVERSION_FILE) \
audiomixer.c
\
itc.c
\
tonedetector.c
\
qualityindicator.c
\
g722_decode.c g722.h
\
g722_encode.c
\
msg722.c
\
l16.c
\
audioconference.c
\
bitratedriver.c
\
qosanalyzer.c
\
bitratecontrol.c
\
genericplc.c
#dummy c++ file to force libtool to use c++ linking (because of msdscap-mingw.cc)
nodist_EXTRA_libmediastreamer_la_SOURCES
=
dummy.cxx
libmediastreamer_la_SOURCES
+=
audiostream.c
if
ORTP_ENABLED
libmediastreamer_la_SOURCES
+=
audiostream.c
\
ice.c
\
msrtp.c
\
qualityindicator.c
\
audioconference.c
\
bitratedriver.c
\
qosanalyzer.c
\
bitratecontrol.c
else
libmediastreamer_la_SOURCES
+=
ortp-deps/b64.c
\
ortp-deps/logging.c
\
ortp-deps/payloadtype.c
\
ortp-deps/port.c
\
ortp-deps/str_utils.c
endif
if
BUILD_SPEEX
libmediastreamer_la_SOURCES
+=
msspeex.c speexec.c
...
...
@@ -189,7 +197,9 @@ libmediastreamer_la_SOURCES+= rfc2429.h \
layouts.c layouts.h
\
nowebcam.c nowebcam.h
if
ORTP_ENABLED
libmediastreamer_la_SOURCES
+=
videostream.c
endif
endif
...
...
tests/Makefile.am
View file @
f73df65b
if
ENABLE_TESTS
noinst_PROGRAMS
=
echo
ring mtudiscover bench tones
noinst_PROGRAMS
=
mtudiscover tones
if
ORTP_ENABLED
noinst_PROGRAMS
+=
echo
ring bench
if
BUILD_VIDEO
noinst_PROGRAMS
+=
videodisplay test_x11window
endif
endif
echo_SOURCES
=
echo.c
...
...
@@ -28,6 +33,7 @@ TEST_DEPLIBS=\
$(VP8_LIBS)
\
$(VIDEO_LIBS)
if
ORTP_ENABLED
bin_PROGRAMS
=
mediastream
mediastream_SOURCES
=
mediastream.c
...
...
@@ -44,9 +50,14 @@ mediastream_LDADD+=libmediastream_cocoa.la
endif
endif
LDADD
=
$(TEST_DEPLIBS)
INCLUDES
=
-I
$(top_srcdir)
/include/
if
!ORTP_ENABLED
INCLUDES
+=
-I
$(top_srcdir)
/src/ortp-deps/
endif
AM_CFLAGS
=
$(ORTP_CFLAGS)
$(STRICT_OPTIONS)
$(VIDEO_CFLAGS)
AM_LDFLAGS
=
-export-dynamic
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment