[asterisk-commits] file: branch file/netsock2 r95649 - in /team/file/netsock2: ./ codecs/Makefile

[SVN commits to the Asterisk project]

Author: file
Date: Tue Jan  1 17:13:50 2008
New Revision: 95649

URL: http://svn.digium.com/view/asterisk?view=rev&rev=95649
Log:
Merged revisions 95648 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r95648 | file | 2008-01-01 19:09:32 -0400 (Tue, 01 Jan 2008) | 2 lines

Fix building of codec_resample on platforms other then Cygwin. On everything else it actually gets built after codec_resample, so you can't exactly link it in since it doesn't exist.

........

Modified:
    team/file/netsock2/   (props changed)
    team/file/netsock2/codecs/Makefile

Propchange: team/file/netsock2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jan  1 17:13:50 2008
@@ -1,1 +1,1 @@
-/trunk:1-95628
+/trunk:1-95648

Modified: team/file/netsock2/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/team/file/netsock2/codecs/Makefile?view=diff&rev=95649&r1=95648&r2=95649
==============================================================================
--- team/file/netsock2/codecs/Makefile (original)
+++ team/file/netsock2/codecs/Makefile Tue Jan  1 17:13:50 2008
@@ -56,4 +56,6 @@
 $(if $(filter codec_g722,$(EMBEDDED_MODS)),modules.link,codec_g722.so): $(LIBG722)
 
 codec_resample.o: ASTCFLAGS+=-I$(ASTTOPDIR)/main/libresample/include
-codec_resample.so: LIBS += $(ASTTOPDIR)/main/libresample/libresample.a
+ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
+  codec_resample.so: LIBS += $(ASTTOPDIR)/main/libresample/libresample.a
+endif