forked from mirrors/linphone-iphone
Fix autotool warnings
This commit is contained in:
Yann Diorcet
parent
a879204d2d
commit
3e7a110e01
14 changed files with 69 additions and 67 deletions
30
Makefile.am
30
Makefile.am
|
|
@ -18,13 +18,13 @@ OPTIONAL_SOUNDS=\
|
|||
share/sounds/linphone/rings/rock.wav
|
||||
|
||||
|
||||
INSTALLDIR=$(shell cd $(top_builddir) && pwd)/linphone-install
|
||||
INSTALLDIR=$(abs_top_builddir)/linphone-install
|
||||
INSTALLDIR_WITH_PREFIX=$(INSTALLDIR)/$(prefix)
|
||||
ZIPFILE=$(shell cd $(top_builddir) && pwd)/$(PACKAGE)-win32-$(VERSION).zip
|
||||
ZIPFILE=$(abs_top_builddir)/$(PACKAGE)-win32-$(VERSION).zip
|
||||
ZIP_EXCLUDED=include lib \
|
||||
$(OPTIONAL_SOUNDS)
|
||||
|
||||
SDK_ZIPFILE=$(shell cd $(top_builddir) && pwd)/lib$(PACKAGE)-win32-$(VERSION).zip
|
||||
SDK_ZIPFILE=$(abs_top_builddir)/lib$(PACKAGE)-win32-$(VERSION).zip
|
||||
SDK_EXCLUDED= \
|
||||
bin/linphone.exe \
|
||||
lib/*.la \
|
||||
|
|
@ -38,11 +38,11 @@ SDK_EXCLUDED= \
|
|||
GTK_PREFIX=/
|
||||
GTK_THEME=Outcrop
|
||||
GTK_FILELIST=gtk+-2.22.1.filelist
|
||||
GTK_FILELIST_PATH=$(shell cd $(top_srcdir) && pwd)/$(GTK_FILELIST)
|
||||
GTK_FILELIST_PATH=$(abs_top_srcdir)/$(GTK_FILELIST)
|
||||
LINPHONEDEPS_FILELIST=linphone-deps.filelist
|
||||
WINBINDIST_FILES=$(shell cat $(top_srcdir)/$(LINPHONEDEPS_FILELIST))
|
||||
WINBINDIST_FILES=`cat $(top_srcdir)/$(LINPHONEDEPS_FILELIST)`
|
||||
ISS_SCRIPT=linphone.iss
|
||||
ISS_SCRIPT_PATH=$(shell cd $(top_srcdir) && pwd)/$(ISS_SCRIPT)
|
||||
ISS_SCRIPT_PATH=$(abs_top_srcdir)/$(ISS_SCRIPT)
|
||||
#path to Inno Setup 5 compiler
|
||||
ISCC=ISCC.exe
|
||||
PACKAGE_WIN32_FILELIST=$(PACKAGE)-win32.filelist
|
||||
|
|
@ -102,7 +102,7 @@ other-cherrypick:
|
|||
cd $(GTK_PREFIX) && \
|
||||
for file in $(WINBINDIST_FILES) ; do \
|
||||
if test -d $$file; then \
|
||||
mkdir -p $(INSTALLDIR_WITH_PREFIX)/$$file ;\
|
||||
$(MKDIR_P) $(INSTALLDIR_WITH_PREFIX)/$$file ;\
|
||||
else \
|
||||
cp $$file $(INSTALLDIR_WITH_PREFIX)/$$file ;\
|
||||
fi \
|
||||
|
|
@ -119,18 +119,18 @@ gtk-cherrypick:
|
|||
cd $(GTK_PREFIX) && \
|
||||
for file in `cat $(GTK_FILELIST_PATH)` ; do \
|
||||
if test -d $$file; then \
|
||||
mkdir -p $(INSTALLDIR_WITH_PREFIX)/$$file ;\
|
||||
$(MKDIR_P) $(INSTALLDIR_WITH_PREFIX)/$$file ;\
|
||||
else \
|
||||
cp $$file $(INSTALLDIR_WITH_PREFIX)/$$file ;\
|
||||
fi \
|
||||
done && \
|
||||
mkdir -p $(INSTALLDIR_WITH_PREFIX)/share/themes && \
|
||||
$(MKDIR_P) $(INSTALLDIR_WITH_PREFIX)/share/themes && \
|
||||
cp -rf share/themes/$(GTK_THEME) $(INSTALLDIR_WITH_PREFIX)/share/themes/.
|
||||
|
||||
zip:
|
||||
rm -f $(ZIPFILE)
|
||||
rm -rf $(INSTALLDIR)
|
||||
mkdir -p $(INSTALLDIR)
|
||||
$(MKDIR_P) $(INSTALLDIR)
|
||||
make install DESTDIR=$(INSTALLDIR)
|
||||
#remove unwanted linphone stuff
|
||||
cd $(INSTALLDIR_WITH_PREFIX) && rm -rf $(ZIP_EXCLUDED)
|
||||
|
|
@ -145,7 +145,7 @@ zip:
|
|||
sdk:
|
||||
rm -f $(SDK_ZIPFILE)
|
||||
rm -rf $(INSTALLDIR)
|
||||
mkdir -p $(INSTALLDIR)
|
||||
$(MKDIR_P) $(INSTALLDIR)
|
||||
make install DESTDIR=$(INSTALLDIR)
|
||||
# remove unwanted stuff (gtk interface)
|
||||
cd $(INSTALLDIR_WITH_PREFIX) && rm -rf $(SDK_EXCLUDED)
|
||||
|
|
@ -182,12 +182,12 @@ newdate:
|
|||
cd gtk && $(MAKE) newdate
|
||||
|
||||
if HAVE_MD5SUM
|
||||
GEN_MD5=$(shell $(MD5SUM) linphone-$(VERSION).tar.gz | awk {'print $$4'})
|
||||
GEN_MD5=`$(MD5SUM) linphone-$(VERSION).tar.gz | awk {'print $$4'}`
|
||||
else
|
||||
GEN_MD5=$(shell $(MD5SUM) linphone-$(VERSION).tar.gz | awk {'print $$1'})
|
||||
GEN_MD5=`$(MD5SUM) linphone-$(VERSION).tar.gz | awk {'print $$1'}`
|
||||
endif
|
||||
|
||||
Portfile: $(top_srcdir)/scripts/Portfile.tmpl dist
|
||||
Portfile: $(top_srcdir)/scripts/Portfile.tmpl dist
|
||||
sed -e 's/\@VERSION\@/$(LINPHONE_VERSION)/g' \
|
||||
-e 's/\@LINPHONE_MD5\@/$(GEN_MD5)/' < $< > $@
|
||||
|
||||
|
|
@ -210,7 +210,7 @@ $(LIBICONV_HACK):
|
|||
|
||||
bundle: $(LIBICONV_HACK)
|
||||
rm -rf $(INSTALLDIR)
|
||||
mkdir -p $(INSTALLDIR)
|
||||
$(MKDIR_P) $(INSTALLDIR)
|
||||
make install DESTDIR=$(INSTALLDIR)
|
||||
BUNDLE_PREFIX=$(BUNDLEPREFIX) \
|
||||
LINPHONE_INSTALL_PREFIX=$(INSTALLDIR_WITH_PREFIX) \
|
||||
|
|
|
|||
|
|
@ -32,9 +32,9 @@ AC_MSG_NOTICE([licensed under the terms of the General Public License (GPL)])
|
|||
AM_INIT_AUTOMAKE
|
||||
AC_SUBST([LIBTOOL_DEPS])
|
||||
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],)
|
||||
AC_SUBST([docdir], [${datadir}/doc])
|
||||
AC_CONFIG_HEADER(config.h)
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
AC_SUBST([mkdir_p])
|
||||
AC_ISC_POSIX
|
||||
AC_PROG_CC
|
||||
AC_PROG_CXX
|
||||
|
|
@ -118,7 +118,7 @@ fi
|
|||
|
||||
GETTEXT_PACKAGE=linphone
|
||||
AC_SUBST(GETTEXT_PACKAGE)
|
||||
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",[The name of the gettext package name])
|
||||
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The name of the gettext package name])
|
||||
dnl AC_CHECK_LIB(intl,libintl_gettext)
|
||||
|
||||
AC_CHECK_FUNCS([get_current_dir_name strndup stpcpy] )
|
||||
|
|
|
|||
|
|
@ -1,25 +1,32 @@
|
|||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
COMMON_CFLAGS=$(STRICT_OPTIONS) -DIN_LINPHONE -DENABLE_TRACE -D_ORTP_SOURCE $(VIDEO_CFLAGS) $(READLINE_CFLAGS) $(OSIP_CFLAGS)
|
||||
AM_CPPFLAGS=\
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_srcdir)/coreapi \
|
||||
-I$(top_srcdir)/exosip
|
||||
|
||||
COMMON_CFLAGS=\
|
||||
-DIN_LINPHONE \
|
||||
-DENABLE_TRACE \
|
||||
-D_ORTP_SOURCE \
|
||||
$(STRICT_OPTIONS) \
|
||||
$(VIDEO_CFLAGS) \
|
||||
$(READLINE_CFLAGS) \
|
||||
$(OSIP_CFLAGS) \
|
||||
$(ORTP_CFLAGS) \
|
||||
$(MEDIASTREAMER_CFLAGS)
|
||||
|
||||
if BUILD_CONSOLE
|
||||
|
||||
INCLUDES = \
|
||||
-I$(top_srcdir)\
|
||||
-I$(top_srcdir)/coreapi\
|
||||
$(ORTP_CFLAGS) \
|
||||
-I$(top_srcdir)/exosip \
|
||||
$(MEDIASTREAMER_CFLAGS)
|
||||
|
||||
bin_PROGRAMS = linphonec linphonecsh
|
||||
bin_PROGRAMS=linphonec linphonecsh
|
||||
|
||||
if BUILD_WIN32
|
||||
bin_PROGRAMS += linphoned
|
||||
bin_PROGRAMS+=linphoned
|
||||
endif
|
||||
|
||||
linphonec_SOURCES = linphonec.c linphonec.h commands.c
|
||||
linphonec_SOURCES=linphonec.c linphonec.h commands.c
|
||||
linphonec_CFLAGS=$(COMMON_CFLAGS) $(CONSOLE_FLAGS)
|
||||
linphonec_LDADD = $(top_builddir)/coreapi/liblinphone.la $(READLINE_LIBS) \
|
||||
linphonec_LDADD=$(top_builddir)/coreapi/liblinphone.la $(READLINE_LIBS) \
|
||||
$(MEDIASTREAMER_LIBS) \
|
||||
$(ORTP_LIBS) \
|
||||
$(SPEEX_LIBS) \
|
||||
|
|
@ -28,15 +35,15 @@ linphonec_LDADD = $(top_builddir)/coreapi/liblinphone.la $(READLINE_LIBS) \
|
|||
|
||||
if BUILD_WIN32
|
||||
#special build of linphonec to detach from the windows console
|
||||
linphoned_SOURCES = $(linphonec_SOURCES)
|
||||
linphoned_SOURCES=$(linphonec_SOURCES)
|
||||
linphoned_CFLAGS=$(COMMON_CFLAGS) $(GUI_FLAGS)
|
||||
linphoned_LDADD=$(linphonec_LDADD)
|
||||
endif
|
||||
|
||||
|
||||
linphonecsh_SOURCES = shell.c
|
||||
linphonecsh_CFLAGS = $(CONSOLE_FLAGS)
|
||||
linphonecsh_LDADD = $(ORTP_LIBS)
|
||||
linphonecsh_SOURCES=shell.c
|
||||
linphonecsh_CFLAGS=$(COMMON_CFLAGS) $(CONSOLE_FLAGS)
|
||||
linphonecsh_LDADD=$(ORTP_LIBS)
|
||||
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
GITVERSION_FILE=liblinphone_gitversion.h
|
||||
GITVERSION_FILE_TMP=liblinphone_gitversion.h.tmp
|
||||
GITDESCRIBE=$(shell git describe)
|
||||
GITREVISION=$(shell git rev-parse HEAD)
|
||||
GITDESCRIBE=`git describe`
|
||||
GITREVISION=`git rev-parse HEAD`
|
||||
|
||||
ECHO=/bin/echo
|
||||
|
||||
|
|
@ -22,10 +22,6 @@ if BUILD_TUNNEL
|
|||
linphone_include_HEADERS+=linphone_tunnel.h
|
||||
endif
|
||||
|
||||
INCLUDES = \
|
||||
-I$(top_srcdir)
|
||||
|
||||
|
||||
lib_LTLIBRARIES=liblinphone.la
|
||||
|
||||
liblinphone_la_SOURCES=\
|
||||
|
|
@ -89,8 +85,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) \
|
||||
|
|
|
|||
|
|
@ -1,21 +1,20 @@
|
|||
|
||||
EXTRA_DIST = Doxyfile.in doxygen.dox
|
||||
EXTRA_DIST=Doxyfile.in doxygen.dox
|
||||
|
||||
SOURCES= doxygen.dox $(top_srcdir)/coreapi/help/*.c $(top_srcdir)/coreapi/*.c $(top_srcdir)/coreapi/*.h
|
||||
SOURCES=doxygen.dox $(top_srcdir)/coreapi/help/*.c $(top_srcdir)/coreapi/*.c $(top_srcdir)/coreapi/*.h
|
||||
|
||||
|
||||
#html doc
|
||||
# html doc
|
||||
if HAVE_DOXYGEN
|
||||
|
||||
# doxdir & pkgdocdir are not always defined by automake
|
||||
docdir=$(datadir)/doc
|
||||
# docdir & pkgdocdir are not always defined by automake
|
||||
pkgdocdir=$(docdir)/$(PACKAGE)-$(VERSION)
|
||||
doc_htmldir=$(pkgdocdir)/html
|
||||
|
||||
doc_html_DATA = $(top_builddir)/coreapi/help/doc/html/html.tar
|
||||
|
||||
$(doc_html_DATA): $(top_builddir)/coreapi/help/doc/html/index.html
|
||||
cd $(<D) && tar cf html.tar *
|
||||
cd $(top_builddir)/coreapi/help/doc/html/ && tar cf html.tar *
|
||||
|
||||
$(top_builddir)/coreapi/help/doc/html/index.html: $(SOURCES) Doxyfile Makefile.am
|
||||
rm -rf doc
|
||||
|
|
@ -60,21 +59,20 @@ LINPHONE_TUTOS+=$(chatroom_SOURCES)
|
|||
chatroom_LDADD=$(helloworld_LDADD)
|
||||
endif
|
||||
|
||||
endif
|
||||
endif
|
||||
|
||||
INCLUDES=-I$(top_srcdir)/coreapi \
|
||||
$(MEDIASTREAMER_CFLAGS)
|
||||
|
||||
AM_CFLAGS=$(STRICT_OPTIONS) -DIN_LINPHONE \
|
||||
AM_CFLAGS=\
|
||||
$(STRICT_OPTIONS) \
|
||||
-DIN_LINPHONE \
|
||||
$(ORTP_CFLAGS) \
|
||||
$(OSIP_CFLAGS) \
|
||||
$(MEDIASTREAMER_CFLAGS) \
|
||||
$(EXOSIP_CFLAGS) \
|
||||
-DENABLE_TRACE \
|
||||
-DLOG_DOMAIN=\"LinphoneCore\" \
|
||||
$(IPV6_CFLAGS) \
|
||||
-DORTP_INET6 \
|
||||
$(VIDEO_CFLAGS)
|
||||
$(IPV6_CFLAGS) \
|
||||
-DORTP_INET6 \
|
||||
$(VIDEO_CFLAGS)
|
||||
|
||||
|
||||
tutodir=$(datadir)/tutorials/linphone
|
||||
|
|
|
|||
|
|
@ -1234,7 +1234,6 @@ void linphone_core_mute_mic(LinphoneCore *lc, bool_t muted);
|
|||
**/
|
||||
bool_t linphone_core_is_mic_muted(LinphoneCore *lc);
|
||||
|
||||
bool_t linphone_core_is_audio_muted(LinphoneCore *lc);
|
||||
bool_t linphone_core_is_rtp_muted(LinphoneCore *lc);
|
||||
|
||||
bool_t linphone_core_get_rtp_no_xmit_on_audio_mute(const LinphoneCore *lc);
|
||||
|
|
|
|||
|
|
@ -1,10 +1,8 @@
|
|||
SUBDIRS=src
|
||||
|
||||
|
||||
|
||||
INSTALLDIR=$(shell cd $(top_builddir) && pwd)/$(PACKAGE)-install
|
||||
INSTALLDIR=$(abs_top_builddir)/$(PACKAGE)-install
|
||||
INSTALLDIR_WITH_PREFIX=$(INSTALLDIR)/$(prefix)
|
||||
ZIPFILE=$(shell cd $(top_builddir) && pwd)/$(PACKAGE)-win32-$(VERSION).zip
|
||||
ZIPFILE=$(abs_top_builddir)/$(PACKAGE)-win32-$(VERSION).zip
|
||||
ZIP_EXCLUDED=include
|
||||
PLUGIN_DEPS_PREFIX=/usr/bin
|
||||
PLUGIN_DEPS= libsoup-2.4-1.dll \
|
||||
|
|
@ -20,9 +18,9 @@ PLUGIN_DEPS= libsoup-2.4-1.dll \
|
|||
zip:
|
||||
rm -f $(ZIPFILE)
|
||||
rm -rf $(INSTALLDIR)
|
||||
mkdir -p $(INSTALLDIR)
|
||||
$(MKDIR_P) $(INSTALLDIR)
|
||||
make install DESTDIR=$(INSTALLDIR)
|
||||
mkdir -p $(INSTALLDIR_WITH_PREFIX)/bin
|
||||
$(MKDIR_P) $(INSTALLDIR_WITH_PREFIX)/bin
|
||||
cd $(PLUGIN_DEPS_PREFIX) && \
|
||||
cp -f $(PLUGIN_DEPS) $(INSTALLDIR_WITH_PREFIX)/bin/.
|
||||
cd $(INSTALLDIR)/$(prefix) && rm -rf $(ZIP_EXCLUDED) && \
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
EXTRA_DIST= $(shell cd $(srcdir) && ls *.m4)
|
||||
EXTRA_DIST=`ls $(srcdir)/*.m4`
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
|
|||
AC_DEFUN([AM_INTL_SUBDIR],
|
||||
[
|
||||
AC_REQUIRE([AC_PROG_INSTALL])dnl
|
||||
AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
|
||||
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
|
||||
AC_REQUIRE([AC_PROG_CC])dnl
|
||||
AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
||||
AC_REQUIRE([gt_GLIBC2])dnl
|
||||
|
|
|
|||
1
m4/obsolete.m4
Normal file
1
m4/obsolete.m4
Normal file
|
|
@ -0,0 +1 @@
|
|||
AC_DEFUN([AM_PROG_MKDIR_P], [AC_PROG_MKDIR_P([$@])])
|
||||
2
m4/po.m4
2
m4/po.m4
|
|
@ -24,7 +24,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
|
|||
[
|
||||
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
|
||||
AC_REQUIRE([AC_PROG_INSTALL])dnl
|
||||
AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
|
||||
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
|
||||
AC_REQUIRE([AM_NLS])dnl
|
||||
|
||||
dnl Perform the following tests also if --disable-nls has been given,
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 07e0e720ee7a9d3c34d28430bc15319ad27b3d8b
|
||||
Subproject commit 4448148a56924506ddecbeffb75251845251c750
|
||||
2
oRTP
2
oRTP
|
|
@ -1 +1 @@
|
|||
Subproject commit 0d318ef477b40f72b5838a836ddccc0e055c0719
|
||||
Subproject commit 1b449a3491fb2397df129467bf58a64921d65e40
|
||||
|
|
@ -14,7 +14,7 @@ $(linphone_help)/manual.html:
|
|||
sgmltools $(srcdir)/manual.sgml
|
||||
|
||||
install-data-local:
|
||||
$(mkdir_p) $(DESTDIR)$(linphone_manualdir)
|
||||
$(MKDIR_P) $(DESTDIR)$(linphone_manualdir)
|
||||
-cp -f $(linphone_help)/*.html $(DESTDIR)/$(linphone_manualdir)/.
|
||||
-cp -f $(linphone_help)/*.css $(DESTDIR)/$(linphone_manualdir)/.
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue