Commit 33a9fdab authored by jpbl's avatar jpbl

merging sflphoned and sflphone

parent 528f4380
SUBDIRS = include libs src ringtones m4
EXTRA_DIST = tools/*.sh tools/install-sip* debian/* README.cvs CHANGES
SUBDIRS = include libs src ringtones skins
EXTRA_DIST = tools/*.sh tools/install-sip* debian/* README.cvs CHANGES
ACLOCAL_FLAGS=-I$(top_srcdir)/m4
all: autotools
autotools:
./autogen.sh
qt:
cd src/gui/qt && qmake
all:
@echo "This Makefile is only for the CVS repository"
@echo "This will be deleted before making the distribution"
@echo ""
@if test ! -d admin; then \
echo "Please recheckout this module!" ;\
echo "for cvs: use checkout once and after that update again" ;\
exit 1 ;\
fi
$(MAKE) -f admin/Makefile.common cvs
......@@ -487,7 +487,7 @@ fi
acinclude_m4()
{
echo "*** Creating acinclude.m4"
adds=
adds=m4/*
if grep '\$(top_srcdir)/acinclude.m4:' $makefile_am >/dev/null; then
strip_makefile
rm -f acinclude.m4
......
......@@ -34,7 +34,6 @@ AC_PATH_QT
AC_CHECK_COMPILERS
AC_SUBST(LIBQT)
LIBS="$LIBS -lstdc++ $LIB_QT"
AC_CANONICAL_SYSTEM
AC_ARG_PROGRAM
......@@ -160,8 +159,13 @@ CPPFLAGS=$save_dnssdtest_CPPFLAGS
LDFLAGS=$save_dnssdtest_LDFLAGS
LIBS=$save_dnssdtest_LIBS
fi
sflphone_datadir=$datadir/sflphone
AC_SUBST(sflphone_datadir)
AC_SUBST(LIB_DNSSD)
AM_CONDITIONAL(USE_ZEROCONF, test "$have_libdns_sd" = "yes")
LIBS="$LIBS -lstdc++ $LIB_QT"
dnl AC_CONFIG_FILES(
AC_OUTPUT(
......
SUBDIRS = eXosip2 portaudio stund utilspp
\ No newline at end of file
SUBDIRS = eXosip2 portaudio stund taxidermy utilspp
\ No newline at end of file
/*
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
* Author: Jean-Philippe Barrette-LaPierre
* (jean-philippe.barrette-lapierre@savoirfairelinux.com)
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2,
* or (at your option) any later version.
*
* This is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with dpkg; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
template< typename T >
taxidermy::WidgetBuilder *
taxidermy::WidgetBuilderCreator< T >::create()
{
return new T();
}
/*
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
* Author: Jean-Philippe Barrette-LaPierre
* (jean-philippe.barrette-lapierre@savoirfairelinux.com)
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2,
* or (at your option) any later version.
*
* This is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with dpkg; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
template< typename T >
void
taxidermy::WidgetBuilderFactoryImpl::add(const QString &objectType)
{
mBuilders.insert(objectType, new WidgetBuilderCreator<T>());
}
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