Preston_PLB
/
freeswitch
forked from Mirrors/freeswitch
1
0
Fork 0
Code Pull Requests Activity

fix some core/srtp build deps

This commit is contained in:
Anthony Minessale 2013-01-20 19:37:04 -06:00
parent 2f1b01fc60
commit fd4ce8f2da
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile.am
View File

@ -496,7 +496,19 @@ libs/pcre/libpcre.la: libs/pcre libs/pcre/.update
@cd libs/pcre && $(MAKE) @cd libs/pcre && $(MAKE)
@$(TOUCH_TARGET) @$(TOUCH_TARGET)
libs/srtp/libsrtp.la: libs/srtp libs/srtp/.update SRTP_SRC = libs/srtp/srtp/srtp.c libs/srtp/srtp/ekt.c libs/srtp/crypto/cipher/cipher.c libs/srtp/crypto/cipher/null_cipher.c \
libs/srtp/crypto/cipher/aes.c libs/srtp/crypto/cipher/aes_icm.c \
libs/srtp/crypto/cipher/aes_cbc.c \
libs/srtp/crypto/hash/null_auth.c libs/srtp/crypto/hash/sha1.c \
libs/srtp/crypto/hash/hmac.c libs/srtp/crypto/hash/auth.c \
libs/srtp/crypto/math/datatypes.c libs/srtp/crypto/math/stat.c \
libs/srtp/crypto/kernel/crypto_kernel.c libs/srtp/crypto/kernel/alloc.c \
libs/srtp/crypto/kernel/key.c \
libs/srtp/crypto/rng/prng.c libs/srtp/crypto/rng/ctr_prng.c \
libs/srtp/crypto/kernel/err.c libs/srtp/crypto/rng/rand_source.c \
libs/srtp/crypto/replay/rdb.c libs/srtp/crypto/replay/rdbx.c libs/srtp/crypto/replay/ut_sim.c
libs/srtp/libsrtp.la: libs/srtp libs/srtp/.update $(SRTP_SRC)
touch src/include/switch.h touch src/include/switch.h
@cd libs/srtp && $(MAKE) @cd libs/srtp && $(MAKE)
@$(TOUCH_TARGET) @$(TOUCH_TARGET)
@ -580,7 +592,7 @@ nodepends: .nodepends
yesdepends: yesdepends:
rm .nodepends rm .nodepends
core: $(switch_builddir)/modules.conf core: $(switch_builddir)/modules.conf $(CORE_LIBS)
$(MAKE) $(AM_MAKEFLAGS) libfreeswitch.la $(MAKE) $(AM_MAKEFLAGS) libfreeswitch.la
distclean: clean distclean: clean

2
libs/srtp/Makefile.am
View File

@ -20,8 +20,10 @@ libsrtp_la_SOURCES = srtp/srtp.c srtp/ekt.c crypto/cipher/cipher.c crypto/cip
crypto/replay/rdb.c crypto/replay/rdbx.c crypto/replay/ut_sim.c crypto/replay/rdb.c crypto/replay/rdbx.c crypto/replay/ut_sim.c
libsrtp_la_LDFLAGS = -version-info 1:42:1 libsrtp_la_LDFLAGS = -version-info 1:42:1
EXTRA_DIST=
if RNG_OBJS_LINUX if RNG_OBJS_LINUX
libsrtp_la_SOURCES += crypto/rng/rand_linux_kernel.c libsrtp_la_SOURCES += crypto/rng/rand_linux_kernel.c
EXTRA_DIST += crypto/rng/rand_source.c
else else
libsrtp_la_SOURCES += crypto/rng/rand_source.c libsrtp_la_SOURCES += crypto/rng/rand_source.c
endif endif