diff --git a/linphone/linphone-deps.filelist b/linphone/linphone-deps.filelist index 7ffc5f715..54ae39fbf 100755 --- a/linphone/linphone-deps.filelist +++ b/linphone/linphone-deps.filelist @@ -1,10 +1,10 @@ ./bin/avcodec-52.dll ./bin/avformat-52.dll ./bin/avutil-50.dll -./bin/exosip2.dll +./bin/libeXosip2-4.dll ./bin/libogg-0.dll ./bin/libtheora-0.dll ./bin/libxml2-2.dll -./bin/osip2.dll -./bin/osipparser2.dll +./bin/libosip2-4.dll +./bin/libosipparser2-4.dll ./bin/swscale-0.dll diff --git a/linphone/po/.gitignore b/linphone/po/.gitignore index 56888d9d5..5af53230f 100644 --- a/linphone/po/.gitignore +++ b/linphone/po/.gitignore @@ -1,6 +1,7 @@ .intltool-merge-cache Makefile Makefile.in +Makefile.in.in POTFILES *.gmo stamp-* diff --git a/linphone/po/Makefile.in.in b/linphone/po/Makefile.in.in index 402a25f7a..57ef267b3 100644 --- a/linphone/po/Makefile.in.in +++ b/linphone/po/Makefile.in.in @@ -21,7 +21,7 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ PACKAGE = @PACKAGE@ VERSION = @VERSION@ -SHELL = @SHELL@ +SHELL = /bin/sh srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -56,7 +56,7 @@ ALL_LINGUAS = @ALL_LINGUAS@ PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi) -USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi) +USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi) USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)