diff options
author | Jason Parker <jparker@digium.com> | 2013-03-11 15:51:17 -0500 |
---|---|---|
committer | Jason Parker <jparker@digium.com> | 2013-03-11 15:51:17 -0500 |
commit | af93a26aa321d3620925e5df68574226ba6cec3c (patch) | |
tree | c73301bfef50ae9ba250285bbcc7879f5c837e04 /pjmedia/build/Makefile | |
parent | 09114052f74fe74bbf652189cedefe41b7141b86 (diff) | |
parent | 9550ec7a68b8d072f99872d44def5004dbcc2562 (diff) |
Merge branch 'patch/external-srtp' of github.com:asterisk/pjproject
Conflicts:
build.mak.in
Diffstat (limited to 'pjmedia/build/Makefile')
-rw-r--r-- | pjmedia/build/Makefile | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile index 7df9ede..ca8e588 100644 --- a/pjmedia/build/Makefile +++ b/pjmedia/build/Makefile @@ -3,10 +3,6 @@ include ../../version.mak THIRD_PARTY:=$(PJDIR)/third_party -SRTP_INC=$(CC_INC)$(THIRD_PARTY)/build/srtp \ - $(CC_INC)$(THIRD_PARTY)/srtp/crypto/include \ - $(CC_INC)$(THIRD_PARTY)/srtp/include - include $(PJDIR)/build/common.mak export LIBDIR := ../lib @@ -48,8 +44,7 @@ export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \ $(CC_INC)../../pjlib-util/include \ $(CC_INC)../../pjmedia/include \ $(CC_INC)../../pjnath/include \ - $(CC_INC)../.. \ - $(SRTP_INC) + $(CC_INC)../.. export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \ $(HOST_CXXFLAGS) $(CXXFLAGS) |