update ms2

[linphone] / coreapi / Makefile.am

diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am
index fa0c08b0174dd3ff7f1c3f5626c6f44ae31b92a2..91fc9bd222d85f69b89f44249dc43e3028d1848c 100644 (file)
--- a/coreapi/Makefile.am
+++ b/coreapi/Makefile.am
@@ -1,5 +1,7 @@
 GITVERSION_FILE=liblinphone_gitversion.h
 GITVERSION_FILE_TMP=liblinphone_gitversion.h.tmp
+GITDESCRIBE=`git describe --always`
+GITREVISION=`git rev-parse HEAD`
 
 ECHO=/bin/echo
 
@@ -14,16 +16,12 @@ CLEANFILES=$(GITVERSION_FILE)
 ## Process this file with automake to produce Makefile.in
 linphone_includedir=$(includedir)/linphone
 
-linphone_include_HEADERS=linphonecore.h linphonefriend.h linphonecore_utils.h ../config.h lpconfig.h sipsetup.h 
+linphone_include_HEADERS=linphonecore.h linphonefriend.h linphonecore_utils.h lpconfig.h sipsetup.h 
 
 if BUILD_TUNNEL
 linphone_include_HEADERS+=linphone_tunnel.h
 endif
 
-INCLUDES = \
-       -I$(top_srcdir)
-
-
 lib_LTLIBRARIES=liblinphone.la
 
 liblinphone_la_SOURCES=\
@@ -49,15 +47,22 @@ liblinphone_la_SOURCES=\
        lsd.c linphonecore_utils.h \
        ec-calibrator.c \
        conference.c \
-       linphone_tunnel.cc \
+       message_storage.c \
        $(GITVERSION_FILE)
+
+if BUILD_UPNP
+liblinphone_la_SOURCES+=upnp.c upnp.h
+endif
        
 if BUILD_WIZARD
 liblinphone_la_SOURCES+=sipwizard.c 
 endif
 
+liblinphone_la_SOURCES+=linphone_tunnel_config.c
 if BUILD_TUNNEL
-liblinphone_la_SOURCES+=TunnelManager.cc TunnelManager.hh 
+liblinphone_la_SOURCES+=linphone_tunnel.cc TunnelManager.cc TunnelManager.hh 
+else
+liblinphone_la_SOURCES+=linphone_tunnel_stubs.c
 endif
 
 
@@ -69,7 +74,9 @@ liblinphone_la_LIBADD= \
                $(MEDIASTREAMER_LIBS) \
                $(ORTP_LIBS) $(OPENSSL_LIBS) \
                $(TUNNEL_LIBS) \
-               $(LIBSOUP_LIBS)
+               $(LIBSOUP_LIBS) \
+               $(SQLITE3_LIBS)
+
 
 if BUILD_TESTS
 noinst_PROGRAMS=test_lsd test_ecc test_numbers
@@ -87,8 +94,11 @@ test_numbers_SOURCES=test_numbers.c
 test_numbers_LDADD=liblinphone.la $(liblinphone_la_LIBADD)
 endif
 
+AM_CPPFLAGS=\
+       -I$(top_srcdir)
 
-AM_CFLAGS=$(STRICT_OPTIONS)  -DIN_LINPHONE \
+AM_CFLAGS=\
+       $(STRICT_OPTIONS)  -DIN_LINPHONE \
        $(ORTP_CFLAGS) \
        $(MEDIASTREAMER_CFLAGS) \
        $(OSIP_CFLAGS) \
@@ -99,7 +109,8 @@ AM_CFLAGS=$(STRICT_OPTIONS)  -DIN_LINPHONE \
        $(IPV6_CFLAGS) \
        -DORTP_INET6 \
        $(VIDEO_CFLAGS) \
-       $(TUNNEL_CFLAGS)
+       $(TUNNEL_CFLAGS) \
+       $(SQLITE3_CFLAGS)
 
 if BUILD_WIZARD
 AM_CFLAGS+= -DBUILD_WIZARD 
@@ -107,15 +118,20 @@ endif
 
 AM_CXXFLAGS=$(AM_CFLAGS)
 
-$(GITVERSION_FILE):
-       if test -d $(top_srcdir)/.git ; then \
-               $(ECHO) -n "#define LIBLINPHONE_GIT_VERSION " > $(GITVERSION_FILE_TMP) &&\
-               $(ECHO) \"`cd $(top_srcdir) && git describe`\" >> $(GITVERSION_FILE_TMP) &&\
-               if test "`cat $(GITVERSION_FILE_TMP)`" != "`cat $(srcdir)/$(GITVERSION_FILE)`" ; then \
-                       cp -f $(GITVERSION_FILE_TMP) $(srcdir)/$(GITVERSION_FILE) ; \
-               fi \
-               && rm -f $(GITVERSION_FILE_TMP) ;\
+make_gitversion_h:
+       if test "$(GITDESCRIBE)" != "" ; then \
+               $(ECHO) -n "#define LIBLINPHONE_GIT_VERSION \"$(GITDESCRIBE)\"" > $(GITVERSION_FILE_TMP) ; \
+       elif test "$(GITREVISION)" != "" ; then \
+               $(ECHO) -n "#define LIBLINPHONE_GIT_VERSION \"$(LINPHONE_VERSION)_$(GITREVISION)\"" > $(GITVERSION_FILE_TMP) ; \
+       else \
+               $(ECHO) -n "" > $(GITVERSION_FILE_TMP) ; \
        fi
-       if ! test -f $(srcdir)/$(GITVERSION_FILE) ; then \
-               $(ECHO) -n "" > $(srcdir)/$(GITVERSION_FILE) ;\
+       if test ! -f $(srcdir)/$(GITVERSION_FILE) ; then \
+               cp -f $(GITVERSION_FILE_TMP) $(srcdir)/$(GITVERSION_FILE) ; \
        fi
+       if test "`cat $(GITVERSION_FILE_TMP)`" != "`cat $(srcdir)/$(GITVERSION_FILE)`" ; then \
+               cp -f $(GITVERSION_FILE_TMP) $(srcdir)/$(GITVERSION_FILE) ; \
+       fi
+       rm -f $(GITVERSION_FILE_TMP) ;
+
+$(GITVERSION_FILE): make_gitversion_h