update ms2 and cleanup dead function

[linphone] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 33e4d377c29f7a94e0989c7ab58cf14962848376..36466ab9eea510178a15a584255a085de5c31d2a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@
 ACLOCAL_AMFLAGS = -I m4 $(ACLOCAL_MACOS_FLAGS)
 
 SUBDIRS = build m4 pixmaps po @ORTP_DIR@ @MS2_DIR@ \
-               coreapi console gtk share scripts
+               coreapi console gtk share scripts tools
 
 
 
@@ -40,7 +40,7 @@ GTK_THEME=Outcrop
 GTK_FILELIST=gtk+-2.22.1.filelist
 GTK_FILELIST_PATH=$(abs_top_srcdir)/$(GTK_FILELIST)
 LINPHONEDEPS_FILELIST=linphone-deps.filelist
-WINBINDIST_FILES="`cat $(top_srcdir)/$(LINPHONEDEPS_FILELIST)`"
+WINBINDIST_FILES=`cat $(abs_top_srcdir)/$(LINPHONEDEPS_FILELIST)`
 ISS_SCRIPT=linphone.iss
 ISS_SCRIPT_PATH=$(abs_top_srcdir)/$(ISS_SCRIPT)
 #path to Inno Setup 5 compiler
@@ -48,17 +48,17 @@ ISCC=ISCC.exe
 PACKAGE_WIN32_FILELIST=$(PACKAGE)-win32.filelist
 PACKAGE_BUNDLE_FILE=$(top_srcdir)/build/macos/$(PACKAGE).bundle
 
-EXTRA_DIST = config.rpath  BUGS linphone.kdevelop  \
-                               README.arm \
-                               README.mingw \
-                               README.macos \
-                               autogen.sh \
-                               linphone.spec \
-                               linphone.spec.in \
-                               $(GTK_FILELIST) \
-                               gen-gtkfilelist.sh \
-                               $(LINPHONEDEPS_FILELIST) \
-                               $(ISS_SCRIPT).in
+EXTRA_DIST =           BUGS  \
+                       README.arm \
+                       README.mingw \
+                       README.macos \
+                       autogen.sh \
+                       linphone.spec \
+                       linphone.spec.in \
+                       $(GTK_FILELIST) \
+                       gen-gtkfilelist.sh \
+                       $(LINPHONEDEPS_FILELIST) \
+                       $(ISS_SCRIPT).in
 
 DISTCLEANFILES= $(ISS_SCRIPT) $(PACKAGE_WIN32_FILELIST)
 
@@ -182,9 +182,9 @@ newdate:
        cd gtk && $(MAKE) newdate
 
 if HAVE_MD5SUM
-GEN_MD5="`$(MD5SUM) linphone-$(VERSION).tar.gz | awk {'print $$4'}`"
+GEN_MD5=`$(MD5SUM) linphone-$(VERSION).tar.gz | awk {'print $$4'}`
 else
-GEN_MD5="`$(MD5SUM) linphone-$(VERSION).tar.gz | awk {'print $$1'}`"
+GEN_MD5=`$(MD5SUM) linphone-$(VERSION).tar.gz | awk {'print $$1'}`
 endif
 
 Portfile: $(top_srcdir)/scripts/Portfile.tmpl dist
@@ -220,7 +220,7 @@ bundle: $(LIBICONV_HACK)
        printf "[Pango]\nModuleFiles=./etc/pango/pango.modules\n" \
        > $(BUNDLEDIR)/Contents/Resources/etc/pango/pangorc
        cp -f $(BUNDLEDIR)/Contents/Resources/etc/pango/pango.modules $(BUNDLEDIR)/Contents/Resources/etc/pango/pango.modules.orig
-       sed -e 's:@executable_path/../Resources:../..:g' $(BUNDLEDIR)/Contents/Resources/etc/pango/pango.modules.orig  > $(BUNDLEDIR)/Contents/Resources/etc/pango/pango.modules
+       sed -e 's:@executable_path.*/::g' $(BUNDLEDIR)/Contents/Resources/etc/pango/pango.modules.orig  > $(BUNDLEDIR)/Contents/Resources/etc/pango/pango.modules
        cp -f $(LIBICONV_HACK) $(BUNDLEDIR)/Contents/Resources/lib/.
        cd $(BUNDLEDIR)/.. && rm -f $(MACAPPZIP) && zip -r $(MACAPPZIP) $(MACAPPNAME) && cd -