Commit 9ca78dd1 authored by Sylvain Berfini's avatar Sylvain Berfini

Moved lpc2xml and xml2lpc from tools to coreapi

parent 2ba2aea6
......@@ -18,7 +18,7 @@ CLEANFILES=$(GITVERSION_FILE)
## Process this file with automake to produce Makefile.in
linphone_includedir=$(includedir)/linphone
linphone_include_HEADERS=linphonecore.h linphonefriend.h linphonepresence.h linphonecore_utils.h lpconfig.h sipsetup.h event.h
linphone_include_HEADERS=linphonecore.h linphonefriend.h linphonepresence.h linphonecore_utils.h lpconfig.h sipsetup.h event.h xml2lpc.h lpc2xml.h
if BUILD_TUNNEL
linphone_include_HEADERS+=linphone_tunnel.h
......@@ -53,6 +53,8 @@ liblinphone_la_SOURCES=\
ldap/ldapprovider.c ldap/ldapprovider.h \
dict.c \
xml.c \
xml2lpc.c \
lpc2xml.c \
$(GITVERSION_FILE)
if BUILD_UPNP
......
......@@ -18,29 +18,6 @@ EXTRA_DIST=xml2lpc_jni.cc lpc2xml_jni.cc
if BUILD_TOOLS
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=\
$(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 lpc2xml_test lp-gen-wrappers
xml2lpc_test_SOURCES=\
......@@ -51,13 +28,11 @@ lpc2xml_test_SOURCES=\
xml2lpc_test_CFLAGS=$(COMMON_CFLAGS)
xml2lpc_test_LDADD=\
$(top_builddir)/coreapi/liblinphone.la \
libxml2lpc.la
$(top_builddir)/coreapi/liblinphone.la
lpc2xml_test_CFLAGS=$(COMMON_CFLAGS)
lpc2xml_test_LDADD=\
$(top_builddir)/coreapi/liblinphone.la \
liblpc2xml.la
$(top_builddir)/coreapi/liblinphone.la
lp_gen_wrappers_SOURCES=genwrappers.cc \
software-desc.cc software-desc.hh \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment