]> git.parisson.com Git - telecaster-server.git/commitdiff
rename vncserver
authoryomguy <yomguy@parisson.com>
Sun, 11 Mar 2012 11:40:01 +0000 (12:40 +0100)
committeryomguy <yomguy@parisson.com>
Sun, 11 Mar 2012 11:40:01 +0000 (12:40 +0100)
tcserver/conf/etc/default/vncserver [deleted file]
tcserver/conf/etc/init.d/vncserver [deleted file]
tcserver/conf/etc/pm/sleep.d/telecaster_suspend
tcserver/install.py
tcserver/lib/edcast-jack/Makefile
tcserver/lib/edcast-jack/config.log
tcserver/lib/edcast-jack/config.status
tcserver/lib/edcast-jack/edcast_jack
tcserver/lib/edcast-jack/libedcast/Makefile
tcserver/lib/edcast-jack/libedcast/libedcast.a

diff --git a/tcserver/conf/etc/default/vncserver b/tcserver/conf/etc/default/vncserver
deleted file mode 100644 (file)
index 1309100..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Set to "yes" to start vncserver at boot
-START_DAEMON=yes
-
-# The vncserver process will run under this user
-USER=telecaster
-
-# The vncserver port (i.e. 2 for 5902)
-PORT="2"
-
-# Options to pass to vncserver
-OPTIONS="-geometry 1024x768 -depth 8"
-
diff --git a/tcserver/conf/etc/init.d/vncserver b/tcserver/conf/etc/init.d/vncserver
deleted file mode 100755 (executable)
index f087c80..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          vncserver
-# Required-Start:
-# Required-Stop:
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: init script for the audio vncserver
-### END INIT INFO
-
-
-DAEMON=/usr/bin/vncserver
-USER=
-OPTIONS=""
-LOG=/var/log/vncserver.log
-PIDFILE=/var/run/vncserver.pid
-PORT=1
-
-test -f /etc/default/vncserver || exit 0
-. /etc/default/vncserver
-
-VNCHOME=/home/$USER
-
-if [ ! "x$START_DAEMON" = "xyes" -a ! "$1" = "stop" ]; then
-       echo "Edit /etc/default/vncserver to start vncserver"
-       exit 0
-fi
-
-test -f $DAEMON || exit 0
-
-. /lib/lsb/init-functions
-
-case "$1" in
-       start)  
-           log_begin_msg "Starting vncserver audio server:" "vncserver"
-            echo $DAEMON $OPTIONS :$PORT' &' > $VNCHOME/.vncserverinit
-            chmod +x $VNCHOME/.vncserverinit
-            su -c $VNCHOME/.vncserverinit $USER > ${LOG}
-           sleep 2
-            pid=`pgrep -u ${USER} vncserver` 
-           if [ pid = '' ]; then
-                       log_failure_msg "Vncserver daemon can't be started! Check logfile: ${LOG}"
-            else
-                echo $pid > $PIDFILE
-               fi
-               
-               ;;
-       stop)
-               log_begin_msg "Stopping vncserver audio server:" "vncserver"
-                pid=`cat $PIDFILE | sed -e 's/\s.*//'|head -n1` 
-               if [ ! pid = '' ]; then
-                       su -c "pkill -9 -f \"deefuzzer /etc/telecaster/deefuzzer_audio_safe.xml\" "
-                       su -c "pkill -9 -f \"deefuzzer /etc/telecaster/deefuzzer_video_safe.xml\" "
-                       su -c "pkill -9 edcast_jack" $USER
-                        su -c "pkill -9 gst-launch-0.10" $USER
-                       sleep 1
-                        su -c "vncserver -kill :$PORT" $USER
-                       log_end_msg 0
-               else
-                       log_end_msg 1
-                       exit 1
-               fi
-                rm $PIDFILE
-               ;;
-       try-restart)
-               if test -e $PIDFILE ; then
-                       pid=`cat $PIDFILE | sed -e 's/\s.*//'|head -n1`
-                       PIDDIR=/proc/$pid
-                       if [ -d ${PIDDIR} -a  "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then
-                               $0 restart
-                               exit 0
-                       fi
-               fi
-               test -f /etc/rc`/sbin/runlevel | cut -d' ' -f2`.d/S*vncserver* && $0 start
-               ;;
-
-       *)
-               log_warning_msg "Usage: /etc/init.d/vncserver {start|stop|restart|force-reload|awaken|debug-run}"
-               log_warning_msg "  start - starts system-wide vncserver service"
-               log_warning_msg "  stop  - stops system-wide vncserver service"
-               log_warning_msg "  restart, force-reload - starts a new system-wide vncserver service"
-               log_warning_msg "  awaken - tell system-wide vncserver to start a poll cycle immediately"
-               log_warning_msg "  debug-run [strace [strace options...]] - start a debug run of the"
-               log_warning_msg "    system-wide vncserver service, optionally running it under strace"
-               exit 1
-               ;;
-esac
-
-exit 0
index 8acdd6d5d034bd6608b6f014831505b9bbc9158d..f25b6b803124b9e35ff520c5432c7bc9c3465be9 100755 (executable)
 
 case $1 in
      suspend|suspend_hybrid|hibernate)
-       /etc/init.d/vncserver stop
+       /etc/init.d/telecaster stop
         sleep 1
         /etc/init.d/jackd stop
         ;;
      resume|thaw)
        /etc/init.d/jackd start
-        /etc/init.d/vncserver start
+        /etc/init.d/telecaster start
         ;;
 esac
index ad329de0bfba7249b8c78d4b3f362f7cc5cda58e..040ea49322e6f0cbae9b923a3d86f2d217f184eb 100644 (file)
@@ -57,8 +57,8 @@ class Install(object):
         self.app_dir = os.getcwd()
         self.user = 'telecaster'
         self.home = '/home/' + self.user
+        self.app_dir = os.path.dirname(__file__)
 
-        self.install_dir = '/var/www/telecaster'
         self.rss_dir = '/var/www/rss'
         self.m3u_dir = '/var/www/m3u'
         self.log_dir = '/var/log/telecaster'
@@ -66,7 +66,7 @@ class Install(object):
         self.conf_dir = '/etc/telecaster'
         self.stream_m_conf_dir = '/etc/stream-m'
         self.init_dirs = ['/etc/init.d/', '/etc/default/']
-        self.daemons = ['jackd', 'vncserver', 'stream-m']
+        self.daemons = ['jackd', 'telecaster', 'stream-m']
         self.apache_conf = '/etc/apache2/sites-available/telecaster.conf'
 
     def create_user(self):
@@ -80,29 +80,16 @@ class Install(object):
 
     def install_deps(self):
         # compiling edcast-jack
-        os.chdir(self.app_dir + '/vendor/edcast-jack')
+        os.chdir(self.app_dir + '/lib/edcast-jack')
         os.system('./configure; make; make install')
 
-        # Install DeeFuzzer
-        os.system('pip install deefuzzer')
-
         # Install Stream-m
         os.chdir(self.app_dir)
-        os.system('cp -ra vendor/stream-m /usr/local/lib/')
+        os.system('cp -ra lib/stream-m /usr/local/lib/')
         init_link = '/usr/local/bin/stream-m'
         if not os.path.islink(init_link):
             os.system('ln -s /usr/local/lib/stream-m/bin/stream-m '+init_link)
 
-    def install_app(self):
-        os.chdir(self.app_dir)
-
-        if os.path.exists(self.install_dir):
-            shutil.rmtree(self.install_dir)
-
-        shutil.copytree(self.app_dir, self.install_dir,ignore=shutil.ignore_patterns('edcast-jack*', 'deefuzzer*', '*.svn*', '*.bzr*', '*.git'))
-        os.system('chown -R ' + self.user + ':' + self.user + ' ' + self.install_dir)
-        os.system('chmod 755 ' + self.install_dir + '/telecaster.py')
-
     def install_conf(self):
         os.chdir(self.app_dir)
 
@@ -147,9 +134,9 @@ class Install(object):
         if not os.path.islink(init_link):
             os.system('ln -s /etc/init.d/jackd '+init_link)
 
-        init_link = '/etc/rc2.d/S99vncserver'
+        init_link = '/etc/rc2.d/S99telecaster'
         if not os.path.islink(init_link):
-            os.system('ln -s /etc/init.d/vncserver '+init_link)
+            os.system('ln -s /etc/init.d/telecaster '+init_link)
 
         init_link = '/etc/rc2.d/S98stream-m'
         if not os.path.islink(init_link):
@@ -167,8 +154,9 @@ class Install(object):
         if self.options['keepconf'] == False:
             print 'Installing config files...'
             self.install_conf()
-        print 'Installing application...'
-        self.install_app()
+
+        print 'Please now user telecaster-client to control your streams...'
+
 
 
 def run():
@@ -194,11 +182,7 @@ def run():
 
         - configure your apache VirtualHost editing /etc/apache2/sites-available/telecaster.conf
 
-        - REBOOT to setup audio and video servers !
-
-        - use the TeleCaster system browsing http://127.0.0.1/telecaster/telecaster.py
+        - tune your audio and video servers and REBOOT!
 
         See README for more infos.
        """
-
-
index e5520fa5853912015ae21d66d93f7bafa5e89a07..dec9b960b550c81738d54f80d82e8ffda911e824 100644 (file)
@@ -90,12 +90,12 @@ DIST_ARCHIVES = $(distdir).tar.gz $(distdir).zip
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
-ACLOCAL = ${SHELL} /home/dev/telecaster/telecaster_cgi/vendor/edcast-jack/missing --run aclocal-1.10
-AMTAR = ${SHELL} /home/dev/telecaster/telecaster_cgi/vendor/edcast-jack/missing --run tar
+ACLOCAL = ${SHELL} /home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack/missing --run aclocal-1.10
+AMTAR = ${SHELL} /home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack/missing --run tar
 AR = ar
-AUTOCONF = ${SHELL} /home/dev/telecaster/telecaster_cgi/vendor/edcast-jack/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dev/telecaster/telecaster_cgi/vendor/edcast-jack/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dev/telecaster/telecaster_cgi/vendor/edcast-jack/missing --run automake-1.10
+AUTOCONF = ${SHELL} /home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack/missing --run automake-1.10
 AWK = gawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
@@ -139,7 +139,7 @@ LN_S = ln -s
 LTLIBOBJS = 
 MAD_CFLAGS = 
 MAD_LIBS = -lmad
-MAKEINFO = ${SHELL} /home/dev/telecaster/telecaster_cgi/vendor/edcast-jack/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
 OBJEXT = o
 OGG_CFLAGS = 
@@ -164,10 +164,10 @@ VORBIS_CFLAGS =
 VORBIS_LDFLAGS = 
 VORBIS_LIBS = -lvorbis
 VORBIS_PREFIX = 
-abs_builddir = /home/dev/telecaster/telecaster_cgi/vendor/edcast-jack
-abs_srcdir = /home/dev/telecaster/telecaster_cgi/vendor/edcast-jack
-abs_top_builddir = /home/dev/telecaster/telecaster_cgi/vendor/edcast-jack
-abs_top_srcdir = /home/dev/telecaster/telecaster_cgi/vendor/edcast-jack
+abs_builddir = /home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack
+abs_srcdir = /home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack
+abs_top_builddir = /home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack
+abs_top_srcdir = /home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack
 ac_ct_CC = gcc
 ac_ct_CXX = g++
 ac_ct_F77 = 
@@ -196,7 +196,7 @@ host_vendor = unknown
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = $(SHELL) /home/dev/telecaster/telecaster_cgi/vendor/edcast-jack/install-sh
+install_sh = $(SHELL) /home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
index 063811ee6212d4916c69ce803d9749bbe2b0324f..381475371391afce3170ee806dc7675c4baa93aa 100644 (file)
@@ -4,7 +4,7 @@ running configure, to aid debugging if configure makes a mistake.
 It was created by edcast-jack configure 3.1.7, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
-  $ ./configure 
+  $ ./configure --no-create --no-recursion
 
 ## --------- ##
 ## Platform. ##
@@ -12,9 +12,9 @@ generated by GNU Autoconf 2.61.  Invocation command line was
 
 hostname = wm22
 uname -m = x86_64
-uname -r = 2.6.39-bpo.2-amd64
+uname -r = 3.2.6-amd64-yomguy-rt13
 uname -s = Linux
-uname -v = #1 SMP Tue Jul 26 10:35:23 UTC 2011
+uname -v = #1 SMP PREEMPT RT Mon Feb 20 11:12:13 CET 2012
 
 /usr/bin/uname -p = unknown
 /bin/uname -X     = unknown
@@ -537,25 +537,6 @@ configure:21084: $? = 0
 configure:21104: result: yes
 configure:21370: creating ./config.status
 
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by edcast-jack config.status 3.1.7, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status 
-
-on wm22
-
-config.status:665: creating Makefile
-config.status:665: creating libedcast/Makefile
-config.status:856: executing depfiles commands
-
 ## ---------------- ##
 ## Cache variables. ##
 ## ---------------- ##
@@ -665,15 +646,15 @@ xt_cv_lib_ogg=ok
 ## Output variables. ##
 ## ----------------- ##
 
-ACLOCAL='${SHELL} /home/dev/telecaster/telecaster_cgi/vendor/edcast-jack/missing --run aclocal-1.10'
+ACLOCAL='${SHELL} /home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack/missing --run aclocal-1.10'
 AMDEPBACKSLASH='\'
 AMDEP_FALSE='#'
 AMDEP_TRUE=''
-AMTAR='${SHELL} /home/dev/telecaster/telecaster_cgi/vendor/edcast-jack/missing --run tar'
+AMTAR='${SHELL} /home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack/missing --run tar'
 AR='ar'
-AUTOCONF='${SHELL} /home/dev/telecaster/telecaster_cgi/vendor/edcast-jack/missing --run autoconf'
-AUTOHEADER='${SHELL} /home/dev/telecaster/telecaster_cgi/vendor/edcast-jack/missing --run autoheader'
-AUTOMAKE='${SHELL} /home/dev/telecaster/telecaster_cgi/vendor/edcast-jack/missing --run automake-1.10'
+AUTOCONF='${SHELL} /home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack/missing --run autoconf'
+AUTOHEADER='${SHELL} /home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack/missing --run autoheader'
+AUTOMAKE='${SHELL} /home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack/missing --run automake-1.10'
 AWK='gawk'
 CC='gcc'
 CCDEPMODE='depmode=gcc3'
@@ -716,7 +697,7 @@ LN_S='ln -s'
 LTLIBOBJS=''
 MAD_CFLAGS=''
 MAD_LIBS='-lmad'
-MAKEINFO='${SHELL} /home/dev/telecaster/telecaster_cgi/vendor/edcast-jack/missing --run makeinfo'
+MAKEINFO='${SHELL} /home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack/missing --run makeinfo'
 OBJEXT='o'
 OGG_CFLAGS=''
 OGG_LDFLAGS=''
@@ -772,7 +753,7 @@ host_vendor='unknown'
 htmldir='${docdir}'
 includedir='${prefix}/include'
 infodir='${datarootdir}/info'
-install_sh='$(SHELL) /home/dev/telecaster/telecaster_cgi/vendor/edcast-jack/install-sh'
+install_sh='$(SHELL) /home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack/install-sh'
 libdir='${exec_prefix}/lib'
 libexecdir='${exec_prefix}/libexec'
 localedir='${datarootdir}/locale'
@@ -821,3 +802,22 @@ target_alias=''
 #define HAVE_LAME 1
 
 configure: exit 0
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by edcast-jack config.status 3.1.7, which was
+generated by GNU Autoconf 2.61.  Invocation command line was
+
+  CONFIG_FILES    = 
+  CONFIG_HEADERS  = 
+  CONFIG_LINKS    = 
+  CONFIG_COMMANDS = 
+  $ ./config.status 
+
+on wm22
+
+config.status:665: creating Makefile
+config.status:665: creating libedcast/Makefile
+config.status:856: executing depfiles commands
index d4a99d379f511aebe99797d3ce9fa2f504eee7b7..6c059efef1db5b68d79b586a7d5b4b78a73721dd 100755 (executable)
@@ -335,7 +335,7 @@ Copyright (C) 2006 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
-ac_pwd='/home/dev/telecaster/telecaster_cgi/vendor/edcast-jack'
+ac_pwd='/home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack'
 srcdir='.'
 INSTALL='/usr/bin/install -c'
 MKDIR_P='/bin/mkdir -p'
@@ -523,19 +523,19 @@ s,@am__isrc@,|#_!!_#|,g
 s,@CYGPATH_W@,|#_!!_#|echo,g
 s,@PACKAGE@,|#_!!_#|edcast-jack,g
 s,@VERSION@,|#_!!_#|3.1.7,g
-s,@ACLOCAL@,|#_!!_#|${SHELL} /home/dev/telecaster/telecaster_cgi/vendor/edcast-jack/missing --run aclocal-1.10,g
-s,@AUTOCONF@,|#_!!_#|${SHELL} /home/dev/telecaster/telecaster_cgi/vendor/edcast-jack/missing --run autoconf,g
-s,@AUTOMAKE@,|#_!!_#|${SHELL} /home/dev/telecaster/telecaster_cgi/vendor/edcast-jack/missing --run automake-1.10,g
-s,@AUTOHEADER@,|#_!!_#|${SHELL} /home/dev/telecaster/telecaster_cgi/vendor/edcast-jack/missing --run autoheader,g
-s,@MAKEINFO@,|#_!!_#|${SHELL} /home/dev/telecaster/telecaster_cgi/vendor/edcast-jack/missing --run makeinfo,g
-s,@install_sh@,|#_!!_#|$(SHELL) /home/dev/telecaster/telecaster_cgi/vendor/edcast-jack/install-sh,g
+s,@ACLOCAL@,|#_!!_#|${SHELL} /home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack/missing --run aclocal-1.10,g
+s,@AUTOCONF@,|#_!!_#|${SHELL} /home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack/missing --run autoconf,g
+s,@AUTOMAKE@,|#_!!_#|${SHELL} /home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack/missing --run automake-1.10,g
+s,@AUTOHEADER@,|#_!!_#|${SHELL} /home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack/missing --run autoheader,g
+s,@MAKEINFO@,|#_!!_#|${SHELL} /home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack/missing --run makeinfo,g
+s,@install_sh@,|#_!!_#|$(SHELL) /home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack/install-sh,g
 s,@STRIP@,|#_!!_#|strip,g
 s,@INSTALL_STRIP_PROGRAM@,|#_!!_#|$(install_sh) -c -s,g
 s,@mkdir_p@,|#_!!_#|/bin/mkdir -p,g
 s,@AWK@,|#_!!_#|gawk,g
 s,@SET_MAKE@,|#_!!_#|,g
 s,@am__leading_dot@,|#_!!_#|.,g
-s,@AMTAR@,|#_!!_#|${SHELL} /home/dev/telecaster/telecaster_cgi/vendor/edcast-jack/missing --run tar,g
+s,@AMTAR@,|#_!!_#|${SHELL} /home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack/missing --run tar,g
 s,@am__tar@,|#_!!_#|${AMTAR} chof - "$$tardir",g
 s,@am__untar@,|#_!!_#|${AMTAR} xf -,g
 s,@CC@,|#_!!_#|gcc,g
index 1d10fff2e6a71dc15b188ebcb4c98ed96b11719b..aa98c6c2bbaec28df1094b50258972ae806b748a 100755 (executable)
Binary files a/tcserver/lib/edcast-jack/edcast_jack and b/tcserver/lib/edcast-jack/edcast_jack differ
index 200415ab3b272e76f4bac18b4817cb58ff5edf06..49a3d1aaf5933b1f8411deb79e7fcb4b7bde1e63 100644 (file)
@@ -87,12 +87,12 @@ HEADERS = $(include_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/dev/telecaster/telecaster_cgi/vendor/edcast-jack/missing --run aclocal-1.10
-AMTAR = ${SHELL} /home/dev/telecaster/telecaster_cgi/vendor/edcast-jack/missing --run tar
+ACLOCAL = ${SHELL} /home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack/missing --run aclocal-1.10
+AMTAR = ${SHELL} /home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack/missing --run tar
 AR = ar
-AUTOCONF = ${SHELL} /home/dev/telecaster/telecaster_cgi/vendor/edcast-jack/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dev/telecaster/telecaster_cgi/vendor/edcast-jack/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dev/telecaster/telecaster_cgi/vendor/edcast-jack/missing --run automake-1.10
+AUTOCONF = ${SHELL} /home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack/missing --run automake-1.10
 AWK = gawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
@@ -136,7 +136,7 @@ LN_S = ln -s
 LTLIBOBJS = 
 MAD_CFLAGS = 
 MAD_LIBS = -lmad
-MAKEINFO = ${SHELL} /home/dev/telecaster/telecaster_cgi/vendor/edcast-jack/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
 OBJEXT = o
 OGG_CFLAGS = 
@@ -161,10 +161,10 @@ VORBIS_CFLAGS =
 VORBIS_LDFLAGS = 
 VORBIS_LIBS = -lvorbis
 VORBIS_PREFIX = 
-abs_builddir = /home/dev/telecaster/telecaster_cgi/vendor/edcast-jack/libedcast
-abs_srcdir = /home/dev/telecaster/telecaster_cgi/vendor/edcast-jack/libedcast
-abs_top_builddir = /home/dev/telecaster/telecaster_cgi/vendor/edcast-jack
-abs_top_srcdir = /home/dev/telecaster/telecaster_cgi/vendor/edcast-jack
+abs_builddir = /home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack/libedcast
+abs_srcdir = /home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack/libedcast
+abs_top_builddir = /home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack
+abs_top_srcdir = /home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack
 ac_ct_CC = gcc
 ac_ct_CXX = g++
 ac_ct_F77 = 
@@ -193,7 +193,7 @@ host_vendor = unknown
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = $(SHELL) /home/dev/telecaster/telecaster_cgi/vendor/edcast-jack/install-sh
+install_sh = $(SHELL) /home/dev/telecaster/telecaster-server/tcserver/lib/edcast-jack/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
index c398b653fc3f98e09591c53c30e35d7def415225..1339646b2154d4d60f962294d56e225e7ed40fcb 100644 (file)
Binary files a/tcserver/lib/edcast-jack/libedcast/libedcast.a and b/tcserver/lib/edcast-jack/libedcast/libedcast.a differ