diff --git a/livesupport/bin/dist.sh b/livesupport/bin/dist.sh index f1c99e8eb..0b30ca565 100755 --- a/livesupport/bin/dist.sh +++ b/livesupport/bin/dist.sh @@ -43,10 +43,11 @@ basedir=`cd $reldir; pwd;` bindir=$basedir/bin etcdir=$basedir/etc docdir=$basedir/doc +srcdir=$basedir/src tmpdir=$basedir/tmp -toolsdir=$basedir/tools -modules_dir=$basedir/modules -products_dir=$basedir/products +toolsdir=$srcdir/tools +modules_dir=$srcdir/modules +products_dir=$srcdir/products usrdir=`cd $basedir/usr; pwd;` @@ -135,9 +136,10 @@ tarball=$directory/livesupport-$version.tar.bz2 tarball_libs=$directory/livesupport-libraries-$version.tar.bz2 ls_tmpdir=$tmpdir/livesupport-$version -tools_tmpdir=$ls_tmpdir/tools -modules_tmpdir=$ls_tmpdir/modules -products_tmpdir=$ls_tmpdir/products +src_tmpdir=$ls_tmpdir/src +tools_tmpdir=$src_tmpdir/tools +modules_tmpdir=$src_tmpdir/modules +products_tmpdir=$src_tmpdir/products doc_tmpdir=$ls_tmpdir/doc etc_tmpdir=$ls_tmpdir/etc tmp_tmpdir=$ls_tmpdir/tmp @@ -205,6 +207,7 @@ echo "Creating $tarball..."; mkdir -p $ls_tmpdir mkdir -p $ls_tmpdir/usr mkdir -p $tmp_tmpdir +mkdir -p $src_tmpdir mkdir -p $modules_tmpdir mkdir -p $products_tmpdir diff --git a/livesupport/bin/gen_coverage_data.sh b/livesupport/bin/gen_coverage_data.sh index ed0e869fc..aa5709f1b 100755 --- a/livesupport/bin/gen_coverage_data.sh +++ b/livesupport/bin/gen_coverage_data.sh @@ -34,9 +34,10 @@ reldir=`dirname $0`/.. basedir=`cd $reldir; pwd;` bindir=$basedir/bin docdir=$basedir/doc +srcdir=$basedir/src tmpdir=$basedir/tmp -modules_dir=$basedir/modules -products_dir=$basedir/products +modules_dir=$srcdir/modules +products_dir=$srcdir/products usrdir=`cd $basedir/usr; pwd;` diff --git a/livesupport/bin/preInstall.sh b/livesupport/bin/preInstall.sh index 9e4bb56d1..e73e11501 100755 --- a/livesupport/bin/preInstall.sh +++ b/livesupport/bin/preInstall.sh @@ -42,10 +42,11 @@ basedir=`cd $reldir; pwd;` bindir=$basedir/bin etcdir=$basedir/etc docdir=$basedir/doc +srcdir=$basedir/src tmpdir=$basedir/tmp -toolsdir=$basedir/tools -modules_dir=$basedir/modules -products_dir=$basedir/products +toolsdir=$srcdir/tools +modules_dir=$srcdir/modules +products_dir=$srcdir/products usrdir=`cd $basedir/usr; pwd;` diff --git a/livesupport/bin/setupDevelopmentEnvironment.sh b/livesupport/bin/setupDevelopmentEnvironment.sh index e8c9cc685..ca1101c7b 100755 --- a/livesupport/bin/setupDevelopmentEnvironment.sh +++ b/livesupport/bin/setupDevelopmentEnvironment.sh @@ -40,10 +40,11 @@ basedir=`cd $reldir; pwd;` bindir=$basedir/bin etcdir=$basedir/etc docdir=$basedir/doc +srcdir=$basedir/src tmpdir=$basedir/tmp -toolsdir=$basedir/tools -modules_dir=$basedir/modules -products_dir=$basedir/products +toolsdir=$srcdir/tools +modules_dir=$srcdir/modules +products_dir=$srcdir/products usrdir=`cd $basedir/usr; pwd;` @@ -105,6 +106,7 @@ make all $bindir/user_setup.sh || exit 1 + #------------------------------------------------------------------------------- # We're done #------------------------------------------------------------------------------- diff --git a/livesupport/bin/setup_test_db.sh b/livesupport/bin/setup_test_db.sh index 27e4a1298..bb4c57005 100755 --- a/livesupport/bin/setup_test_db.sh +++ b/livesupport/bin/setup_test_db.sh @@ -37,10 +37,11 @@ basedir=`cd $reldir; pwd;` bindir=$basedir/bin etcdir=$basedir/etc docdir=$basedir/doc +srcdir=$basedir/src tmpdir=$basedir/tmp -toolsdir=$basedir/tools -modules_dir=$basedir/modules -products_dir=$basedir/products +toolsdir=$srcdir/tools +modules_dir=$srcdir/modules +products_dir=$srcdir/products usrdir=`cd $basedir/usr; pwd;` diff --git a/livesupport/bin/user_setup.sh b/livesupport/bin/user_setup.sh index a6cc5c3af..80da052e4 100755 --- a/livesupport/bin/user_setup.sh +++ b/livesupport/bin/user_setup.sh @@ -42,10 +42,11 @@ basedir=`cd $reldir; pwd;` bindir=$basedir/bin etcdir=$basedir/etc docdir=$basedir/doc +srcdir=$basedir/src tmpdir=$basedir/tmp -toolsdir=$basedir/tools -modules_dir=$basedir/modules -products_dir=$basedir/products +toolsdir=$srcdir/tools +modules_dir=$srcdir/modules +products_dir=$srcdir/products usrdir=`cd $basedir/usr; pwd;` diff --git a/livesupport/bin/user_setup_db.sh b/livesupport/bin/user_setup_db.sh index f448779a6..0369ad44a 100755 --- a/livesupport/bin/user_setup_db.sh +++ b/livesupport/bin/user_setup_db.sh @@ -42,10 +42,11 @@ basedir=`cd $reldir; pwd;` bindir=$basedir/bin etcdir=$basedir/etc docdir=$basedir/doc +srcdir=$basedir/src tmpdir=$basedir/tmp -toolsdir=$basedir/tools -modules_dir=$basedir/modules -products_dir=$basedir/products +toolsdir=$srcdir/tools +modules_dir=$srcdir/modules +products_dir=$srcdir/products usrdir=`cd $basedir/usr; pwd;` diff --git a/livesupport/etc/Makefile.in b/livesupport/etc/Makefile.in index 528dd3897..9850aec77 100644 --- a/livesupport/etc/Makefile.in +++ b/livesupport/etc/Makefile.in @@ -48,6 +48,7 @@ DOC_DIR = ${BASE_DIR}/doc DOXYGEN_DIR = ${DOC_DIR}/doxygen COVERAGE_DIR = ${DOC_DIR}/coverage ETC_DIR = ${BASE_DIR}/etc +SRC_DIR = ${BASE_DIR}/src TMP_DIR = ${BASE_DIR}/tmp prefix = @prefix@ @@ -95,7 +96,7 @@ TESTRESULTS_FILE = ${DOC_DIR}/testResults.html FLAWFINDER_FILE = ${DOC_DIR}/flawfinderReport.html -TOOLS_DIR = ${BASE_DIR}/tools +TOOLS_DIR = ${SRC_DIR}/tools BOOST_DIR = ${TOOLS_DIR}/boost BOOST_VERSION = boost-1.31 @@ -123,7 +124,7 @@ TAGLIB_DIR = ${TOOLS_DIR}/taglib TAGLIB_VERSION = taglib-1.3.1 PEAR_DIR = ${TOOLS_DIR}/pear -MODULES_DIR = ${BASE_DIR}/modules +MODULES_DIR = ${SRC_DIR}/modules CORE_DIR = ${MODULES_DIR}/core AUTHENTICATION_DIR = ${MODULES_DIR}/authentication DB_DIR = ${MODULES_DIR}/db @@ -140,8 +141,8 @@ HTML_UI_DIR = ${MODULES_DIR}/htmlUI STORAGE_ADMIN_DIR = ${MODULES_DIR}/storageAdmin STORAGE_SERVER_DIR = ${MODULES_DIR}/storageServer -PRODUCTS_DIR = ${BASE_DIR}/products -SCHEDULER_DIR = ${PRODUCTS_DIR}/scheduler +PRODUCTS_DIR = ${SRC_DIR}/products +SCHEDULER_DIR = ${PRODUCTS_DIR}/scheduler GLIVESUPPORT_DIR = ${PRODUCTS_DIR}/gLiveSupport diff --git a/livesupport/etc/configure.ac b/livesupport/etc/configure.ac index a06464dff..dabba754c 100644 --- a/livesupport/etc/configure.ac +++ b/livesupport/etc/configure.ac @@ -37,7 +37,7 @@ AC_PREREQ(2.59) AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) AC_REVISION($Revision$) -AC_CONFIG_SRCDIR(../products/scheduler/src/main.cxx) +AC_CONFIG_SRCDIR(../src/products/scheduler/src/main.cxx) AC_PROG_CC() AC_PROG_CXX() @@ -417,72 +417,72 @@ fi dnl set up the alib module -AC_CONFIG_COMMANDS([../modules/alib/tmp/configure], - [../modules/alib/bin/autogen.sh]) +AC_CONFIG_COMMANDS([../src/modules/alib/tmp/configure], + [../src/modules/alib/bin/autogen.sh]) dnl set up the archive server module -AC_CONFIG_COMMANDS([../modules/archiveServer/tmp/configure], - [../modules/archiveServer/bin/autogen.sh]) +AC_CONFIG_COMMANDS([../src/modules/archiveServer/tmp/configure], + [../src/modules/archiveServer/bin/autogen.sh]) dnl set up the getid3 module -AC_CONFIG_COMMANDS([../modules/getid3/tmp/configure], - [../modules/getid3/bin/autogen.sh]) +AC_CONFIG_COMMANDS([../src/modules/getid3/tmp/configure], + [../src/modules/getid3/bin/autogen.sh]) dnl set up the htmlUI module -AC_CONFIG_COMMANDS([../modules/htmlUI/tmp/configure], - [../modules/htmlUI/bin/autogen.sh]) +AC_CONFIG_COMMANDS([../src/modules/htmlUI/tmp/configure], + [../src/modules/htmlUI/bin/autogen.sh]) dnl set up the storage admin module -AC_CONFIG_COMMANDS([../modules/storageAdmin/tmp/configure], - [../modules/storageAdmin/bin/autogen.sh]) +AC_CONFIG_COMMANDS([../src/modules/storageAdmin/tmp/configure], + [../src/modules/storageAdmin/bin/autogen.sh]) dnl set up the storage server module -AC_CONFIG_COMMANDS([../modules/storageServer/tmp/configure], - [../modules/storageServer/bin/autogen.sh]) +AC_CONFIG_COMMANDS([../src/modules/storageServer/tmp/configure], + [../src/modules/storageServer/bin/autogen.sh]) dnl set up the core module -AC_CONFIG_COMMANDS([../modules/core/tmp/configure], - [../modules/core/bin/autogen.sh]) +AC_CONFIG_COMMANDS([../src/modules/core/tmp/configure], + [../src/modules/core/bin/autogen.sh]) dnl set up the authentication module -AC_CONFIG_COMMANDS([../modules/authentication/tmp/configure], - [../modules/authentication/bin/autogen.sh]) +AC_CONFIG_COMMANDS([../src/modules/authentication/tmp/configure], + [../src/modules/authentication/bin/autogen.sh]) dnl set up the db module -AC_CONFIG_COMMANDS([../modules/db/tmp/configure], - [../modules/db/bin/autogen.sh]) +AC_CONFIG_COMMANDS([../src/modules/db/tmp/configure], + [../src/modules/db/bin/autogen.sh]) dnl set up the storage module -AC_CONFIG_COMMANDS([../modules/storage/tmp/configure], - [../modules/storage/bin/autogen.sh]) +AC_CONFIG_COMMANDS([../src/modules/storage/tmp/configure], + [../src/modules/storage/bin/autogen.sh]) dnl set up the gstreamer elements module -AC_CONFIG_COMMANDS([../modules/gstreamerElements/tmp/configure], - [../modules/gstreamerElements/bin/autogen.sh]) +AC_CONFIG_COMMANDS([../src/modules/gstreamerElements/tmp/configure], + [../src/modules/gstreamerElements/bin/autogen.sh]) dnl set up the playlist executor module -AC_CONFIG_COMMANDS([../modules/playlistExecutor/tmp/configure], - [../modules/playlistExecutor/bin/autogen.sh]) +AC_CONFIG_COMMANDS([../src/modules/playlistExecutor/tmp/configure], + [../src/modules/playlistExecutor/bin/autogen.sh]) dnl set up the event scheduler module -AC_CONFIG_COMMANDS([../modules/eventScheduler/tmp/configure], - [../modules/eventScheduler/bin/autogen.sh]) +AC_CONFIG_COMMANDS([../src/modules/eventScheduler/tmp/configure], + [../src/modules/eventScheduler/bin/autogen.sh]) dnl set up the scheduler client module -AC_CONFIG_COMMANDS([../modules/schedulerClient/tmp/configure], - [../modules/schedulerClient/bin/autogen.sh]) +AC_CONFIG_COMMANDS([../src/modules/schedulerClient/tmp/configure], + [../src/modules/schedulerClient/bin/autogen.sh]) dnl set up the widgets module -AC_CONFIG_COMMANDS([../modules/widgets/tmp/configure], - [../modules/widgets/bin/autogen.sh]) +AC_CONFIG_COMMANDS([../src/modules/widgets/tmp/configure], + [../src/modules/widgets/bin/autogen.sh]) dnl set up the scheduler product -AC_CONFIG_COMMANDS([../products/scheduler/tmp/configure], - [../products/scheduler/bin/autogen.sh]) +AC_CONFIG_COMMANDS([../src/products/scheduler/tmp/configure], + [../src/products/scheduler/bin/autogen.sh]) dnl set up the gLiveSupport product -AC_CONFIG_COMMANDS([../products/gLiveSupport/tmp/configure], - [../products/gLiveSupport/bin/autogen.sh]) +AC_CONFIG_COMMANDS([../src/products/gLiveSupport/tmp/configure], + [../src/products/gLiveSupport/bin/autogen.sh]) diff --git a/livesupport/modules/alib/bin/autogen.sh b/livesupport/modules/alib/bin/autogen.sh deleted file mode 100755 index 4c4b9828e..000000000 --- a/livesupport/modules/alib/bin/autogen.sh +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/sh -#------------------------------------------------------------------------------- -# Copyright (c) 2004 Media Development Loan Fund -# -# This file is part of the LiveSupport project. -# http://livesupport.campware.org/ -# To report bugs, send an e-mail to bugs@campware.org -# -# LiveSupport 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 of the License, or -# (at your option) any later version. -# -# LiveSupport 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 LiveSupport; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# -# Author : $Author$ -# Version : $Revision$ -# Location : $URL$ -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- -# Run this to set up the build system: configure, makefiles, etc. -# (based on the version in enlightenment's cvs) -#------------------------------------------------------------------------------- - -package="Alib" - -# assume we're in $basedir/bin -reldir=`dirname $0`/.. -basedir=`cd $reldir; pwd;` -test -z "$basedir" && basedir=. -usrdir=`cd $basedir/../../usr; pwd;` - -bindir=$basedir/bin -etcdir=$basedir/etc -tmpdir=$basedir/tmp - -cd "$tmpdir" -DIE=0 - -(autoheader --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have autoconf installed to compile $package." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} - -(autoconf --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have autoconf installed to compile $package." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} - -if test "$DIE" -eq 1; then - exit 1 -fi - -if test -z "$*"; then - echo "I am going to run ./configure with no arguments - if you wish " - echo "to pass any to it, please specify them on the $0 command line." -fi - -echo "Generating configuration files for $package, please wait...." - -configure_ac=${etcdir}/configure.ac -configure=${tmpdir}/configure -aclocal_m4=${tmpdir}/aclocal.m4 - -# copy over configure.ac and acinlclude.m4 from etc to tmp, -# as aclocal >= 1.8 is sooo unbelivably stupid that it will simply try to -# look for configure.ac in the current directory, and include acinclude.m4 -# in aclocal.m4 it without a directory path in front -#ACLOCAL_FLAGS="-I ${tmpdir} --acdir=${tmpdir} --output=${aclocal_m4}" -#echo " aclocal $ACLOCAL_FLAGS" -#cp -f ${configure_ac} ${tmpdir} -#cp -f ${etcdir}/acinclude.m4 ${tmpdir} -#aclocal $ACLOCAL_FLAGS - -#echo " autoheader ${configure_ac}" -#autoheader ${configure_ac} - -echo " autoconf -I ${tmpdir} -o ${configure} ${configure_ac}" -autoconf -I ${tmpdir} -o ${configure} ${configure_ac} - diff --git a/livesupport/modules/storageAdmin/bin/autogen.sh b/livesupport/modules/storageAdmin/bin/autogen.sh deleted file mode 100755 index 20f015287..000000000 --- a/livesupport/modules/storageAdmin/bin/autogen.sh +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/sh -#------------------------------------------------------------------------------- -# Copyright (c) 2004 Media Development Loan Fund -# -# This file is part of the LiveSupport project. -# http://livesupport.campware.org/ -# To report bugs, send an e-mail to bugs@campware.org -# -# LiveSupport 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 of the License, or -# (at your option) any later version. -# -# LiveSupport 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 LiveSupport; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# -# Author : $Author$ -# Version : $Revision$ -# Location : $URL$ -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- -# Run this to set up the build system: configure, makefiles, etc. -# (based on the version in enlightenment's cvs) -#------------------------------------------------------------------------------- - -package="StorageAdmin" - -# assume we're in $basedir/bin -reldir=`dirname $0`/.. -basedir=`cd $reldir; pwd;` -test -z "$basedir" && basedir=. -usrdir=`cd $basedir/../../usr; pwd;` - -bindir=$basedir/bin -etcdir=$basedir/etc -tmpdir=$basedir/tmp - -cd "$tmpdir" -DIE=0 - -(autoheader --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have autoconf installed to compile $package." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} - -(autoconf --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have autoconf installed to compile $package." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} - -if test "$DIE" -eq 1; then - exit 1 -fi - -if test -z "$*"; then - echo "I am going to run ./configure with no arguments - if you wish " - echo "to pass any to it, please specify them on the $0 command line." -fi - -echo "Generating configuration files for $package, please wait...." - -configure_ac=${etcdir}/configure.ac -configure=${tmpdir}/configure -aclocal_m4=${tmpdir}/aclocal.m4 - -# copy over configure.ac and acinlclude.m4 from etc to tmp, -# as aclocal >= 1.8 is sooo unbelivably stupid that it will simply try to -# look for configure.ac in the current directory, and include acinclude.m4 -# in aclocal.m4 it without a directory path in front -#ACLOCAL_FLAGS="-I ${tmpdir} --acdir=${tmpdir} --output=${aclocal_m4}" -#echo " aclocal $ACLOCAL_FLAGS" -#cp -f ${configure_ac} ${tmpdir} -#cp -f ${etcdir}/acinclude.m4 ${tmpdir} -#aclocal $ACLOCAL_FLAGS - -#echo " autoheader ${configure_ac}" -#autoheader ${configure_ac} - -echo " autoconf -I ${tmpdir} -o ${configure} ${configure_ac}" -autoconf -I ${tmpdir} -o ${configure} ${configure_ac} - diff --git a/livesupport/modules/storageServer/bin/autogen.sh b/livesupport/modules/storageServer/bin/autogen.sh deleted file mode 100755 index bfbdbba5c..000000000 --- a/livesupport/modules/storageServer/bin/autogen.sh +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/sh -#------------------------------------------------------------------------------- -# Copyright (c) 2004 Media Development Loan Fund -# -# This file is part of the LiveSupport project. -# http://livesupport.campware.org/ -# To report bugs, send an e-mail to bugs@campware.org -# -# LiveSupport 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 of the License, or -# (at your option) any later version. -# -# LiveSupport 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 LiveSupport; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# -# Author : $Author$ -# Version : $Revision$ -# Location : $URL$ -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- -# Run this to set up the build system: configure, makefiles, etc. -# (based on the version in enlightenment's cvs) -#------------------------------------------------------------------------------- - -package="StorageServer" - -# assume we're in $basedir/bin -reldir=`dirname $0`/.. -basedir=`cd $reldir; pwd;` -test -z "$basedir" && basedir=. -usrdir=`cd $basedir/../../usr; pwd;` - -bindir=$basedir/bin -etcdir=$basedir/etc -tmpdir=$basedir/tmp - -cd "$tmpdir" -DIE=0 - -(autoheader --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have autoconf installed to compile $package." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} - -(autoconf --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have autoconf installed to compile $package." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} - -if test "$DIE" -eq 1; then - exit 1 -fi - -if test -z "$*"; then - echo "I am going to run ./configure with no arguments - if you wish " - echo "to pass any to it, please specify them on the $0 command line." -fi - -echo "Generating configuration files for $package, please wait...." - -configure_ac=${etcdir}/configure.ac -configure=${tmpdir}/configure -aclocal_m4=${tmpdir}/aclocal.m4 - -# copy over configure.ac and acinlclude.m4 from etc to tmp, -# as aclocal >= 1.8 is sooo unbelivably stupid that it will simply try to -# look for configure.ac in the current directory, and include acinclude.m4 -# in aclocal.m4 it without a directory path in front -#ACLOCAL_FLAGS="-I ${tmpdir} --acdir=${tmpdir} --output=${aclocal_m4}" -#echo " aclocal $ACLOCAL_FLAGS" -#cp -f ${configure_ac} ${tmpdir} -#cp -f ${etcdir}/acinclude.m4 ${tmpdir} -#aclocal $ACLOCAL_FLAGS - -#echo " autoheader ${configure_ac}" -#autoheader ${configure_ac} - -echo " autoconf -I ${tmpdir} -o ${configure} ${configure_ac}" -autoconf -I ${tmpdir} -o ${configure} ${configure_ac} - diff --git a/livesupport/modules/alib/.htaccess b/livesupport/src/modules/alib/.htaccess similarity index 100% rename from livesupport/modules/alib/.htaccess rename to livesupport/src/modules/alib/.htaccess diff --git a/livesupport/tools/gtk+/gtk+-2.6.1/bin/autogen.sh b/livesupport/src/modules/alib/bin/autogen.sh similarity index 99% rename from livesupport/tools/gtk+/gtk+-2.6.1/bin/autogen.sh rename to livesupport/src/modules/alib/bin/autogen.sh index 9d824553a..b6d19f224 100755 --- a/livesupport/tools/gtk+/gtk+-2.6.1/bin/autogen.sh +++ b/livesupport/src/modules/alib/bin/autogen.sh @@ -31,7 +31,7 @@ # (based on the version in enlightenment's cvs) #------------------------------------------------------------------------------- -package="gtk+" +package="Alib" # assume we're in $basedir/bin reldir=`dirname $0`/.. diff --git a/livesupport/modules/alib/configure b/livesupport/src/modules/alib/configure similarity index 100% rename from livesupport/modules/alib/configure rename to livesupport/src/modules/alib/configure diff --git a/livesupport/modules/alib/etc/Makefile.in b/livesupport/src/modules/alib/etc/Makefile.in similarity index 100% rename from livesupport/modules/alib/etc/Makefile.in rename to livesupport/src/modules/alib/etc/Makefile.in diff --git a/livesupport/modules/alib/etc/configure.ac b/livesupport/src/modules/alib/etc/configure.ac similarity index 100% rename from livesupport/modules/alib/etc/configure.ac rename to livesupport/src/modules/alib/etc/configure.ac diff --git a/livesupport/modules/alib/etc/doxygen.config b/livesupport/src/modules/alib/etc/doxygen.config similarity index 100% rename from livesupport/modules/alib/etc/doxygen.config rename to livesupport/src/modules/alib/etc/doxygen.config diff --git a/livesupport/modules/alib/var/.htaccess b/livesupport/src/modules/alib/var/.htaccess similarity index 100% rename from livesupport/modules/alib/var/.htaccess rename to livesupport/src/modules/alib/var/.htaccess diff --git a/livesupport/modules/alib/var/alib.php b/livesupport/src/modules/alib/var/alib.php similarity index 100% rename from livesupport/modules/alib/var/alib.php rename to livesupport/src/modules/alib/var/alib.php diff --git a/livesupport/modules/alib/var/class.php b/livesupport/src/modules/alib/var/class.php similarity index 100% rename from livesupport/modules/alib/var/class.php rename to livesupport/src/modules/alib/var/class.php diff --git a/livesupport/modules/alib/var/example/alibExCls.php b/livesupport/src/modules/alib/var/example/alibExCls.php similarity index 100% rename from livesupport/modules/alib/var/example/alibExCls.php rename to livesupport/src/modules/alib/var/example/alibExCls.php diff --git a/livesupport/modules/alib/var/example/alibExLogin.php b/livesupport/src/modules/alib/var/example/alibExLogin.php similarity index 100% rename from livesupport/modules/alib/var/example/alibExLogin.php rename to livesupport/src/modules/alib/var/example/alibExLogin.php diff --git a/livesupport/modules/alib/var/example/alibExPList.php b/livesupport/src/modules/alib/var/example/alibExPList.php similarity index 100% rename from livesupport/modules/alib/var/example/alibExPList.php rename to livesupport/src/modules/alib/var/example/alibExPList.php diff --git a/livesupport/modules/alib/var/example/alibExPMatrix.php b/livesupport/src/modules/alib/var/example/alibExPMatrix.php similarity index 100% rename from livesupport/modules/alib/var/example/alibExPMatrix.php rename to livesupport/src/modules/alib/var/example/alibExPMatrix.php diff --git a/livesupport/modules/alib/var/example/alibExPerms.php b/livesupport/src/modules/alib/var/example/alibExPerms.php similarity index 100% rename from livesupport/modules/alib/var/example/alibExPerms.php rename to livesupport/src/modules/alib/var/example/alibExPerms.php diff --git a/livesupport/modules/alib/var/example/alibExSubj.php b/livesupport/src/modules/alib/var/example/alibExSubj.php similarity index 100% rename from livesupport/modules/alib/var/example/alibExSubj.php rename to livesupport/src/modules/alib/var/example/alibExSubj.php diff --git a/livesupport/modules/alib/var/example/alibExTestAuth.php b/livesupport/src/modules/alib/var/example/alibExTestAuth.php similarity index 100% rename from livesupport/modules/alib/var/example/alibExTestAuth.php rename to livesupport/src/modules/alib/var/example/alibExTestAuth.php diff --git a/livesupport/modules/alib/var/example/alibExTree.php b/livesupport/src/modules/alib/var/example/alibExTree.php similarity index 100% rename from livesupport/modules/alib/var/example/alibExTree.php rename to livesupport/src/modules/alib/var/example/alibExTree.php diff --git a/livesupport/modules/alib/var/example/alibHttp.php b/livesupport/src/modules/alib/var/example/alibHttp.php similarity index 100% rename from livesupport/modules/alib/var/example/alibHttp.php rename to livesupport/src/modules/alib/var/example/alibHttp.php diff --git a/livesupport/modules/alib/var/example/alib_f.php b/livesupport/src/modules/alib/var/example/alib_f.php similarity index 100% rename from livesupport/modules/alib/var/example/alib_f.php rename to livesupport/src/modules/alib/var/example/alib_f.php diff --git a/livesupport/modules/alib/var/example/alib_h.php b/livesupport/src/modules/alib/var/example/alib_h.php similarity index 100% rename from livesupport/modules/alib/var/example/alib_h.php rename to livesupport/src/modules/alib/var/example/alib_h.php diff --git a/livesupport/modules/alib/var/example/conf.php b/livesupport/src/modules/alib/var/example/conf.php similarity index 100% rename from livesupport/modules/alib/var/example/conf.php rename to livesupport/src/modules/alib/var/example/conf.php diff --git a/livesupport/modules/alib/var/example/default.css b/livesupport/src/modules/alib/var/example/default.css similarity index 92% rename from livesupport/modules/alib/var/example/default.css rename to livesupport/src/modules/alib/var/example/default.css index 6005b0c32..03f8e09d1 100644 --- a/livesupport/modules/alib/var/example/default.css +++ b/livesupport/src/modules/alib/var/example/default.css @@ -1,5 +1,5 @@