update ms2 and cleanup dead function

[linphone] / share / Makefile.am

diff --git a/share/Makefile.am b/share/Makefile.am
index aae65d4cebcb275ed233313431a17a61e0e4cad5..83c3a934e295d593c0dac9b0404ccef6de5760aa 100644 (file)
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -1,14 +1,14 @@
 
-SUBDIRS=C fr it ja cs
+SUBDIRS=C fr it ja cs xml
 
 LINPHONE_SOUNDS=ringback.wav hello8000.wav hello16000.wav
 LINPHONE_RINGS=rings/orig.wav \
                                rings/oldphone.wav \
                                rings/oldphone-mono.wav \
-                               rings/oldphone-mono-30s.wav \
+                               rings/oldphone-mono-30s.caf \
                                rings/rock.wav \
                                rings/bigben.wav \
-                               rings/toy.wav \
+                               rings/toy-mono.wav \
                                rings/sweet.wav \
                                rings/synth.wav \
                                rings/tapping.wav
@@ -29,8 +29,13 @@ linphone_fd_DATA= linphone.desktop
 pkgconfigdir=$(libdir)/pkgconfig
 pkgconfig_DATA=linphone.pc
 
+linphonedir=$(datadir)/linphone
+linphone_DATA=rootca.pem
+
 EXTRA_DIST =                                   $(LINPHONE_SOUNDS) \
                                                                $(LINPHONE_RINGS) \
                                                        linphone.desktop.in   \
                                                                linphone.pc.in \
-                                                               Makefile.inc
+                                                               Makefile.inc \
+                                                               rootca.pem
+