From bf8bdac13a2d399ddded91de4bfb05e8dad0a0c8 Mon Sep 17 00:00:00 2001 From: Lubos Dolezel Date: Tue, 2 Jun 2015 20:46:46 +0200 Subject: Removed old build system twinkle.desktop is now installed --- CMakeLists.txt | 6 + Makefile.am | 31 ---- configure.ac | 344 -------------------------------------- m4/vl_lib_readline.m4 | 107 ------------ src/Makefile.am | 104 ------------ src/audio/Makefile.am | 49 ------ src/audio/gsm/Makefile.am | 32 ---- src/audits/Makefile.am | 9 - src/gui/lang/Makefile.am | 38 ----- src/gui/twinkle.pro | 418 ---------------------------------------------- src/im/Makefile.am | 9 - src/mwi/Makefile.am | 29 ---- src/parser/Makefile.am | 195 --------------------- src/patterns/Makefile.am | 7 - src/presence/Makefile.am | 17 -- src/sdp/Makefile.am | 27 --- src/sockets/Makefile.am | 30 ---- src/stun/Makefile.am | 15 -- src/threads/Makefile.am | 11 -- src/utils/Makefile.am | 11 -- twinkle_config.h.in | 2 +- 21 files changed, 7 insertions(+), 1484 deletions(-) delete mode 100644 Makefile.am delete mode 100644 configure.ac delete mode 100644 m4/vl_lib_readline.m4 delete mode 100644 src/Makefile.am delete mode 100644 src/audio/Makefile.am delete mode 100644 src/audio/gsm/Makefile.am delete mode 100644 src/audits/Makefile.am delete mode 100644 src/gui/lang/Makefile.am delete mode 100644 src/gui/twinkle.pro delete mode 100644 src/im/Makefile.am delete mode 100644 src/mwi/Makefile.am delete mode 100644 src/parser/Makefile.am delete mode 100644 src/patterns/Makefile.am delete mode 100644 src/presence/Makefile.am delete mode 100644 src/sdp/Makefile.am delete mode 100644 src/sockets/Makefile.am delete mode 100644 src/stun/Makefile.am delete mode 100644 src/threads/Makefile.am delete mode 100644 src/utils/Makefile.am diff --git a/CMakeLists.txt b/CMakeLists.txt index 65eea47..48a5eab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,7 +112,10 @@ check_include_file(unistd.h HAVE_UNISTD_H) check_include_file(linux/types.h HAVE_LINUX_TYPES_H) check_include_file(linux/errqueue.h HAVE_LINUX_ERRQUEUE_H) +set(datadir "${CMAKE_INSTALL_PREFIX}/share/twinkle") configure_file(twinkle_config.h.in twinkle_config.h) +configure_file(twinkle.desktop.in twinkle.desktop) + include_directories("${CMAKE_BINARY_DIR}") install(FILES @@ -127,5 +130,8 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/gui/images/twinkle48.png DESTINATION share/pixmaps RENAME twinkle.png) +install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/twinkle.desktop + DESTINATION share/applications) add_subdirectory(src) diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 5c3bcac..0000000 --- a/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -# The Makefile for the Qt-part of the program is created by qmake. -# That Makefile builts the executable. -# So here the executable is defined as a script such that it will -# only be installed and not built. - -ACLOCAL_AMFLAGS = -I m4 - -pkglangdir = $(pkgdatadir)/lang - -bin_SCRIPTS = src/gui/twinkle -noinst_SCRIPTS = twinkle.desktop - -pkgdata_DATA = data/ringback.wav data/ringtone.wav \ - data/providers.csv \ - src/gui/images/twinkle16.png src/gui/images/twinkle32.png \ - src/gui/images/twinkle48.png - -EXTRA_DIST = src/gui/*.ui src/gui/*.h src/gui/*.cpp src/gui/Makefile \ - src/gui/twinkle.pro src/gui/images/* \ - data/ringback.wav data/ringtone.wav data/providers.csv \ - m4/*.m4 \ - sip.protocol twinkle.desktop.in Doxyfile - -SUBDIRS = src - -edit = sed \ - -e 's,@datadir\@,$(pkgdatadir),g' \ - -e 's,@prefix\@,$(prefix),g' - -twinkle.desktop: Makefile $(srcdir)/twinkle.desktop.in - $(edit) $(srcdir)/twinkle.desktop.in >twinkle.desktop diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 2c4301d..0000000 --- a/configure.ac +++ /dev/null @@ -1,344 +0,0 @@ -AC_INIT([twinkle],[1.4.2]) -AC_CANONICAL_TARGET -AC_CONFIG_SRCDIR(src/phone.h) -AM_INIT_AUTOMAKE - -AC_CONFIG_HEADERS([src/twinkle_config.h]) - -AC_ARG_ENABLE(qt-check, - AS_HELP_STRING([--disable-qt-check],[do not check Qt installation]), - [ac_cv_qt_check=$enableval], [ac_cv_qt_check=yes]) - -AC_ARG_WITH(kde, - AS_HELP_STRING([--without-kde],[do not compile KDE features]), - [ac_cv_kde=$withval], [ac_cv_kde=yes]) - -AC_ARG_WITH(ilbc, - AS_HELP_STRING([--without-ilbc],[do not compile iLBC]), - [ac_cv_ilbc=$withval], [ac_cv_ilbc=yes]) - -AC_ARG_WITH(speex, - AS_HELP_STRING([--without-speex],[do not compile speex]), - [ac_cv_speex=$withval], [ac_cv_speex=yes]) - -AC_ARG_WITH(zrtp, - AS_HELP_STRING([--without-zrtp],[do not compile zrtp support]), - [ac_cv_zrtp=$withval], [ac_cv_zrtp=yes]) - -AC_ARG_ENABLE(ilbc-cpp, - AS_HELP_STRING([--enable-ilbc-cpp],[your ilbc library is built for C++ instead of C]), - [ac_cv_ilbc_cpp=$enableval], [ac_cv_ilbc_cpp=no]) - -AC_DEFINE(VERSION_DATE,["February 25 2009"],[Version release date]) -AC_PROG_CC -AC_PROG_CXX -AC_PROG_CPP -AC_PROG_CXXCPP -AC_PROG_RANLIB -AC_PROG_LEX -AC_PROG_YACC -AC_C_BIGENDIAN -AC_LANG(C++) -AC_FUNC_STRERROR_R - -AC_CHECK_HEADERS([linux/types.h]) -AC_CHECK_HEADERS([linux/errqueue.h],[],[],[ - #if HAVE_LINUX_TYPES_H - #include - #endif]) - -# Temporarily add some default directories to PKG_CONFIG_PATH such that -# the user will not be burdened with setting PKG_CONFIG_PATH -OLD_PKG_CONFIG_PATH=$PKG_CONFIG_PATH -PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig - -if test "x${prefix}" != "xNONE" -then - PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${prefix}/lib/pkgconfig -fi - -if test -n "$QTDIR" -then - PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$QTDIR/lib/pkgconfig -fi - -export PKG_CONFIG_PATH - -PKG_CHECK_MODULES(CCRTP, libccrtp >= 2.0.0) -PKG_CHECK_MODULES(UCOMMON, ucommon >= 5.0.0) -CCRTP_LIBS="$CCRTP_LIBS $UCOMMON_LIBS" - -PKG_CHECK_MODULES(XML2, libxml-2.0) -# AC_CHECK_HEADER(libxml/tree.h, [], -# [AC_MSG_ERROR([libxml2 header files missing (libxml2-devel package)])]) - -if test "x$ac_cv_qt_check" = "xyes" -then - PKG_CHECK_MODULES(QT, QtCore >= 4.0 QtCore < 6.0) -fi - -# Restore the original value of PKG_CONFIG_PATH -PKG_CONFIG_PATH=$OLD_PKG_CONFIG_PATH -export PKG_CONFIG_PATH - -# Check if QTDIR variable is set -AC_MSG_CHECKING([value of \$QTDIR]) -if test -n "$QTDIR" -then - AC_MSG_RESULT([$QTDIR]) -else - AC_MSG_RESULT([not set]) - AC_MSG_ERROR([Set \$QTDIR to the Qt directory, eg. /usr/lib/qt3]) -fi - -AC_MSG_CHECKING([for qmake]) -if test -x $QTDIR/bin/qmake -then - AC_MSG_RESULT([yes]) -else - AC_MSG_RESULT([no]) - AC_MSG_ERROR([Cannot find qmake in \$QTDIR/bin. \$QTDIR is incorrect.]) -fi - -PKG_CHECK_MODULES([QT], [QtCore QtGui Qt3Support]) - -# Check if lrelease is available -AC_CHECK_PROG(have_lrelease, lrelease, yes, no) -if test "x$have_lrelease" = "xno" -then - AC_MSG_ERROR([lrelease is missing (part of Qt devel package)]) -fi - -dnl Create a Qt include project file for platform dependend variables -dnl This file will be included by the project file in the gui directory -dnl Determine include files and dynamic libs. -dnl Creation of qtccxxincl.pro is good to be in AC_CONFIG_COMMANDS -dnl macro so that config.status to be able to create it too. -dnl In this case we benefit from more ac_xxx variables. -dnl Disadvantage is autoconf don't group commands with same tag -dnl and we should use different tags. In result AC_OUTPUT will -dnl show all of them. -QT_INCL_PRO=qtccxxincl.pro -AC_MSG_NOTICE([creating $QT_INCL_PRO (include project file for Qt)]) - -# first set include path to generated files -echo "INCLUDEPATH += `pwd`/src" > $QT_INCL_PRO -# next get includes specified on command line -( -set -- $CPPFLAGS -while test -n "$1"; do - echo $1 - shift -done -) | grep '^-I' | sed -e 's|^-I||' | xargs echo INCLUDEPATH += >> $QT_INCL_PRO - -#echo "INCLUDEPATH += `$CCGNU2_CONFIG --includes`" | sed -e s/-I//g > $QT_INCL_PRO -# libccrtp1(ccrtp) depend from libccgnu2(commoncpp2) and -# should include above flags ! -echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libccrtp`" | sed -e s/-I//g >> $QT_INCL_PRO -echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libxml-2.0`" | sed -e s/-I//g >> $QT_INCL_PRO - -# get libraries specified on command line -echo $LDFLAGS | xargs echo LIBS += >> $QT_INCL_PRO - -echo "LIBS += `$CCGNU2_CONFIG --stdlibs`" >> $QT_INCL_PRO -echo "LIBS += $CCRTP_LIBS" >> $QT_INCL_PRO -echo "LIBS += $UCOMMON_LIBS" >> $QT_INCL_PRO -echo "LIBS += $XML2_LIBS" >> $QT_INCL_PRO - -# Check if KDE is available -if test "x$ac_cv_kde" = "xyes" -then - AC_CHECK_PROG(have_kde, kde4-config, yes, no) -else - have_kde="no" -fi - -if test "x$have_kde" = "xyes" -then - KDE_SET_PREFIX - - AC_CHECK_FILES(${kde_includes}/kapplication.h, - [], - [AC_MSG_ERROR([kde header files missing (kdelibs3-devel package)])]) - AC_DEFINE(HAVE_KDE, 1, [Define to 1 if you have KDE.]) - echo "INCLUDEPATH += ${kde_includes}" >> $QT_INCL_PRO - echo "LIBS += -L${kde_libraries} -lkdecore -lkdeui -lkio" >> $QT_INCL_PRO - echo "LIBS += -L${TWINKLE_KDE_PREFIX}/lib -lkabc" >> $QT_INCL_PRO -else - include_x11_FALSE="yes" - include_ARTS_FALSE="yes" - AC_PREFIX_DEFAULT(${prefix:-/usr/local}) -fi - -# Check for libbbind or libresolv. libbind is preferred as libresolv gives -# GLIBC_PRIVATE on Fedora. -AC_CHECK_LIB(bind, main, [ - LIBS="-lbind $LIBS" - echo "LIBS += -lbind" >> $QT_INCL_PRO], - [ - LIBS="-lresolv $LIBS" - echo "LIBS += -lresolv" >> $QT_INCL_PRO]) - -# Check if sndfile library is available -AC_CHECK_HEADER(sndfile.h, [], - [AC_MSG_ERROR([sndfile header files missing (libsndfile-devel package)])]) -AC_CHECK_LIB(sndfile, sf_open, [], - [AC_MSG_ERROR([libsndfile library is missing.])]) - -# Check if magic library is available -AC_CHECK_HEADER(magic.h, [], - [AC_MSG_ERROR([magic.h is missing (file-devel or libmagic-dev package)])]) -AC_CHECK_LIB(magic, magic_open, [], - [AC_MSG_ERROR([libmagic library is missing (file or libmagic package)])]) - -# This check does not work on all platforms -# Check if libgsm is available -# AC_CHECK_LIB(gsm, sf_open, [ -# AC_CHECK_HEADER(gsm.h, [], -# [AC_MSG_ERROR([gsm header files missing (gsm.h)])]) -# AC_DEFINE(HAVE_GSM, 1, [Define to 1 if you have the library.]) -# GSM_LIBS="-lgsm" -# echo "LIBS += -lgsm" >> $QT_INCL_PRO -# have_gsm="yes" ], [ -# have_gsm="no" -# GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a" -# echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO ]) -have_gsm="no" -GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a" -echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO - -AC_SUBST(GSM_LIBS) - -# Check if ALSA is available -AC_CHECK_LIB(asound, main, [ - AC_CHECK_HEADER(alsa/asoundlib.h, [], - [AC_MSG_ERROR([alsa header files missing (alsa-devel package)])]) - AC_DEFINE(HAVE_LIBASOUND, 1, [Define to 1 if you have the library.]) - LIBS="-lasound $LIBS" - echo "LIBS += -lasound" >> $QT_INCL_PRO - have_libasound="yes" - ], [have_libasound="no"]) - -# Check if SPEEX (libspeex & libspeexdsp) is available -if test "x$ac_cv_speex" = "xyes" -then - AC_CHECK_LIB(speex, main, [ - AC_CHECK_HEADER(speex/speex.h, [], - [AC_MSG_ERROR([speex header files missing])]) - AC_CHECK_LIB(speexdsp, main, [ - AC_CHECK_HEADERS([speex/speex_preprocess.h speex/speex_echo.h], [], - [AC_MSG_ERROR([speexdsp header files missing])]) - AC_DEFINE(HAVE_SPEEX, 1, [Define to 1 if you have the library.]) - LIBS="-lspeex -lspeexdsp $LIBS" - echo "LIBS += -lspeex" >> $QT_INCL_PRO - echo "LIBS += -lspeexdsp" >> $QT_INCL_PRO - have_speex="yes" - ], [have_speex="no"]) - ], [have_speex="no"]) -else - have_speex="no" -fi - -# iLBC -if test "x$ac_cv_ilbc" = "xyes" -then - AC_CHECK_LIB(ilbc, iLBC_decode, [ - AC_CHECK_HEADER(ilbc/iLBC_define.h, [], - [AC_MSG_ERROR([ilbc header files missing])]) - AC_DEFINE(HAVE_ILBC, 1, [Define to 1 if you have the library.]) - LIBS="-lilbc $LIBS" - echo "LIBS += -lilbc" >> $QT_INCL_PRO - have_ilbc="yes" - ], [have_ilbc="no"]) - - if test "x$ac_cv_ilbc_cpp" = "xyes" - then - AC_DEFINE(HAVE_ILBC_CPP, 1, [Define to 1 if you have a C++ ilbc library.]) - fi -else - have_ilbc="no" -fi - -# Check if zrtp is available -if test "x$ac_cv_zrtp" = "xyes" -then - PKG_CHECK_MODULES(ZRTP, libzrtpcpp >= 2.0.0) - AC_CHECK_LIB(zrtpcpp, main, [ - AC_CHECK_HEADER(libzrtpcpp/ZrtpQueue.h, [], - [AC_MSG_ERROR([zrtp header files missing])]) - AC_DEFINE(HAVE_ZRTP, 1, [Define to 1 if you have the library.]) - LIBS="-lzrtpcpp $LIBS" - echo "LIBS += -lzrtpcpp" >> $QT_INCL_PRO - have_zrtp="yes" - ], [have_zrtp="no"]) -else - have_zrtp="no" -fi - -# check if GNU readline or readline compatible libraries are avaliable -VL_LIB_READLINE() -if test "x$vl_cv_lib_readline" == "xno" -then - AC_MSG_ERROR([readline-devel package is not installed]) -fi - -# Check if boost regex is available -AC_CHECK_HEADER(boost/regex.h, [], - [AC_MSG_ERROR([boost/regex.h missing (boost-devel package)])]) -AC_CHECK_LIB(boost_regex, main, [ - LIBS="-lboost_regex $LIBS" - echo "LIBS += -lboost_regex" >> $QT_INCL_PRO], - [ - AC_CHECK_LIB(boost_regex-gcc, main, [ - LIBS="-lboost_regex-gcc $LIBS" - echo "LIBS += -lboost_regex-gcc" >> $QT_INCL_PRO], - [AC_MSG_ERROR([libboost_regex library is missing (boost package).])])]) - -dnl $QTDIR/bin/qmake -o src/gui/Makefile src/gui/twinkle.pro -dnl Command above is incorrect because srcdir may differ from builddir -dnl -dnl $QTDIR/bin/qmake -o src/gui/Makefile $srcdir/src/gui/twinkle.pro -dnl Command above although is correct in both cases, i.e. when srcdir -dnl is equal or differ from builddir will not generate proper Makefile. -dnl Reason is unknown. -dnl -dnl The sed command adds the KDE3 libraries in front of the LIB path. -dnl This is needed to correctly build on a KDE4 system. Otherwise -dnl gcc will link against KDE4 libraries. -AC_CONFIG_COMMANDS([src/gui/Makefile], - [ - $QTDIR/bin/qmake -o src/gui/Makefile $srcdir/src/gui/twinkle.pro - echo "distdir:" >> src/gui/Makefile - echo "check:" >> src/gui/Makefile - - if test -n "$kde_libraries" - then - sed -i -e "s|\(LIBS *= \)|\1-L${kde_libraries} |" src/gui/Makefile - fi - ], - [kde_libraries=${kde_libraries}] -) - -dnl Next is useless. See comments in src/parser/Makefile.am . -dnl # Strip the -O2 flag from CXXFLAGS for building the SIP parser. -dnl # g++ cannot compile the generated C code from bison with -O2 or -Os -dnl # Note: -Os is used on VIA C3 processor -dnl PARSER_CXXFLAGS=`echo $CXXFLAGS | sed -e "s/\-O2//;s/\-Os//"` -dnl AC_SUBST(PARSER_CXXFLAGS) - -AC_CONFIG_FILES([Makefile src/Makefile src/audio/Makefile src/audio/gsm/Makefile \ - src/audits/Makefile src/sdp/Makefile src/parser/Makefile \ - src/sockets/Makefile src/stun/Makefile src/threads/Makefile \ - src/gui/lang/Makefile src/mwi/Makefile src/im/Makefile \ - src/patterns/Makefile src/utils/Makefile src/presence/Makefile \ - twinkle.spec]) -AC_OUTPUT - -AC_MSG_RESULT([]) -AC_MSG_RESULT([Configured optional components:]) -AC_MSG_RESULT([KDE support: $have_kde]) -AC_MSG_RESULT([ALSA: $have_libasound]) -AC_MSG_RESULT([Speex: $have_speex]) -AC_MSG_RESULT([iLBC: $have_ilbc]) -AC_MSG_RESULT([ZRTP: $have_zrtp]) diff --git a/m4/vl_lib_readline.m4 b/m4/vl_lib_readline.m4 deleted file mode 100644 index 34d7bcc..0000000 --- a/m4/vl_lib_readline.m4 +++ /dev/null @@ -1,107 +0,0 @@ -# =========================================================================== -# http://autoconf-archive.cryp.to/vl_lib_readline.html -# =========================================================================== -# -# SYNOPSIS -# -# VL_LIB_READLINE -# -# DESCRIPTION -# -# Searches for a readline compatible library. If found, defines -# `HAVE_LIBREADLINE'. If the found library has the `add_history' function, -# sets also `HAVE_READLINE_HISTORY'. Also checks for the locations of the -# necessary include files and sets `HAVE_READLINE_H' or -# `HAVE_READLINE_READLINE_H' and `HAVE_READLINE_HISTORY_H' or -# 'HAVE_HISTORY_H' if the corresponding include files exists. -# -# The libraries that may be readline compatible are `libedit', -# `libeditline' and `libreadline'. Sometimes we need to link a termcap -# library for readline to work, this macro tests these cases too by trying -# to link with `libtermcap', `libcurses' or `libncurses' before giving up. -# -# Here is an example of how to use the information provided by this macro -# to perform the necessary includes or declarations in a C file: -# -# #ifdef HAVE_LIBREADLINE -# # if defined(HAVE_READLINE_READLINE_H) -# # include -# # elif defined(HAVE_READLINE_H) -# # include -# # else /* !defined(HAVE_READLINE_H) */ -# extern char *readline (); -# # endif /* !defined(HAVE_READLINE_H) */ -# char *cmdline = NULL; -# #else /* !defined(HAVE_READLINE_READLINE_H) */ -# /* no readline */ -# #endif /* HAVE_LIBREADLINE */ -# -# #ifdef HAVE_READLINE_HISTORY -# # if defined(HAVE_READLINE_HISTORY_H) -# # include -# # elif defined(HAVE_HISTORY_H) -# # include -# # else /* !defined(HAVE_HISTORY_H) */ -# extern void add_history (); -# extern int write_history (); -# extern int read_history (); -# # endif /* defined(HAVE_READLINE_HISTORY_H) */ -# /* no history */ -# #endif /* HAVE_READLINE_HISTORY */ -# -# LAST MODIFICATION -# -# 2008-04-12 -# -# COPYLEFT -# -# Copyright (c) 2008 Ville Laurikari -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. - -AC_DEFUN([VL_LIB_READLINE], [ - AC_CACHE_CHECK([for a readline compatible library], - vl_cv_lib_readline, [ - ORIG_LIBS="$LIBS" - for readline_lib in readline edit editline; do - for termcap_lib in "" termcap curses ncurses; do - if test -z "$termcap_lib"; then - TRY_LIB="-l$readline_lib" - else - TRY_LIB="-l$readline_lib -l$termcap_lib" - fi - LIBS="$ORIG_LIBS $TRY_LIB" - AC_TRY_LINK_FUNC(readline, vl_cv_lib_readline="$TRY_LIB") - if test -n "$vl_cv_lib_readline"; then - break - fi - done - if test -n "$vl_cv_lib_readline"; then - break - fi - done - if test -z "$vl_cv_lib_readline"; then - vl_cv_lib_readline="no" - LIBS="$ORIG_LIBS" - fi - ]) - - if test "$vl_cv_lib_readline" != "no"; then - AC_DEFINE(HAVE_LIBREADLINE, 1, - [Define if you have a readline compatible library]) - AC_CHECK_HEADERS(readline.h readline/readline.h) - AC_CACHE_CHECK([whether readline supports history], - vl_cv_lib_readline_history, [ - vl_cv_lib_readline_history="no" - AC_TRY_LINK_FUNC(add_history, vl_cv_lib_readline_history="yes") - ]) - if test "$vl_cv_lib_readline_history" = "yes"; then - AC_DEFINE(HAVE_READLINE_HISTORY, 1, - [Define if your readline library has \`add_history']) - AC_CHECK_HEADERS(history.h readline/history.h) - fi - fi -])dnl - diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 52a21db..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,104 +0,0 @@ -AM_LDFLAGS = -L $(libdir) - -AM_CPPFLAGS = -Wall $(CCRTP_CFLAGS) $(XML2_CFLAGS) -DDATADIR=\"$(pkgdatadir)\" - -noinst_PROGRAMS = twinkle - -noinst_LIBRARIES = libtwinkle.a - -twinkle_SOURCES = main.cpp - -twinkle_LDADD = libtwinkle.a\ - $(top_builddir)/src/parser/libsipparser.a\ - $(top_builddir)/src/sdp/libsdpparser.a\ - $(top_builddir)/src/sockets/libsocket.a\ - $(top_builddir)/src/threads/libthread.a\ - $(top_builddir)/src/audio/libaudio.a\ - $(top_builddir)/src/audits/libaudits.a\ - $(top_builddir)/src/stun/libstun.a\ - $(top_builddir)/src/mwi/libmwi.a\ - $(top_builddir)/src/im/libim.a\ - $(top_builddir)/src/presence/libpresence.a\ - $(top_builddir)/src/patterns/libpatterns.a\ - $(top_builddir)/src/utils/libutils.a\ - $(GSM_LIBS)\ - $(CCRTP_LIBS)\ - $(XML2_LIBS)\ - -lncurses \ - -lreadline \ - -lsndfile\ - -lmagic - -libtwinkle_a_SOURCES =\ - abstract_dialog.cpp\ - address_book.cpp\ - auth.cpp\ - call_history.cpp\ - call_script.cpp\ - client_request.cpp\ - cmd_socket.cpp\ - dialog.cpp\ - diamondcard.cpp\ - epa.cpp\ - events.cpp\ - id_object.cpp\ - line.cpp\ - listener.cpp\ - log.cpp\ - phone.cpp\ - phone_user.cpp\ - prohibit_thread.cpp\ - redirect.cpp\ - sender.cpp\ - service.cpp\ - session.cpp\ - sub_refer.cpp\ - subscription.cpp\ - subscription_dialog.cpp\ - sys_settings.cpp\ - timekeeper.cpp\ - transaction.cpp\ - transaction_layer.cpp\ - transaction_mgr.cpp\ - user.cpp\ - userintf.cpp\ - util.cpp\ - abstract_dialog.h\ - address_book.h\ - auth.h\ - call_history.h\ - call_script.h\ - client_request.h\ - cmd_socket.h\ - dialog.h\ - diamondcard.h\ - epa.h\ - events.h\ - exceptions.h\ - id_object.h\ - line.h\ - listener.h\ - log.h\ - phone.h\ - phone_user.h\ - prohibit_thread.h\ - protocol.h\ - redirect.h\ - sender.h\ - sequence_number.h\ - service.h\ - session.h\ - sub_refer.h\ - subscription.h\ - subscription_dialog.h\ - sys_settings.h\ - timekeeper.h\ - transaction.h\ - transaction_layer.h\ - transaction_mgr.h\ - translator.h\ - user.h\ - userintf.h\ - util.h - -SUBDIRS = audio audits im mwi parser patterns presence sdp sockets stun threads utils . gui gui/lang diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am deleted file mode 100644 index ab897eb..0000000 --- a/src/audio/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -AM_CPPFLAGS = \ - -Wall \ - -I$(top_srcdir)/src \ - $(CCRTP_CFLAGS) \ - $(XML2_CFLAGS) - -noinst_LIBRARIES = libaudio.a - -libaudio_a_SOURCES =\ - audio_device.cpp\ - audio_decoder.cpp\ - audio_encoder.cpp\ - audio_codecs.cpp\ - audio_rx.cpp\ - audio_session.cpp\ - audio_tx.cpp\ - dtmf_player.cpp\ - freq_gen.cpp\ - g711.cpp\ - g721.cpp\ - g723_16.cpp\ - g723_24.cpp\ - g723_40.cpp\ - g72x.cpp\ - media_buffer.cpp\ - rtp_telephone_event.cpp\ - tone_gen.cpp\ - twinkle_rtp_session.cpp\ - twinkle_zrtp_ui.cpp\ - audio_device.h\ - audio_decoder.h\ - audio_encoder.h\ - audio_codecs.h\ - audio_rx.h\ - audio_session.h\ - audio_tx.h\ - dtmf_player.h\ - freq_gen.h\ - g711.h\ - g72x.h\ - media_buffer.h\ - rtp_telephone_event.h\ - tone_gen.h\ - twinkle_rtp_session.h\ - twinkle_zrtp_ui.h - -SUBDIRS = gsm - -EXTRA_DIST = README_G711 diff --git a/src/audio/gsm/Makefile.am b/src/audio/gsm/Makefile.am deleted file mode 100644 index 3d437a1..0000000 --- a/src/audio/gsm/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -AM_CPPFLAGS = \ - -I$(srcdir)/inc \ - -DSASR -DNeedFunctionPrototypes=1 - -noinst_LIBRARIES = libgsm.a - -libgsm_a_SOURCES =\ - src/add.cpp\ - src/code.cpp\ - src/debug.cpp\ - src/decode.cpp\ - src/long_term.cpp\ - src/lpc.cpp\ - src/preprocess.cpp\ - src/rpe.cpp\ - src/gsm_destroy.cpp\ - src/gsm_decode.cpp\ - src/gsm_encode.cpp\ - src/gsm_explode.cpp\ - src/gsm_implode.cpp\ - src/gsm_create.cpp\ - src/gsm_print.cpp\ - src/gsm_option.cpp\ - src/short_term.cpp\ - src/table.cpp\ - inc/gsm.h\ - inc/proto.h\ - inc/config.h\ - inc/private.h\ - inc/unproto.h - -EXTRA_DIST = COPYRIGHT MACHINES diff --git a/src/audits/Makefile.am b/src/audits/Makefile.am deleted file mode 100644 index 0c72765..0000000 --- a/src/audits/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -AM_CPPFLAGS = \ - -Wall \ - -I$(top_srcdir)/src - -noinst_LIBRARIES = libaudits.a - -libaudits_a_SOURCES =\ - memman.cpp\ - memman.h diff --git a/src/gui/lang/Makefile.am b/src/gui/lang/Makefile.am deleted file mode 100644 index 6b9c49b..0000000 --- a/src/gui/lang/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -pkglangdir = $(pkgdatadir)/lang - -pkglang_DATA = \ - twinkle_nl.qm \ - twinkle_de.qm \ - twinkle_cs.qm \ - twinkle_fr.qm \ - twinkle_ru.qm \ - twinkle_sv.qm - -CLEANFILES = $(pkglang_DATA) - -EXTRA_DIST = \ - twinkle_nl.ts \ - twinkle_de.ts \ - twinkle_cs.ts \ - twinkle_fr.ts \ - twinkle_ru.ts \ - twinkle_sv.ts \ - twinkle_xx.ts - -twinkle_nl.qm: $(top_builddir)/src/gui/twinkle $(top_srcdir)/src/gui/twinkle.pro - lrelease -compress $(srcdir)/twinkle_nl.ts -qm $@ - -twinkle_de.qm: $(top_builddir)/src/gui/twinkle $(top_srcdir)/src/gui/twinkle.pro - lrelease -compress $(srcdir)/twinkle_de.ts -qm $@ - -twinkle_cs.qm: $(top_builddir)/src/gui/twinkle $(top_srcdir)/src/gui/twinkle.pro - lrelease -compress $(srcdir)/twinkle_cs.ts -qm $@ - -twinkle_fr.qm: $(top_builddir)/src/gui/twinkle $(top_srcdir)/src/gui/twinkle.pro - lrelease -compress $(srcdir)/twinkle_fr.ts -qm $@ - -twinkle_ru.qm: $(top_builddir)/src/gui/twinkle $(top_srcdir)/src/gui/twinkle.pro - lrelease -compress $(srcdir)/twinkle_ru.ts -qm $@ - -twinkle_sv.qm: $(top_builddir)/src/gui/twinkle $(top_srcdir)/src/gui/twinkle.pro - lrelease -compress $(srcdir)/twinkle_sv.ts -qm $@ diff --git a/src/gui/twinkle.pro b/src/gui/twinkle.pro deleted file mode 100644 index 0fee90b..0000000 --- a/src/gui/twinkle.pro +++ /dev/null @@ -1,418 +0,0 @@ -TEMPLATE = app -LANGUAGE = C++ - -CONFIG += qt warn_on debug thread - -LIBS += ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audits/libaudits.a ../stun/libstun.a ../mwi/libmwi.a ../im/libim.a ../patterns/libpatterns.a ../presence/libpresence.a ../utils/libutils.a -lsndfile -lmagic -lncurses -lreadline -lX11 - -DEFINES += QT_NO_STL - -INCLUDEPATH += .. - -HEADERS += gui.h \ - dtmfform.h \ - deregisterform.h \ - logviewform.h \ - numberconversionform.h \ - getprofilenameform.h \ - historylistview.h \ - freedesksystray.h \ - twinklesystray.h \ - address_finder.h \ - qt_translator.h \ - core_strings.h \ - addresslistviewitem.h \ - yesnodialog.h \ - command_args.h \ - messageformview.h \ - buddylistview.h \ - textbrowsernoautolink.h \ - twinkleapplication.h - -SOURCES += main.cpp \ - gui.cpp \ - dtmfform.cpp \ - deregisterform.cpp \ - logviewform.cpp \ - numberconversionform.cpp \ - getprofilenameform.cpp \ - historylistview.cpp \ - freedesksystray.cpp \ - twinklesystray.cpp \ - address_finder.cpp \ - addresslistviewitem.cpp \ - yesnodialog.cpp \ - messageformview.cpp \ - buddylistview.cpp \ - twinkleapplication.cpp - -FORMS = dtmfform.ui \ - deregisterform.ui \ - logviewform.ui \ - numberconversionform.ui \ - getprofilenameform.ui - -#The following line was changed from FORMS to FORMS3 by qt3to4 -FORMS3 = mphoneform.ui \ - inviteform.ui \ - redirectform.ui \ - termcapform.ui \ - selectnicform.ui \ - srvredirectform.ui \ - authenticationform.ui \ - userprofileform.ui \ - selectprofileform.ui \ - transferform.ui \ - syssettingsform.ui \ - wizardform.ui \ - getaddressform.ui \ - historyform.ui \ - selectuserform.ui \ - addresscardform.ui \ - messageform.ui \ - buddyform.ui \ - sendfileform.ui \ - diamondcardprofileform.ui - -RESOURCES += icons.qrc - -IMAGES = images/filenew \ - images/filesave \ - images/print \ - images/undo \ - images/redo \ - images/editcut \ - images/editcopy \ - images/editpaste \ - images/searchfind \ - images/invite.png \ - images/answer.png \ - images/bye.png \ - images/reject.png \ - images/redirect.png \ - images/hold.png \ - images/dtmf.png \ - images/bye-disabled.png \ - images/redial.png \ - images/redial-disabled.png \ - images/invite-disabled.png \ - images/answer-disabled.png \ - images/reject-disabled.png \ - images/redirect-disabled.png \ - images/hold-disabled.png \ - images/dtmf-disabled.png \ - images/penguin.png \ - images/package_network.png \ - images/kmix.png \ - images/package_system.png \ - images/yast_babelfish.png \ - images/clock.png \ - images/yast_PhoneTTOffhook.png \ - images/penguin_big.png \ - images/password.png \ - images/kcmpci.png \ - images/penguin-small.png \ - images/conf.png \ - images/conf-disabled.png \ - images/mute.png \ - images/mute-disabled.png \ - images/twinkle16.png \ - images/twinkle48.png \ - images/twinkle32.png \ - images/transfer-disabled.png \ - images/transfer.png \ - images/log.png \ - images/dtmf-2.png \ - images/dtmf-3.png \ - images/dtmf-5.png \ - images/dtmf-6.png \ - images/dtmf-7.png \ - images/dtmf-8.png \ - images/dtmf-9.png \ - images/dtmf-4.png \ - images/dtmf-1.png \ - images/dtmf-0.png \ - images/dtmf-star.png \ - images/dtmf-pound.png \ - images/dtmf-a.png \ - images/dtmf-b.png \ - images/dtmf-c.png \ - images/dtmf-d.png \ - images/twinkle24.png \ - images/exit.png \ - images/kontact_contacts.png \ - images/ok.png \ - images/cancel.png \ - images/1rightarrow.png \ - images/1leftarrow-yellow.png \ - images/editdelete.png \ - images/kcmpci16.png \ - images/kontact_contacts-disabled.png \ - images/sys_auto_ans.png \ - images/sys_auto_ans_dis.png \ - images/sys_busy_estab.png \ - images/sys_busy_estab_dis.png \ - images/sys_busy_trans.png \ - images/sys_busy_trans_dis.png \ - images/sys_dnd.png \ - images/sys_dnd_dis.png \ - images/sys_idle.png \ - images/sys_idle_dis.png \ - images/sys_redir.png \ - images/sys_redir_dis.png \ - images/sys_services.png \ - images/sys_services_dis.png \ - images/sys_hold.png \ - images/sys_hold_dis.png \ - images/sys_mute.png \ - images/sys_mute_dis.png \ - images/network.png \ - images/knotify.png \ - images/fileopen.png \ - images/fileopen-disabled.png \ - images/cf.png \ - images/auto_answer.png \ - images/auto_answer-disabled.png \ - images/cancel-disabled.png \ - images/cf-disabled.png \ - images/missed-disabled.png \ - images/missed.png \ - images/sys_missed.png \ - images/sys_missed_dis.png \ - images/twinkle16-disabled.png \ - images/gear.png \ - images/reg_failed-disabled.png \ - images/reg_failed.png \ - images/no-indication.png \ - images/contexthelp.png \ - images/settings.png \ - images/reg-query.png \ - images/log_small.png \ - images/qt-logo.png \ - images/1leftarrow.png \ - images/1uparrow.png \ - images/1downarrow.png \ - images/kontact_contacts32.png \ - images/encrypted.png \ - images/sys_encrypted.png \ - images/sys_encrypted_dis.png \ - images/encrypted32.png \ - images/encrypted-disabled.png \ - images/stat_conference.png \ - images/stat_established.png \ - images/stat_outgoing.png \ - images/stat_ringing.png \ - images/stat_mute.png \ - images/stat_established_nomedia.png \ - images/encrypted_verified.png \ - images/sys_encrypted_verified.png \ - images/sys_encrypted_verified_dis.png \ - images/consult-xfer.png \ - images/mwi_new16.png \ - images/mwi_none16.png \ - images/mwi_none16_dis.png \ - images/sys_mwi.png \ - images/sys_mwi_dis.png \ - images/mwi_none.png \ - images/mwi_failure16.png \ - images/presence_offline.png \ - images/presence_online.png \ - images/presence_failed.png \ - images/presence_rejected.png \ - images/presence_unknown.png \ - images/edit16.png \ - images/message.png \ - images/edit.png \ - images/buddy.png \ - images/message32.png \ - images/presence.png \ - images/save_as.png \ - images/attach.png \ - images/mime_application.png \ - images/mime_audio.png \ - images/mime_image.png \ - images/mime_text.png \ - images/mime_video.png - -TRANSLATIONS = lang/twinkle_nl.ts \ - lang/twinkle_de.ts \ - lang/twinkle_cs.ts \ - lang/twinkle_fr.ts \ - lang/twinkle_ru.ts \ - lang/twinkle_sv.ts \ - lang/twinkle_xx.ts - -unix { - UI_DIR = .ui - MOC_DIR = .moc - OBJECTS_DIR = .obj -} - -include( ../../qtccxxincl.pro ) -#The following line was inserted by qt3to4 -QT += qt3support -#The following line was inserted by qt3to4 -CONFIG += uic3 - -OTHER_FILES += \ - images/yast_PhoneTTOffhook.png \ - images/yast_babelfish.png \ - images/undo \ - images/twinkle48.png \ - images/twinkle32.png \ - images/twinkle24.png \ - images/twinkle16.png \ - images/twinkle16-disabled.png \ - images/transfer.png \ - images/transfer-disabled.png \ - images/telephone-hook.png \ - images/sys_services_dis.png \ - images/sys_services.png \ - images/sys_redir_dis.png \ - images/sys_redir.png \ - images/sys_mwi_dis.png \ - images/sys_mwi.png \ - images/sys_mute_dis.png \ - images/sys_mute.png \ - images/sys_missed_dis.png \ - images/sys_missed.png \ - images/sys_idle_dis.png \ - images/sys_idle.png \ - images/sys_hold_dis.png \ - images/sys_hold.png \ - images/sys_encrypted_verified_dis.png \ - images/sys_encrypted_verified.png \ - images/sys_encrypted_dis.png \ - images/sys_encrypted.png \ - images/sys_dnd_dis.png \ - images/sys_dnd.png \ - images/sys_busy_trans_dis.png \ - images/sys_busy_trans.png \ - images/sys_busy_estab_dis.png \ - images/sys_busy_estab.png \ - images/sys_auto_ans_dis.png \ - images/sys_auto_ans.png \ - images/stat_ringing.png \ - images/stat_outgoing.png \ - images/stat_mute.png \ - images/stat_established_nomedia.png \ - images/stat_established.png \ - images/stat_conference.png \ - images/settings.png \ - images/searchfind \ - images/save_as.png \ - images/reject.png \ - images/reject-disabled.png \ - images/reg_failed.png \ - images/reg_failed-disabled.png \ - images/reg-query.png \ - images/redo \ - images/redirect.png \ - images/redirect-disabled.png \ - images/redial.png \ - images/redial-disabled.png \ - images/qt-logo.png \ - images/print \ - images/presence_unknown.png \ - images/presence_rejected.png \ - images/presence_online.png \ - images/presence_offline.png \ - images/presence_failed.png \ - images/presence.png \ - images/penguin_big.png \ - images/penguin.png \ - images/penguin-small.png \ - images/password.png \ - images/package_system.png \ - images/package_network.png \ - images/ok.png \ - images/no-indication.png \ - images/network.png \ - images/mwi_none16_dis.png \ - images/mwi_none16.png \ - images/mwi_none.png \ - images/mwi_new16.png \ - images/mwi_failure16.png \ - images/mute.png \ - images/mute-disabled.png \ - images/missed.png \ - images/missed-disabled.png \ - images/mime_video.png \ - images/mime_text.png \ - images/mime_image.png \ - images/mime_audio.png \ - images/mime_application.png \ - images/message32.png \ - images/message.png \ - images/log_small.png \ - images/log.png \ - images/kontact_contacts32.png \ - images/kontact_contacts.png \ - images/kontact_contacts-disabled.png \ - images/knotify.png \ - images/kmix.png \ - images/kcmpci16.png \ - images/kcmpci.png \ - images/invite.png \ - images/invite-disabled.png \ - images/hold.png \ - images/hold-disabled.png \ - images/gear.png \ - images/filesave \ - images/fileopen.png \ - images/fileopen-disabled.png \ - images/filenew \ - images/favorites.png \ - images/exit.png \ - images/encrypted_verified.png \ - images/encrypted32.png \ - images/encrypted.png \ - images/encrypted-disabled.png \ - images/editpaste \ - images/editdelete.png \ - images/editcut \ - images/editcopy \ - images/edit16.png \ - images/edit.png \ - images/dtmf.png \ - images/dtmf-star.png \ - images/dtmf-pound.png \ - images/dtmf-disabled.png \ - images/dtmf-d.png \ - images/dtmf-c.png \ - images/dtmf-b.png \ - images/dtmf-a.png \ - images/dtmf-9.png \ - images/dtmf-8.png \ - images/dtmf-7.png \ - images/dtmf-6.png \ - images/dtmf-5.png \ - images/dtmf-4.png \ - images/dtmf-3.png \ - images/dtmf-2.png \ - images/dtmf-1.png \ - images/dtmf-0.png \ - images/contexthelp.png \ - images/consult-xfer.png \ - images/conference.png \ - images/conference-disabled.png \ - images/conf.png \ - images/conf-disabled.png \ - images/clock.png \ - images/cf.png \ - images/cf-disabled.png \ - images/cancel.png \ - images/cancel-disabled.png \ - images/bye.png \ - images/bye-disabled.png \ - images/buddy.png \ - images/auto_answer.png \ - images/auto_answer-disabled.png \ - images/attach.png \ - images/answer.png \ - images/answer-disabled.png \ - images/1uparrow.png \ - images/1rightarrow.png \ - images/1leftarrow.png \ - images/1leftarrow-yellow.png \ - images/1downarrow.png diff --git a/src/im/Makefile.am b/src/im/Makefile.am deleted file mode 100644 index 300a43a..0000000 --- a/src/im/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -AM_CPPFLAGS = -Wall $(CCRTP_CFLAGS) $(XML2_CFLAGS) -I$(top_srcdir)/src - -noinst_LIBRARIES = libim.a - -libim_a_SOURCES =\ - im_iscomposing_body.cpp\ - msg_session.cpp\ - im_iscomposing_body.h\ - msg_session.h diff --git a/src/mwi/Makefile.am b/src/mwi/Makefile.am deleted file mode 100644 index 29415e6..0000000 --- a/src/mwi/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -AM_CPPFLAGS = \ - -Wall \ - -I$(top_srcdir)/src \ - $(CCRTP_CFLAGS) \ - $(XML2_CFLAGS) - -#noinst_PROGRAMS = mwitest - -#mwitest_SOURCES = mwitest.cpp - -#mwitest_LDADD = $(top_builddir)/src/util.o\ -# $(top_builddir)/src/mwi/libmwi.a\ -# $(top_builddir)/src/sockets/libsocket.a\ -# $(top_builddir)/src/parser/libsipparser.a\ -# $(top_builddir)/src/sdp/libsdpparser.a\ -# -lresolv\ -# -lboost_regex - -noinst_LIBRARIES = libmwi.a - -libmwi_a_SOURCES =\ - mwi.cpp\ - mwi_dialog.cpp\ - mwi_subscription.cpp\ - simple_msg_sum_body.cpp\ - mwi.h\ - mwi_dialog.h\ - mwi_subscription.h\ - simple_msg_sum_body.h diff --git a/src/parser/Makefile.am b/src/parser/Makefile.am deleted file mode 100644 index 67bf122..0000000 --- a/src/parser/Makefile.am +++ /dev/null @@ -1,195 +0,0 @@ -AM_CPPFLAGS = -Wall $(XML2_CFLAGS) -I$(top_srcdir)/src - -# bison flags -AM_YFLAGS = -d - -# flex flags -# The -s flag is not used on purpose. As it is better to have -# some unmatched symbols echoed to stdout then a jammed flex -# causing the process to die. -AM_LFLAGS = -i - -# The output of bison cannot be compiled with the -O2 flag. -# With the -O2 flag g++ crashes. The -O2 flag is stripped from -# CXXFLAGS by configure. -# rumen: -# Above don't work. -# It is enought to drop -funit-at-a-time set when -O2 flag is set. -# The error is: -# "cc1plus: out of memory allocating 336746144 bytes after a total of 10846208 bytes." -# Note user can specify -O2 in CXXFLAGS at configure time ! -# Also note that unit-at-a-time if new for gcc 3.4 ! -# See http://lists.debian.org/debian-gcc/2006/07/msg00281.html -# that claim to be fixed in gcc-4.1+ . - -AM_CXXFLAGS = -fno-unit-at-a-time - - -# This target is only for testing the parser in isolation -#noinst_PROGRAMS = sipparse -# -#sipparse_SOURCES = main.cpp -# -#sipparse_LDADD = $(top_builddir)/src/util.o\ -# $(top_builddir)/src/parser/libsipparser.a\ -# $(top_builddir)/src/sdp/libsdpparser.a\ -# $(top_builddir)/src/sockets/libsocket.a\ -# -lresolv - -noinst_LIBRARIES = libsipparser.a - -libsipparser_a_SOURCES =\ - challenge.cpp\ - coding.cpp\ - credentials.cpp\ - definitions.cpp\ - hdr_accept.cpp\ - hdr_accept_encoding.cpp\ - hdr_accept_language.cpp\ - hdr_alert_info.cpp\ - hdr_allow.cpp\ - hdr_allow_events.cpp\ - hdr_auth_info.cpp\ - hdr_authorization.cpp\ - hdr_call_id.cpp\ - hdr_call_info.cpp\ - hdr_contact.cpp\ - hdr_content_disp.cpp\ - hdr_content_encoding.cpp\ - hdr_content_language.cpp\ - hdr_content_length.cpp\ - hdr_content_type.cpp\ - hdr_cseq.cpp\ - hdr_date.cpp\ - hdr_error_info.cpp\ - hdr_event.cpp\ - hdr_expires.cpp\ - hdr_from.cpp\ - hdr_in_reply_to.cpp\ - hdr_max_forwards.cpp\ - hdr_min_expires.cpp\ - hdr_mime_version.cpp\ - hdr_organization.cpp\ - hdr_priority.cpp\ - hdr_privacy.cpp\ - hdr_p_asserted_identity.cpp\ - hdr_p_preferred_identity.cpp\ - hdr_proxy_authenticate.cpp\ - hdr_proxy_authorization.cpp\ - hdr_proxy_require.cpp\ - hdr_rack.cpp\ - hdr_record_route.cpp\ - hdr_refer_sub.cpp\ - hdr_refer_to.cpp\ - hdr_referred_by.cpp\ - hdr_replaces.cpp\ - hdr_reply_to.cpp\ - hdr_require.cpp\ - hdr_request_disposition.cpp\ - hdr_retry_after.cpp\ - hdr_route.cpp\ - hdr_rseq.cpp\ - hdr_server.cpp\ - hdr_service_route.cpp\ - hdr_sip_etag.cpp\ - hdr_sip_if_match.cpp\ - hdr_subject.cpp\ - hdr_subscription_state.cpp\ - hdr_supported.cpp\ - hdr_timestamp.cpp\ - hdr_to.cpp\ - hdr_unsupported.cpp\ - hdr_user_agent.cpp\ - hdr_via.cpp\ - hdr_warning.cpp\ - hdr_www_authenticate.cpp\ - header.cpp\ - identity.cpp\ - media_type.cpp\ - milenage.cpp\ - parameter.cpp\ - parse_ctrl.cpp\ - parser.yxx\ - request.cpp\ - response.cpp\ - rijndael.cpp\ - route.cpp\ - scanner.lxx\ - sip_body.cpp\ - sip_message.cpp\ - challenge.h\ - coding.h\ - credentials.h\ - definitions.h\ - hdr_accept.h\ - hdr_accept_encoding.h\ - hdr_accept_language.h\ - hdr_alert_info.h\ - hdr_allow.h\ - hdr_allow_events.h\ - hdr_auth_info.h\ - hdr_authorization.h\ - hdr_call_id.h\ - hdr_call_info.h\ - hdr_contact.h\ - hdr_content_disp.h\ - hdr_content_encoding.h\ - hdr_content_language.h\ - hdr_content_length.h\ - hdr_content_type.h\ - hdr_cseq.h\ - hdr_date.h\ - hdr_error_info.h\ - hdr_event.h\ - hdr_expires.h\ - hdr_from.h\ - hdr_in_reply_to.h\ - hdr_max_forwards.h\ - hdr_min_expires.h\ - hdr_mime_version.h\ - hdr_organization.h\ - hdr_p_asserted_identity.h\ - hdr_p_preferred_identity.h\ - hdr_priority.h\ - hdr_privacy.h\ - hdr_proxy_authenticate.h\ - hdr_proxy_authorization.h\ - hdr_proxy_require.h\ - hdr_rack.h\ - hdr_record_route.h\ - hdr_refer_sub.h\ - hdr_refer_to.h\ - hdr_referred_by.h\ - hdr_replaces.h\ - hdr_reply_to.h\ - hdr_require.h\ - hdr_request_disposition.h\ - hdr_retry_after.h\ - hdr_route.h\ - hdr_rseq.h\ - hdr_server.h\ - hdr_service_route.h\ - hdr_sip_etag.h\ - hdr_sip_if_match.h\ - hdr_subject.h\ - hdr_subscription_state.h\ - hdr_supported.h\ - hdr_timestamp.h\ - hdr_to.h\ - hdr_unsupported.h\ - hdr_user_agent.h\ - hdr_via.h\ - hdr_warning.h\ - hdr_www_authenticate.h\ - header.h\ - identity.h\ - media_type.h\ - milenage.h\ - parameter.h\ - parse_ctrl.h\ - request.h\ - response.h\ - rijndael.h\ - route.h\ - sip_body.h\ - sip_message.h diff --git a/src/patterns/Makefile.am b/src/patterns/Makefile.am deleted file mode 100644 index 4dc022e..0000000 --- a/src/patterns/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -AM_CPPFLAGS = -Wall -I$(top_srcdir)/src - -noinst_LIBRARIES = libpatterns.a - -libpatterns_a_SOURCES =\ - observer.cpp\ - observer.h diff --git a/src/presence/Makefile.am b/src/presence/Makefile.am deleted file mode 100644 index 17caf93..0000000 --- a/src/presence/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -AM_CPPFLAGS = -Wall $(CCRTP_CFLAGS) $(XML2_CFLAGS) -I$(top_srcdir)/src - -noinst_LIBRARIES = libpresence.a - -libpresence_a_SOURCES =\ - buddy.cpp\ - pidf_body.cpp\ - presence_dialog.cpp\ - presence_epa.cpp\ - presence_state.cpp\ - presence_subscription.cpp\ - buddy.h\ - pidf_body.h\ - presence_dialog.h\ - presence_epa.h\ - presence_state.h\ - presence_subscription.h diff --git a/src/sdp/Makefile.am b/src/sdp/Makefile.am deleted file mode 100644 index ea3340c..0000000 --- a/src/sdp/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -AM_CPPFLAGS = \ - -Wall \ - -I$(top_srcdir)/src\ - $(XML2_CFLAGS) - -AM_YFLAGS = -p yysdp -d -AM_LFLAGS = -Pyysdp -olex.yy.c -i - -# This target is only for testing the parser in isolation -# noinst_PROGRAMS = sdpparse - -# sdpparse_SOURCES = main.cpp - -# sdpparse_LDADD = $(top_builddir)/src/util.o\ -# $(top_builddir)/src/sdp/libsdpparser.a\ -# $(top_builddir)/src/parser/sip_body.o - -noinst_LIBRARIES = libsdpparser.a - - -libsdpparser_a_SOURCES =\ - sdp.cpp\ - sdp_parse_ctrl.cpp\ - sdp_parser.yxx\ - sdp_scanner.lxx\ - sdp.h\ - sdp_parse_ctrl.h diff --git a/src/sockets/Makefile.am b/src/sockets/Makefile.am deleted file mode 100644 index fdcfce4..0000000 --- a/src/sockets/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -AM_CPPFLAGS = \ - -Wall \ - -I$(top_srcdir)/src\ - $(XML2_CFLAGS) - -noinst_LIBRARIES = libsocket.a - -#noinst_PROGRAMS = srvinfo urlinfo -#srvinfo_SOURCES = srvinfo.cpp -#srvinfo_LDADD = $(top_builddir)/src/util.o\ -# $(top_builddir)/src/sockets/libsocket.a\ -# -lresolv -#urlinfo_SOURCES = urlinfo.cpp -#urlinfo_LDADD = $(top_builddir)/src/util.o\ -# $(top_builddir)/src/sockets/libsocket.a\ -# -lresolv - -libsocket_a_SOURCES =\ - connection.cpp\ - connection_table.cpp\ - dnssrv.cpp\ - interfaces.cpp\ - socket.cpp\ - url.cpp\ - connection.h\ - connection_table.h\ - dnssrv.h\ - interfaces.h\ - socket.h\ - url.h diff --git a/src/stun/Makefile.am b/src/stun/Makefile.am deleted file mode 100644 index f52face..0000000 --- a/src/stun/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -AM_CPPFLAGS = \ - -Wall \ - -I$(top_srcdir)/src \ - $(CCRTP_CFLAGS)\ - $(XML2_CFLAGS) - -noinst_LIBRARIES = libstun.a - -libstun_a_SOURCES =\ - stun.cxx\ - stun_transaction.cpp\ - udp.cxx\ - stun.h\ - stun_transaction.h\ - udp.h diff --git a/src/threads/Makefile.am b/src/threads/Makefile.am deleted file mode 100644 index 221bddf..0000000 --- a/src/threads/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -AM_CPPFLAGS = -Wall -I$(top_srcdir)/src - -noinst_LIBRARIES = libthread.a - -libthread_a_SOURCES =\ - thread.cpp\ - mutex.cpp\ - sema.cpp\ - thread.h\ - mutex.h\ - sema.h diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am deleted file mode 100644 index e4d8fb5..0000000 --- a/src/utils/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -AM_CPPFLAGS = -Wall $(XML2_CFLAGS) -I$(top_srcdir)/src - -noinst_LIBRARIES = libutils.a - -libutils_a_SOURCES =\ - file_utils.cpp\ - mime_database.cpp\ - file_utils.h\ - mime_database.h\ - record_file.h\ - record_file.hpp diff --git a/twinkle_config.h.in b/twinkle_config.h.in index f578b9c..409fe74 100644 --- a/twinkle_config.h.in +++ b/twinkle_config.h.in @@ -10,4 +10,4 @@ #define VERSION "${PRODUCT_VERSION}" #define VERSION_DATE "${PRODUCT_DATE}" -#define DATADIR "${CMAKE_INSTALL_PREFIX}/share/twinkle" +#define DATADIR "${datadir}" -- cgit v1.2.3