[packages/srtp.git] / srtp-shared.patch

--- srtp/crypto/Makefile.in.orig	2005-10-03 17:16:37.000000000 +0200
+++ srtp/crypto/Makefile.in	2006-07-21 20:27:23.861073500 +0200
@@ -14,9 +14,9 @@
 CPPFLAGS= @CPPFLAGS@
 CFLAGS	= @CFLAGS@
 LIBS	= @LIBS@
-LDFLAGS	= @LDFLAGS@ -L.
+LDFLAGS	= @LDFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCDIR) $(CPPFLAGS) $(CFLAGS)
-CRYPTOLIB = -lcryptomodule
+CRYPTOLIB = libcryptomodule.la
 
 RANLIB	= @RANLIB@
 
@@ -52,7 +52,7 @@
 p=00112233445566778899aabbccddeeff
 c=69c4e0d86a7b0430d8cdb78070b4c55a
 
-runtest: libcryptomodule.a $(testapp)
+runtest: libcryptomodule.la $(testapp)
 	test/env$(EXE) # print out information on the build environment
 	@echo "running libcryptomodule test applications..."
 	test `test/aes_calc $k $p` = $c
@@ -64,35 +64,35 @@
 	test/rand_gen$(EXE) -n 256 >/dev/null
 	@echo "libcryptomodule test applications passed."
 
-# libcryptomodule.a (the crypto engine) 
+# libcryptomodule.la (the crypto engine) 
 
-ciphers = cipher/cipher.o cipher/null_cipher.o      \
-          cipher/aes.o cipher/aes_icm.o             \
-          cipher/aes_cbc.o
+ciphers = cipher/cipher.lo cipher/null_cipher.lo      \
+          cipher/aes.lo cipher/aes_icm.lo             \
+          cipher/aes_cbc.lo
 
-hashes  = hash/null_auth.o hash/sha1.o \
-          hash/hmac.o hash/auth.o
+hashes  = hash/null_auth.lo hash/sha1.lo \
+          hash/hmac.lo hash/auth.lo
 
-math    = math/datatypes.o math/stat.o
+math    = math/datatypes.lo math/stat.lo
 
-rng     = rng/$(RNG_OBJS) rng/rand_source.o rng/prng.o rng/ctr_prng.o
+rng     = rng/$(RNG_OBJS) rng/rand_source.lo rng/prng.lo rng/ctr_prng.lo
 
-err     = kernel/err.o
+err     = kernel/err.lo
 
-kernel  = kernel/crypto_kernel.o  kernel/alloc.o   \
-          kernel/key.o $(rng) $(err)
+kernel  = kernel/crypto_kernel.lo  kernel/alloc.lo   \
+          kernel/key.lo $(rng) $(err)
 
-xfm     = ae_xfm/xfm.o
+xfm     = ae_xfm/xfm.lo
 
 cryptobj =  $(ciphers) $(hashes) $(math) $(stat) $(kernel) $(xfm)
 
 # the rule for making object files and test apps
 
-%.o: %.c
-	$(COMPILE) -c $< -o $@
+%.lo: %.c
+	libtool --mode=compile --tag=CC $(COMPILE) -c $< -o $@
 
-%$(EXE): %.c libcryptomodule.a 
-	$(COMPILE) $(LDFLAGS) $< -o $@ $(CRYPTOLIB) $(LIBS)
+%$(EXE): %.c libcryptomodule.la 
+	libtool --mode=link --tag=CC $(COMPILE) $(LDFLAGS) $< -o $@ $(CRYPTOLIB) $(LIBS)
 
 ifndef AR
   AR=ar
@@ -100,17 +100,16 @@
 
 # and the crypto module library itself
 
-libcryptomodule.a: $(cryptobj) 
-	$(AR) cr libcryptomodule.a $(cryptobj) 
-	$(RANLIB) libcryptomodule.a
+libcryptomodule.la: $(cryptobj)
+	libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $^
 
-all: libcryptomodule.a $(testapp)
+all: libcryptomodule.la $(testapp)
 
 # housekeeping functions
 
 clean:
-	rm -f libcryptomodule.a
-	rm -f $(testapp) *.o */*.o 
+	rm -f libcryptomodule.la
+	rm -f $(testapp) *.*o */*.*o
 	for a in * .* */*; do if [ -f "$$a~" ] ; then rm $$a~; fi; done;
 	rm -f `find . -name "*.[ch]~*~"`
 	rm -rf latex
--- srtp-1.4.4/Makefile.in~	2010-05-21 20:45:35.000000000 +0300
+++ srtp-1.4.4/Makefile.in	2011-01-06 13:10:25.617052634 +0200
@@ -7,8 +7,8 @@
 #
 # runtest       runs test applications 
 # test		builds test applications
-# libcrypt.a	static library implementing crypto engine
-# libsrtp.a	static library implementing srtp
+# libcrypt.la	library implementing crypto engine
+# libsrtp.la	library implementing srtp
 # clean		removes objects, libs, and executables
 # distribution  cleans and builds a .tgz
 # tags          builds etags file from all .c and .h files
@@ -38,9 +38,9 @@
 CPPFLAGS= @CPPFLAGS@
 CFLAGS	= @CFLAGS@
 LIBS	= @LIBS@
-LDFLAGS	= @LDFLAGS@ -L.
+LDFLAGS	= @LDFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCDIR) $(CPPFLAGS) $(CFLAGS)
-SRTPLIB	= -lsrtp
+SRTPLIB	= libsrtp.la
 
 RANLIB	= @RANLIB@
 INSTALL	= @INSTALL@
@@ -66,54 +66,55 @@
 
 # implicit rules for object files and test apps
 
-%.o: %.c
+%.lo: %.c
 	$(COMPILE) -c $< -o $@
 
+%.lo: %.c
+	libtool --mode=compile --tag=CC $(COMPILE) -c $< -o $@
+
 %$(EXE): %.c
-	$(COMPILE) $(LDFLAGS) $< -o $@ $(SRTPLIB) $(LIBS)
+	libtool --mode=link --tag=CC $(COMPILE) $(LDFLAGS) $< -o $@ $(SRTPLIB) $(LIBS)
 
 
-# libcrypt.a (the crypto engine) 
-ciphers = crypto/cipher/cipher.o crypto/cipher/null_cipher.o      \
-          crypto/cipher/aes.o crypto/cipher/aes_icm.o             \
-          crypto/cipher/aes_cbc.o
+# libcrypt.la (the crypto engine) 
+ciphers = crypto/cipher/cipher.lo crypto/cipher/null_cipher.lo      \
+          crypto/cipher/aes.lo crypto/cipher/aes_icm.lo             \
+          crypto/cipher/aes_cbc.lo
 
-hashes  = crypto/hash/null_auth.o crypto/hash/sha1.o \
-          crypto/hash/hmac.o crypto/hash/auth.o # crypto/hash/tmmhv2.o 
+hashes  = crypto/hash/null_auth.lo crypto/hash/sha1.lo \
+          crypto/hash/hmac.lo crypto/hash/auth.lo # crypto/hash/tmmhv2.lo 
 
-replay  = crypto/replay/rdb.o crypto/replay/rdbx.o               \
-          crypto/replay/ut_sim.o 
+replay  = crypto/replay/rdb.lo crypto/replay/rdbx.lo               \
+          crypto/replay/ut_sim.lo 
 
-math    = crypto/math/datatypes.o crypto/math/stat.o
+math    = crypto/math/datatypes.lo crypto/math/stat.lo
 
-ust     = crypto/ust/ust.o 
+ust     = crypto/ust/ust.lo 
 
-rng     = crypto/rng/$(RNG_OBJS) crypto/rng/prng.o crypto/rng/ctr_prng.o
+rng     = crypto/rng/$(RNG_OBJS) crypto/rng/prng.lo crypto/rng/ctr_prng.lo
 
-err     = crypto/kernel/err.o
+err     = crypto/kernel/err.lo
 
-kernel  = crypto/kernel/crypto_kernel.o  crypto/kernel/alloc.o   \
-          crypto/kernel/key.o $(rng) $(err) # $(ust) 
+kernel  = crypto/kernel/crypto_kernel.lo  crypto/kernel/alloc.lo   \
+          crypto/kernel/key.lo $(rng) $(err) # $(ust) 
 
 cryptobj =  $(ciphers) $(hashes) $(math) $(stat) $(kernel) $(replay)
 
-# libsrtp.a (implements srtp processing)
+# libsrtp.la (implements srtp processing)
 
-srtpobj = srtp/srtp.o srtp/ekt.o
+srtpobj = srtp/srtp.lo srtp/ekt.lo
 
-libsrtp.a: $(srtpobj) $(cryptobj) $(gdoi)
-	ar cr libsrtp.a $^
-	$(RANLIB) libsrtp.a
+libsrtp.la: $(srtpobj) $(cryptobj) $(gdoi)
+	libtool --mode=link --tag=CC $(CC) -o $@ $^ -rpath $(libdir)
 
-# libcryptomath.a contains general-purpose routines that are used to
+# libcryptomath.la contains general-purpose routines that are used to
 # generate tables and verify cryptoalgorithm implementations - this
 # library is not meant to be included in production code
 
-cryptomath = crypto/math/math.o crypto/math/gf2_8.o 
+cryptomath = crypto/math/math.lo crypto/math/gf2_8.lo 
 
-libcryptomath.a: $(cryptomath)
-	ar cr libcryptomath.a $(cryptomath)
-	$(RANLIB) libcryptomath.a
+libcryptomath.la: $(cryptomath)
+	libtool --mode=link --tag=CC $(CC) -o $@ $^
 
 
 # test applications 
@@ -127,19 +128,19 @@
 	  test/roc_driver$(EXE) test/rdbx_driver$(EXE) test/rtpw$(EXE) \
 	  test/dtls_srtp_driver$(EXE)
 
-$(testapp): libsrtp.a
+$(testapp): libsrtp.la
 
 test/rtpw$(EXE): test/rtpw.c test/rtp.c test/getopt_s.c
-	$(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
+	libtool --mode=link --tag=CC $(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
 
 test/srtp_driver$(EXE): test/srtp_driver.c test/getopt_s.c
-	$(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
+	libtool --mode=link --tag=CC $(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
 
 test/rdbx_driver$(EXE): test/rdbx_driver.c test/getopt_s.c
-	$(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
+	libtool --mode=link --tag=CC $(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
 
 test/dtls_srtp_driver$(EXE): test/dtls_srtp_driver.c test/getopt_s.c
-	$(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
+	libtool --mode=link --tag=CC $(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
 
 test: $(testapp)
 	@echo "Build done. Please run '$(MAKE) runtest' to run self tests."
@@ -163,8 +164,8 @@
 
 # in the tables/ subdirectory, we use libcryptomath instead of libsrtp
 
-tables/%: tables/%.c libcryptomath.a 
-	$(COMPILE) $(LDFLAGS) $< -o $@ $(LIBS) libcryptomath.a
+tables/%: tables/%.c libcryptomath.la 
+	libtool --mode=link --tag=CC $(COMPILE) $(LDFLAGS) $< -o $@ $(LIBS) libcryptomath.la
 
 # the target 'plot' runs the timing test (test/srtp_driver -t) then
 # uses gnuplot to produce plots of the results - see the script file
@@ -194,19 +195,19 @@
 	fi
 	$(INSTALL) -d $(DESTDIR)$(includedir)/srtp
 	$(INSTALL) -d $(DESTDIR)$(libdir)
-	cp $(srcdir)/include/*.h $(DESTDIR)$(includedir)/srtp  
-	cp $(srcdir)/crypto/include/*.h $(DESTDIR)$(includedir)/srtp
-	if [ "$(srcdir)" != "." ]; then cp crypto/include/*.h $(DESTDIR)$(includedir)/srtp; fi
-	if [ -f libsrtp.a ]; then cp libsrtp.a $(DESTDIR)$(libdir)/; fi
+	cp -p $(srcdir)/include/*.h $(DESTDIR)$(includedir)/srtp  
+	cp -p $(srcdir)/crypto/include/*.h $(DESTDIR)$(includedir)/srtp
+	if [ "$(srcdir)" != "." ]; then cp -p crypto/include/*.h $(DESTDIR)$(includedir)/srtp; fi
+	libtool --mode=install install libsrtp.la $(DESTDIR)$(libdir)
 
 uninstall:
 	rm -f $(DESTDIR)$(includedir)/srtp/*.h
-	rm -f $(DESTDIR)$(libdir)/libsrtp.a
+	rm -f $(DESTDIR)$(libdir)/libsrtp.*
 	-rmdir $(DESTDIR)$(includedir)/srtp
 
 clean:
 	rm -rf $(cryptobj) $(srtpobj) $(cryptomath) TAGS \
-        libcryptomath.a libsrtp.a core *.core test/core
+        libcryptomath.la libsrtp.la core *.core test/core
 	for a in * */* */*/*; do			\
               if [ -f "$$a~" ] ; then rm -f $$a~; fi;	\
         done;
--- srtp/configure.in.orig	2006-05-07 20:51:06.000000000 +0200
+++ srtp/configure.in	2006-07-21 20:26:21.513177000 +0200
@@ -35,10 +35,10 @@
 
 AC_MSG_CHECKING(which random device to use)
 if test "$enable_kernel_linux" = "yes"; then
-   RNG_OBJS=rand_linux_kernel.o
+   RNG_OBJS=rand_linux_kernel.lo
    AC_MSG_RESULT([Linux kernel builtin])
 else
-   RNG_OBJS=rand_source.o
+   RNG_OBJS=rand_source.lo
    if test -n "$DEV_URANDOM"; then
       AC_DEFINE_UNQUOTED(DEV_URANDOM, "$DEV_URANDOM",[Path to random device])
       AC_MSG_RESULT([$DEV_URANDOM])
Commit	Line	Data
b0919fa1 JB	1	--- srtp/crypto/Makefile.in.orig 2005-10-03 17:16:37.000000000 +0200
	2	+++ srtp/crypto/Makefile.in 2006-07-21 20:27:23.861073500 +0200
	3	@@ -14,9 +14,9 @@
	4	CPPFLAGS= @CPPFLAGS@
	5	CFLAGS = @CFLAGS@
	6	LIBS = @LIBS@
	7	-LDFLAGS = @LDFLAGS@ -L.
	8	+LDFLAGS = @LDFLAGS@
	9	COMPILE = $(CC) $(DEFS) $(INCDIR) $(CPPFLAGS) $(CFLAGS)
	10	-CRYPTOLIB = -lcryptomodule
	11	+CRYPTOLIB = libcryptomodule.la
	12
	13	RANLIB = @RANLIB@
	14
	15	@@ -52,7 +52,7 @@
	16	p=00112233445566778899aabbccddeeff
	17	c=69c4e0d86a7b0430d8cdb78070b4c55a
	18
	19	-runtest: libcryptomodule.a $(testapp)
	20	+runtest: libcryptomodule.la $(testapp)
	21	test/env$(EXE) # print out information on the build environment
	22	@echo "running libcryptomodule test applications..."
	23	test `test/aes_calc $k $p` = $c
	24	@@ -64,35 +64,35 @@
	25	test/rand_gen$(EXE) -n 256 >/dev/null
	26	@echo "libcryptomodule test applications passed."
	27
	28	-# libcryptomodule.a (the crypto engine)
	29	+# libcryptomodule.la (the crypto engine)
	30
	31	-ciphers = cipher/cipher.o cipher/null_cipher.o \
	32	- cipher/aes.o cipher/aes_icm.o \
	33	- cipher/aes_cbc.o
	34	+ciphers = cipher/cipher.lo cipher/null_cipher.lo \
	35	+ cipher/aes.lo cipher/aes_icm.lo \
	36	+ cipher/aes_cbc.lo
	37
	38	-hashes = hash/null_auth.o hash/sha1.o \
	39	- hash/hmac.o hash/auth.o
	40	+hashes = hash/null_auth.lo hash/sha1.lo \
	41	+ hash/hmac.lo hash/auth.lo
	42
	43	-math = math/datatypes.o math/stat.o
	44	+math = math/datatypes.lo math/stat.lo
	45
	46	-rng = rng/$(RNG_OBJS) rng/rand_source.o rng/prng.o rng/ctr_prng.o
	47	+rng = rng/$(RNG_OBJS) rng/rand_source.lo rng/prng.lo rng/ctr_prng.lo
	48
	49	-err = kernel/err.o
	50	+err = kernel/err.lo
	51
	52	-kernel = kernel/crypto_kernel.o kernel/alloc.o \
	53	- kernel/key.o $(rng) $(err)
	54	+kernel = kernel/crypto_kernel.lo kernel/alloc.lo \
	55	+ kernel/key.lo $(rng) $(err)
	56
	57	-xfm = ae_xfm/xfm.o
	58	+xfm = ae_xfm/xfm.lo
	59
	60	cryptobj = $(ciphers) $(hashes) $(math) $(stat) $(kernel) $(xfm)
	61
	62	# the rule for making object files and test apps
	63
	64	-%.o: %.c
65	- $(COMPILE) -c $< -o $@
66	+%.lo: %.c
1e8cdbeb	67	+ libtool --mode=compile --tag=CC $(COMPILE) -c $< -o $@
b0919fa1 JB	68
	69	-%$(EXE): %.c libcryptomodule.a
	70	- $(COMPILE) $(LDFLAGS) $< -o $@ $(CRYPTOLIB) $(LIBS)
	71	+%$(EXE): %.c libcryptomodule.la
1e8cdbeb	72	+ libtool --mode=link --tag=CC $(COMPILE) $(LDFLAGS) $< -o $@ $(CRYPTOLIB) $(LIBS)
b0919fa1 JB	73
	74	ifndef AR
	75	AR=ar
	76	@@ -100,17 +100,16 @@
	77
	78	# and the crypto module library itself
	79
	80	-libcryptomodule.a: $(cryptobj)
	81	- $(AR) cr libcryptomodule.a $(cryptobj)
	82	- $(RANLIB) libcryptomodule.a
	83	+libcryptomodule.la: $(cryptobj)
1e8cdbeb	84	+ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $^
b0919fa1 JB	85
	86	-all: libcryptomodule.a $(testapp)
	87	+all: libcryptomodule.la $(testapp)
	88
	89	# housekeeping functions
	90
	91	clean:
	92	- rm -f libcryptomodule.a
	93	- rm -f $(testapp) .o /*.o
	94	+ rm -f libcryptomodule.la
	95	+ rm -f $(testapp) .o /.*o
	96	for a in * .* /; do if [ -f "$$a~" ] ; then rm $$a~; fi; done;
	97	rm -f `find . -name ".[ch]~~"`
	98	rm -rf latex
5e59555a ER	99	--- srtp-1.4.4/Makefile.in~ 2010-05-21 20:45:35.000000000 +0300
	100	+++ srtp-1.4.4/Makefile.in 2011-01-06 13:10:25.617052634 +0200
	101	@@ -7,8 +7,8 @@
	102	#
	103	# runtest runs test applications
	104	# test builds test applications
	105	-# libcrypt.a static library implementing crypto engine
	106	-# libsrtp.a static library implementing srtp
	107	+# libcrypt.la library implementing crypto engine
	108	+# libsrtp.la library implementing srtp
	109	# clean removes objects, libs, and executables
	110	# distribution cleans and builds a .tgz
	111	# tags builds etags file from all .c and .h files
	112	@@ -38,9 +38,9 @@
b0919fa1 JB	113	CPPFLAGS= @CPPFLAGS@
	114	CFLAGS = @CFLAGS@
	115	LIBS = @LIBS@
	116	-LDFLAGS = @LDFLAGS@ -L.
	117	+LDFLAGS = @LDFLAGS@
	118	COMPILE = $(CC) $(DEFS) $(INCDIR) $(CPPFLAGS) $(CFLAGS)
	119	-SRTPLIB = -lsrtp
	120	+SRTPLIB = libsrtp.la
	121
	122	RANLIB = @RANLIB@
	123	INSTALL = @INSTALL@
5e59555a ER	124	@@ -66,54 +66,55 @@
	125
	126	# implicit rules for object files and test apps
	127
	128	-%.o: %.c
	129	+%.lo: %.c
b0919fa1 JB	130	$(COMPILE) -c $< -o $@
	131
	132	+%.lo: %.c
1e8cdbeb	133	+ libtool --mode=compile --tag=CC $(COMPILE) -c $< -o $@
b0919fa1 JB	134	+
	135	%$(EXE): %.c
	136	- $(COMPILE) $(LDFLAGS) $< -o $@ $(SRTPLIB) $(LIBS)
1e8cdbeb	137	+ libtool --mode=link --tag=CC $(COMPILE) $(LDFLAGS) $< -o $@ $(SRTPLIB) $(LIBS)
b0919fa1 JB	138
	139
	140	-# libcrypt.a (the crypto engine)
	141	-ciphers = crypto/cipher/cipher.o crypto/cipher/null_cipher.o \
	142	- crypto/cipher/aes.o crypto/cipher/aes_icm.o \
	143	- crypto/cipher/aes_cbc.o
	144	+# libcrypt.la (the crypto engine)
	145	+ciphers = crypto/cipher/cipher.lo crypto/cipher/null_cipher.lo \
	146	+ crypto/cipher/aes.lo crypto/cipher/aes_icm.lo \
	147	+ crypto/cipher/aes_cbc.lo
	148
	149	-hashes = crypto/hash/null_auth.o crypto/hash/sha1.o \
	150	- crypto/hash/hmac.o crypto/hash/auth.o # crypto/hash/tmmhv2.o
	151	+hashes = crypto/hash/null_auth.lo crypto/hash/sha1.lo \
5e59555a	152	+ crypto/hash/hmac.lo crypto/hash/auth.lo # crypto/hash/tmmhv2.lo
b0919fa1 JB	153
	154	-replay = crypto/replay/rdb.o crypto/replay/rdbx.o \
	155	- crypto/replay/ut_sim.o
	156	+replay = crypto/replay/rdb.lo crypto/replay/rdbx.lo \
	157	+ crypto/replay/ut_sim.lo
	158
	159	-math = crypto/math/datatypes.o crypto/math/stat.o
	160	+math = crypto/math/datatypes.lo crypto/math/stat.lo
	161
	162	-ust = crypto/ust/ust.o
5e59555a	163	+ust = crypto/ust/ust.lo
b0919fa1 JB	164
	165	-rng = crypto/rng/$(RNG_OBJS) crypto/rng/prng.o crypto/rng/ctr_prng.o
	166	+rng = crypto/rng/$(RNG_OBJS) crypto/rng/prng.lo crypto/rng/ctr_prng.lo
	167
	168	-err = crypto/kernel/err.o
	169	+err = crypto/kernel/err.lo
	170
	171	-kernel = crypto/kernel/crypto_kernel.o crypto/kernel/alloc.o \
	172	- crypto/kernel/key.o $(rng) $(err) # $(ust)
	173	+kernel = crypto/kernel/crypto_kernel.lo crypto/kernel/alloc.lo \
	174	+ crypto/kernel/key.lo $(rng) $(err) # $(ust)
	175
	176	cryptobj = $(ciphers) $(hashes) $(math) $(stat) $(kernel) $(replay)
	177
	178	-# libsrtp.a (implements srtp processing)
	179	+# libsrtp.la (implements srtp processing)
	180
5e59555a ER	181	-srtpobj = srtp/srtp.o srtp/ekt.o
5e59555a ER	182	+srtpobj = srtp/srtp.lo srtp/ekt.lo
b0919fa1 JB	183
	184	-libsrtp.a: $(srtpobj) $(cryptobj) $(gdoi)
	185	- ar cr libsrtp.a $^
	186	- $(RANLIB) libsrtp.a
	187	+libsrtp.la: $(srtpobj) $(cryptobj) $(gdoi)
1e8cdbeb	188	+ libtool --mode=link --tag=CC $(CC) -o $@ $^ -rpath $(libdir)
b0919fa1	189
5e59555a ER	190	-# libcryptomath.a contains general-purpose routines that are used to
5e59555a ER	191	+# libcryptomath.la contains general-purpose routines that are used to
b0919fa1 JB	192	# generate tables and verify cryptoalgorithm implementations - this
	193	# library is not meant to be included in production code
	194
	195	-cryptomath = crypto/math/math.o crypto/math/gf2_8.o
5e59555a	196	+cryptomath = crypto/math/math.lo crypto/math/gf2_8.lo
b0919fa1 JB	197
	198	-libcryptomath.a: $(cryptomath)
	199	- ar cr libcryptomath.a $(cryptomath)
	200	- $(RANLIB) libcryptomath.a
	201	+libcryptomath.la: $(cryptomath)
1e8cdbeb	202	+ libtool --mode=link --tag=CC $(CC) -o $@ $^
b0919fa1 JB	203
	204
	205	# test applications
5e59555a ER	206	@@ -127,19 +128,19 @@
	207	test/roc_driver$(EXE) test/rdbx_driver$(EXE) test/rtpw$(EXE) \
	208	test/dtls_srtp_driver$(EXE)
b0919fa1 JB	209
	210	-$(testapp): libsrtp.a
	211	+$(testapp): libsrtp.la
	212
5e59555a ER	213	test/rtpw$(EXE): test/rtpw.c test/rtp.c test/getopt_s.c
	214	- $(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
	215	+ libtool --mode=link --tag=CC $(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
	216
	217	test/srtp_driver$(EXE): test/srtp_driver.c test/getopt_s.c
	218	- $(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
	219	+ libtool --mode=link --tag=CC $(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
	220
	221	test/rdbx_driver$(EXE): test/rdbx_driver.c test/getopt_s.c
	222	- $(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
	223	+ libtool --mode=link --tag=CC $(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
	224
	225	test/dtls_srtp_driver$(EXE): test/dtls_srtp_driver.c test/getopt_s.c
b0919fa1	226	- $(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
1e8cdbeb	227	+ libtool --mode=link --tag=CC $(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
b0919fa1 JB	228
	229	test: $(testapp)
	230	@echo "Build done. Please run '$(MAKE) runtest' to run self tests."
5e59555a	231	@@ -163,8 +164,8 @@
b0919fa1 JB	232
	233	# in the tables/ subdirectory, we use libcryptomath instead of libsrtp
	234
	235	-tables/%: tables/%.c libcryptomath.a
	236	- $(COMPILE) $(LDFLAGS) $< -o $@ $(LIBS) libcryptomath.a
	237	+tables/%: tables/%.c libcryptomath.la
1e8cdbeb	238	+ libtool --mode=link --tag=CC $(COMPILE) $(LDFLAGS) $< -o $@ $(LIBS) libcryptomath.la
b0919fa1 JB	239
	240	# the target 'plot' runs the timing test (test/srtp_driver -t) then
	241	# uses gnuplot to produce plots of the results - see the script file
5e59555a ER	242	@@ -194,19 +195,19 @@
	243	fi
	244	$(INSTALL) -d $(DESTDIR)$(includedir)/srtp
b0919fa1	245	$(INSTALL) -d $(DESTDIR)$(libdir)
5e59555a ER	246	- cp $(srcdir)/include/*.h $(DESTDIR)$(includedir)/srtp
	247	- cp $(srcdir)/crypto/include/*.h $(DESTDIR)$(includedir)/srtp
	248	- if [ "$(srcdir)" != "." ]; then cp crypto/include/*.h $(DESTDIR)$(includedir)/srtp; fi
b0919fa1	249	- if [ -f libsrtp.a ]; then cp libsrtp.a $(DESTDIR)$(libdir)/; fi
5e59555a ER	250	+ cp -p $(srcdir)/include/*.h $(DESTDIR)$(includedir)/srtp
	251	+ cp -p $(srcdir)/crypto/include/*.h $(DESTDIR)$(includedir)/srtp
	252	+ if [ "$(srcdir)" != "." ]; then cp -p crypto/include/*.h $(DESTDIR)$(includedir)/srtp; fi
b0919fa1 JB	253	+ libtool --mode=install install libsrtp.la $(DESTDIR)$(libdir)
	254
	255	uninstall:
5e59555a ER	256	rm -f $(DESTDIR)$(includedir)/srtp/*.h
	257	- rm -f $(DESTDIR)$(libdir)/libsrtp.a
	258	+ rm -f $(DESTDIR)$(libdir)/libsrtp.*
	259	-rmdir $(DESTDIR)$(includedir)/srtp
b0919fa1 JB	260
b0919fa1 JB	261	clean:
5e59555a	262	rm -rf $(cryptobj) $(srtpobj) $(cryptomath) TAGS \
b0919fa1 JB	263	- libcryptomath.a libsrtp.a core *.core test/core
	264	+ libcryptomath.la libsrtp.la core *.core test/core
	265	for a in * / //*; do \
	266	if [ -f "$$a~" ] ; then rm -f $$a~; fi; \
	267	done;
	268	--- srtp/configure.in.orig 2006-05-07 20:51:06.000000000 +0200
	269	+++ srtp/configure.in 2006-07-21 20:26:21.513177000 +0200
	270	@@ -35,10 +35,10 @@
	271
	272	AC_MSG_CHECKING(which random device to use)
	273	if test "$enable_kernel_linux" = "yes"; then
	274	- RNG_OBJS=rand_linux_kernel.o
	275	+ RNG_OBJS=rand_linux_kernel.lo
	276	AC_MSG_RESULT([Linux kernel builtin])
	277	else
	278	- RNG_OBJS=rand_source.o
	279	+ RNG_OBJS=rand_source.lo
	280	if test -n "$DEV_URANDOM"; then
	281	AC_DEFINE_UNQUOTED(DEV_URANDOM, "$DEV_URANDOM",[Path to random device])
	282	AC_MSG_RESULT([$DEV_URANDOM])