Update ms2

[linphone] / tools / Makefile.am

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 9e0c945505c1aaa77d9e97ba55600784ac23f813..a93d809f142f0f38d6e4b4b0b43cff2269c3eb44 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -7,34 +7,54 @@ AM_CPPFLAGS=\
 
 COMMON_CFLAGS=\
        -DIN_LINPHONE \
-       $(LIBXML2_CFLAGS) \
        $(ORTP_CFLAGS) \
-       $(STRICT_OPTIONS)
+       $(STRICT_OPTIONS) \
+       $(LIBXML2_CFLAGS) 
+
+EXTRA_DIST=xml2lpc_jni.cc lpc2xml_jni.cc
 
 if BUILD_TOOLS
 
-lib_LTLIBRARIES=libxml2lpc.la
+lib_LTLIBRARIES=libxml2lpc.la liblpc2xml.la
 
 libxml2lpc_la_SOURCES=\
        xml2lpc.c \
        xml2lpc.h
 
+liblpc2xml_la_SOURCES=\
+       lpc2xml.c \
+       lpc2xml.h
+
 libxml2lpc_la_CFLAGS=$(COMMON_CFLAGS)
 libxml2lpc_la_LIBADD=\
-       $(LIBXML2_LIBS) \
-       $(top_builddir)/coreapi/liblinphone.la
+       $(top_builddir)/coreapi/liblinphone.la \
+       $(LIBXML2_LIBS) 
+
+liblpc2xml_la_CFLAGS=$(COMMON_CFLAGS)
+liblpc2xml_la_LIBADD=\
+       $(top_builddir)/coreapi/liblinphone.la \
+       $(LIBXML2_LIBS) 
 
 libxml2lpc_la_LDFLAGS=-no-undefined
+liblpc2xml_la_LDFLAGS=-no-undefined
 
-bin_PROGRAMS=xml2lpc_test
+bin_PROGRAMS=xml2lpc_test lpc2xml_test
 
 xml2lpc_test_SOURCES=\
        xml2lpc_test.c
 
+lpc2xml_test_SOURCES=\
+       lpc2xml_test.c
+
 xml2lpc_test_CFLAGS=$(COMMON_CFLAGS)
 xml2lpc_test_LDADD=\
-       libxml2lpc.la
+       $(top_builddir)/coreapi/liblinphone.la \
+       libxml2lpc.la 
 
+lpc2xml_test_CFLAGS=$(COMMON_CFLAGS)
+lpc2xml_test_LDADD=\
+       $(top_builddir)/coreapi/liblinphone.la \
+       liblpc2xml.la 
 endif