Aac-eld add missing header according to RFC3640 3.3.6

[linphone] / coreapi / Makefile.am

diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am
index 31094d71e651a692bcbf2e186dffea62d4327786..91fc9bd222d85f69b89f44249dc43e3028d1848c 100644 (file)
--- a/coreapi/Makefile.am
+++ b/coreapi/Makefile.am
@@ -1,17 +1,26 @@
+GITVERSION_FILE=liblinphone_gitversion.h
+GITVERSION_FILE_TMP=liblinphone_gitversion.h.tmp
+GITDESCRIBE=`git describe --always`
+GITREVISION=`git rev-parse HEAD`
 
-SUBDIRS=help
+ECHO=/bin/echo
 
-EXTRA_DIST=linphonecore_jni.cc
+SUBDIRS=. help
+
+EXTRA_DIST=linphonecore_jni.cc $(GITVERSION_FILE)
+
+BUILT_SOURCES=$(GITVERSION_FILE)
+
+CLEANFILES=$(GITVERSION_FILE)
 
 ## Process this file with automake to produce Makefile.in
 linphone_includedir=$(includedir)/linphone
 
-linphone_include_HEADERS=linphonecore.h linphonecore_utils.h ../config.h lpconfig.h sipsetup.h
-
-INCLUDES = \
-       -I$(top_srcdir)\
-       -I$(top_srcdir)/mediastreamer2/include
+linphone_include_HEADERS=linphonecore.h linphonefriend.h linphonecore_utils.h lpconfig.h sipsetup.h 
 
+if BUILD_TUNNEL
+linphone_include_HEADERS+=linphone_tunnel.h
+endif
 
 lib_LTLIBRARIES=liblinphone.la
 
@@ -32,36 +41,97 @@ liblinphone_la_SOURCES=\
        authentication.c \
        lpconfig.c lpconfig.h \
        chat.c \
-       general_state.c \
        linphonecall.c \
        sipsetup.c sipsetup.h \
        siplogin.c \
-       lsd.c linphonecore_utils.h
+       lsd.c linphonecore_utils.h \
+       ec-calibrator.c \
+       conference.c \
+       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+=linphone_tunnel.cc TunnelManager.cc TunnelManager.hh 
+else
+liblinphone_la_SOURCES+=linphone_tunnel_stubs.c
+endif
+
 
 
 liblinphone_la_LDFLAGS= -version-info $(LIBLINPHONE_SO_VERSION) -no-undefined
 
 liblinphone_la_LIBADD= \
                $(EXOSIP_LIBS) \
-               $(top_builddir)/mediastreamer2/src/libmediastreamer.la \
-               $(ORTP_LIBS)
+               $(MEDIASTREAMER_LIBS) \
+               $(ORTP_LIBS) $(OPENSSL_LIBS) \
+               $(TUNNEL_LIBS) \
+               $(LIBSOUP_LIBS) \
+               $(SQLITE3_LIBS)
 
-if BUILD_WIN32
-liblinphone_la_LIBADD+=$(top_builddir)/oRTP/src/libortp.la
-endif
 
-noinst_PROGRAMS=test_lsd
+if BUILD_TESTS
+noinst_PROGRAMS=test_lsd test_ecc test_numbers
 
 test_lsd_SOURCES=test_lsd.c
 
-test_lsd_LDADD=liblinphone.la
+test_lsd_LDADD=liblinphone.la $(liblinphone_la_LIBADD)
+
+test_ecc_SOURCES=test_ecc.c
+
+test_ecc_LDADD=liblinphone.la $(liblinphone_la_LIBADD)
 
-AM_CFLAGS=$(STRICT_OPTIONS)  -DIN_LINPHONE \
+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 \
        $(ORTP_CFLAGS) \
+       $(MEDIASTREAMER_CFLAGS) \
        $(OSIP_CFLAGS) \
        $(EXOSIP_CFLAGS) \
+       $(LIBSOUP_CFLAGS) \
        -DENABLE_TRACE  \
        -DLOG_DOMAIN=\"LinphoneCore\" \
-        $(IPV6_CFLAGS) \
-        -DORTP_INET6 \
-        $(VIDEO_CFLAGS) 
+       $(IPV6_CFLAGS) \
+       -DORTP_INET6 \
+       $(VIDEO_CFLAGS) \
+       $(TUNNEL_CFLAGS) \
+       $(SQLITE3_CFLAGS)
+
+if BUILD_WIZARD
+AM_CFLAGS+= -DBUILD_WIZARD 
+endif
+
+AM_CXXFLAGS=$(AM_CFLAGS)
+
+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 \
+               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