summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElan Ruusamäe2006-08-24 17:23:39 (GMT)
committercvs2git2012-06-24 12:13:13 (GMT)
commit1e8cdbeb1f75c34123c6f3f07acc024162cfb3c8 (patch)
treeb92b0daa309d6d261b233974743d793a6b76e24e
parent800158d431c5c70a5510a51626d704d197f436a2 (diff)
downloadsrtp-AC-branch.zip
srtp-AC-branch.tar.gz
- pass --tag=CC to libtoolauto/ac/srtp-1_4_2-1AC-STABLEAC-branch
Changed files: srtp-shared.patch -> 1.2
-rw-r--r--srtp-shared.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/srtp-shared.patch b/srtp-shared.patch
index 581fa9c..8ab293d 100644
--- a/srtp-shared.patch
+++ b/srtp-shared.patch
@@ -64,12 +64,12 @@
-%.o: %.c
- $(COMPILE) -c $< -o $@
+%.lo: %.c
-+ libtool --mode=compile $(COMPILE) -c $< -o $@
++ libtool --mode=compile --tag=CC $(COMPILE) -c $< -o $@
-%$(EXE): %.c libcryptomodule.a
- $(COMPILE) $(LDFLAGS) $< -o $@ $(CRYPTOLIB) $(LIBS)
+%$(EXE): %.c libcryptomodule.la
-+ libtool --mode=link $(COMPILE) $(LDFLAGS) $< -o $@ $(CRYPTOLIB) $(LIBS)
++ libtool --mode=link --tag=CC $(COMPILE) $(LDFLAGS) $< -o $@ $(CRYPTOLIB) $(LIBS)
ifndef AR
AR=ar
@@ -81,7 +81,7 @@
- $(AR) cr libcryptomodule.a $(cryptobj)
- $(RANLIB) libcryptomodule.a
+libcryptomodule.la: $(cryptobj)
-+ libtool --mode=link $(CC) $(LDFLAGS) -o $@ $^
++ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $^
-all: libcryptomodule.a $(testapp)
+all: libcryptomodule.la $(testapp)
@@ -115,11 +115,11 @@
$(COMPILE) -c $< -o $@
+%.lo: %.c
-+ libtool --mode=compile $(COMPILE) -c $< -o $@
++ libtool --mode=compile --tag=CC $(COMPILE) -c $< -o $@
+
%$(EXE): %.c
- $(COMPILE) $(LDFLAGS) $< -o $@ $(SRTPLIB) $(LIBS)
-+ libtool --mode=link $(COMPILE) $(LDFLAGS) $< -o $@ $(SRTPLIB) $(LIBS)
++ libtool --mode=link --tag=CC $(COMPILE) $(LDFLAGS) $< -o $@ $(SRTPLIB) $(LIBS)
-# libcrypt.a (the crypto engine)
@@ -170,7 +170,7 @@
- ar cr libsrtp.a $^
- $(RANLIB) libsrtp.a
+libsrtp.la: $(srtpobj) $(cryptobj) $(gdoi)
-+ libtool --mode=link $(CC) -o $@ $^ -rpath $(libdir)
++ libtool --mode=link --tag=CC $(CC) -o $@ $^ -rpath $(libdir)
# libcryptomath.a contains general-purpose routines that are used to
# generate tables and verify cryptoalgorithm implementations - this
@@ -183,7 +183,7 @@
- ar cr libcryptomath.a $(cryptomath)
- $(RANLIB) libcryptomath.a
+libcryptomath.la: $(cryptomath)
-+ libtool --mode=link $(CC) -o $@ $^
++ libtool --mode=link --tag=CC $(CC) -o $@ $^
# test applications
@@ -196,7 +196,7 @@
test/rtpw$(EXE): test/rtpw.c test/rtp.c
- $(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
-+ libtool --mode=link $(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."
@@ -207,7 +207,7 @@
-tables/%: tables/%.c libcryptomath.a
- $(COMPILE) $(LDFLAGS) $< -o $@ $(LIBS) libcryptomath.a
+tables/%: tables/%.c libcryptomath.la
-+ libtool --mode=link $(COMPILE) $(LDFLAGS) $< -o $@ $(LIBS) 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