From 6bfb37ae9c010c866900239281d345efcdd611bd Mon Sep 17 00:00:00 2001 From: Felix Domke Date: Thu, 27 May 2004 11:36:50 +0000 Subject: [PATCH] some cleanup --- .cvsignore | 8 ++ Makefile.in | 0 acinclude.m4 | 350 ------------------------------------------------ aclocal.m4 | 0 lib/.cvsignore | 3 + lib/Makefile.in | 0 lib/base/.cvsignore | 3 + lib/base/Makefile.in | 0 lib/driver/.cvsignore | 3 + lib/driver/Makefile.in | 0 lib/dvb/.cvsignore | 3 + lib/dvb/Makefile.in | 0 lib/dvb/sec.cpp | 2 +- lib/dvb_si/.cvsignore | 0 lib/dvb_si/Makefile.in | 0 lib/gdi/.cvsignore | 6 +- lib/gdi/lcd.cpp | 2 + lib/nav/.cvsignore | 3 + lib/network/.cvsignore | 3 + lib/network/Makefile.in | 0 lib/service/.cvsignore | 3 + lib/service/Makefile.in | 0 22 files changed, 33 insertions(+), 356 deletions(-) delete mode 100644 Makefile.in delete mode 100644 acinclude.m4 delete mode 100644 aclocal.m4 create mode 100644 lib/.cvsignore delete mode 100644 lib/Makefile.in create mode 100644 lib/base/.cvsignore delete mode 100644 lib/base/Makefile.in create mode 100644 lib/driver/.cvsignore delete mode 100644 lib/driver/Makefile.in create mode 100644 lib/dvb/.cvsignore delete mode 100644 lib/dvb/Makefile.in create mode 100644 lib/dvb_si/.cvsignore delete mode 100644 lib/dvb_si/Makefile.in create mode 100644 lib/nav/.cvsignore create mode 100644 lib/network/.cvsignore delete mode 100644 lib/network/Makefile.in create mode 100644 lib/service/.cvsignore delete mode 100644 lib/service/Makefile.in diff --git a/.cvsignore b/.cvsignore index 7e7fe0a..c702427 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,10 @@ configure autom4te.cache +Makefile.in +Makefile +acinclude.m4 +aclocal.m4 +config.h +config.log +config.status +stamp-h diff --git a/Makefile.in b/Makefile.in deleted file mode 100644 index e69de29..0000000 diff --git a/acinclude.m4 b/acinclude.m4 deleted file mode 100644 index 63b1444..0000000 --- a/acinclude.m4 +++ /dev/null @@ -1,350 +0,0 @@ -AC_DEFUN(TUXBOX_APPS,[ -AM_CONFIG_HEADER(config.h) -AM_MAINTAINER_MODE - -AC_GNU_SOURCE -AC_SYS_LARGEFILE - -AC_ARG_WITH(target, - [ --with-target=TARGET target for compilation [[native,cdk]]], - [TARGET="$withval"],[TARGET="native"]) - -AC_ARG_WITH(targetprefix, - [ --with-targetprefix=PATH prefix relative to target root [[PREFIX[for native], /[for cdk]]]], - [targetprefix="$withval"],[targetprefix="NONE"]) - -AC_ARG_WITH(debug, - [ --without-debug disable debugging code], - [DEBUG="$withval"],[DEBUG="yes"]) - -if test "$DEBUG" = "yes"; then - DEBUG_CFLAGS="-g3 -ggdb" - AC_DEFINE(DEBUG,1,[Enable debug messages]) -fi - -if test "$TARGET" = "native"; then - if test "$CFLAGS" = "" -a "$CXXFLAGS" = ""; then - CFLAGS="-Wall -O2 -pipe $DEBUG_CFLAGS" - CXXFLAGS="-Wall -O2 -pipe $DEBUG_CFLAGS" - fi - if test "$prefix" = "NONE"; then - prefix=/usr/local - fi - if test "$targetprefix" = "NONE"; then - targetprefix="\${prefix}" - _targetprefix="${prefix}" - else - _targetprefix="$targetprefix" - fi -elif test "$TARGET" = "cdk"; then - if test "$CC" = "" -a "$CXX" = ""; then - CC=powerpc-tuxbox-linux-gnu-gcc CXX=powerpc-tuxbox-linux-gnu-g++ - fi - if test "$CFLAGS" = "" -a "$CXXFLAGS" = ""; then - CFLAGS="-Wall -Os -mcpu=823 -pipe $DEBUG_CFLAGS" - CXXFLAGS="-Wall -Os -mcpu=823 -pipe $DEBUG_CFLAGS" - fi - if test "$prefix" = "NONE"; then - prefix=/dbox2/cdkroot - fi - if test "$targetprefix" = "NONE"; then - targetprefix="" - _targetprefix="" - else - _targetprefix="$targetprefix" - fi - if test "$host_alias" = ""; then - cross_compiling=yes - host_alias=powerpc-tuxbox-linux-gnu - fi -else - AC_MSG_ERROR([invalid target $TARGET, choose on from native,cdk]); -fi - -AC_CANONICAL_BUILD -AC_CANONICAL_HOST - -targetdatadir="\${targetprefix}/share" -_targetdatadir="${_targetprefix}/share" -targetsysconfdir="\${targetprefix}/etc" -_targetsysconfdir="${_targetprefix}/etc" -targetlocalstatedir="\${targetprefix}/var" -_targetlocalstatedir="${_targetprefix}/var" -targetlibdir="\${targetprefix}/lib" -_targetlibdir="${_targetprefix}/lib" -AC_SUBST(targetprefix) -AC_SUBST(targetdatadir) -AC_SUBST(targetsysconfdir) -AC_SUBST(targetlocalstatedir) - -check_path () { - return $(perl -e "if(\"$1\"=~m#^/usr/(local/)?bin#){print \"0\"}else{print \"1\";}") -} - -]) - -AC_DEFUN(TUXBOX_APPS_DIRECTORY,[ -AC_REQUIRE([TUXBOX_APPS]) - -CONFIGDIR="\${localstatedir}/tuxbox/config" -_CONFIGDIR="${_targetlocalstatedir}/tuxbox/config" -AC_SUBST(CONFIGDIR) -AC_DEFINE_UNQUOTED(CONFIGDIR,"$_CONFIGDIR",[where to find the config files]) - -DATADIR="\${datadir}/tuxbox" -_DATADIR="${_targetdatadir}/tuxbox" -AC_SUBST(DATADIR) -AC_DEFINE_UNQUOTED(DATADIR,"$_DATADIR",[where to find data like icons]) - -FONTDIR="\${datadir}/fonts" -_FONTDIR="${_targetdatadir}/fonts" -AC_SUBST(FONTDIR) -AC_DEFINE_UNQUOTED(FONTDIR,"$_FONTDIR",[where to find the fonts]) - -GAMESDIR="\${localstatedir}/tuxbox/games" -_GAMESDIR="${_targetlocalstatedir}/tuxbox/games" -AC_SUBST(GAMESDIR) -AC_DEFINE_UNQUOTED(GAMESDIR,"$_GAMESDIR",[where games data is stored]) - -LIBDIR="\${libdir}/tuxbox" -_LIBDIR="${_targetlibdir}/tuxbox" -AC_SUBST(LIBDIR) -AC_SUBST(_LIBDIR) -AC_DEFINE_UNQUOTED(LIBDIR,"$_LIBDIR",[where to find the internal libs]) - -PLUGINDIR="\${libdir}/tuxbox/plugins" -_PLUGINDIR="${_targetlibdir}/tuxbox/plugins" -AC_SUBST(PLUGINDIR) -AC_DEFINE_UNQUOTED(PLUGINDIR,"$_PLUGINDIR",[where to find the plugins]) - -UCODEDIR="\${localstatedir}/tuxbox/ucodes" -_UCODEDIR="${_targetlocalstatedir}/tuxbox/ucodes" -AC_SUBST(UCODEDIR) -AC_DEFINE_UNQUOTED(UCODEDIR,"$_UCODEDIR",[where to find the ucodes (firmware)]) -]) - -AC_DEFUN(TUXBOX_APPS_ENDIAN,[ -AC_CHECK_HEADERS(endian.h) -AC_C_BIGENDIAN -]) - -AC_DEFUN(TUXBOX_APPS_DRIVER,[ -AC_ARG_WITH(driver, - [ --with-driver=PATH path for driver sources[[NONE]]], - [DRIVER="$withval"],[DRIVER=""]) - -if test -z "$DRIVER"; then - AC_MSG_ERROR([can't find driver sources]) -fi -CPPFLAGS="$CPPFLAGS -I$DRIVER/include" -AC_SUBST(DRIVER) -]) - -AC_DEFUN([TUXBOX_APPS_DVB],[ -AC_ARG_WITH(dvbincludes, - [ --with-dvbincludes=PATH path for dvb includes[[NONE]]], - [DVBINCLUDES="$withval"],[DVBINCLUDES=""]) - -orig_CPPFLAGS=$CPPFLAGS -if test "$DVBINCLUDES"; then - CPPFLAGS="-I$DVBINCLUDES" -else - CPPFLAGS="" -fi -AC_CHECK_HEADERS(linux/dvb/version.h,[DVB_VERSION_H="yes"]) -AC_CHECK_HEADERS(ost/dmx.h,[OST_DMX_H="yes"]) -if test "$DVB_VERSION_H"; then - AC_MSG_NOTICE([found dvb version 2 or later]) -elif test "$OST_DMX_H"; then - AC_MSG_NOTICE([found dvb version 1]) -else - AC_MSG_ERROR([can't find dvb headers]) -fi -DVB_VERSION_H= -OST_DMX_H= -CPPFLAGS="$orig_CPPFLAGS -I$DVBINCLUDES" -]) - -AC_DEFUN(_TUXBOX_APPS_LIB_CONFIG,[ -AC_PATH_PROG($1_CONFIG,$2,no) -if test "$$1_CONFIG" != "no"; then - if test "$TARGET" = "cdk" && check_path "$$1_CONFIG"; then - AC_MSG_$3([could not find a suitable version of $2]); - else - $1_CFLAGS=$($$1_CONFIG --cflags) - $1_LIBS=$($$1_CONFIG --libs) - fi -fi - -AC_SUBST($1_CFLAGS) -AC_SUBST($1_LIBS) -]) - -AC_DEFUN(TUXBOX_APPS_LIB_CONFIG,[ -_TUXBOX_APPS_LIB_CONFIG($1,$2,ERROR) -if test "$$1_CONFIG" = "no"; then - AC_MSG_ERROR([could not find $2]); -fi -]) - -AC_DEFUN(TUXBOX_APPS_LIB_CONFIG_CHECK,[ -_TUXBOX_APPS_LIB_CONFIG($1,$2,WARN) -]) - -AC_DEFUN(TUXBOX_APPS_PKGCONFIG,[ -AC_PATH_PROG(PKG_CONFIG, pkg-config,no) -if test "$PKG_CONFIG" = "no" ; then - AC_MSG_ERROR([could not find pkg-config]); -fi -]) - -AC_DEFUN(_TUXBOX_APPS_LIB_PKGCONFIG,[ -AC_REQUIRE([TUXBOX_APPS_PKGCONFIG]) -AC_MSG_CHECKING(for package $2) -if PKG_CONFIG_PATH="${prefix}/lib/pkgconfig" $PKG_CONFIG --exists "$2" ; then - AC_MSG_RESULT(yes) - $1_CFLAGS=$(PKG_CONFIG_PATH="${prefix}/lib/pkgconfig" $PKG_CONFIG --cflags "$2") - $1_LIBS=$(PKG_CONFIG_PATH="${prefix}/lib/pkgconfig" $PKG_CONFIG --libs "$2") -else - AC_MSG_RESULT(no) -fi - -AC_SUBST($1_CFLAGS) -AC_SUBST($1_LIBS) -]) - -AC_DEFUN(TUXBOX_APPS_LIB_PKGCONFIG,[ -_TUXBOX_APPS_LIB_PKGCONFIG($1,$2) -if test -z "$$1_CFLAGS" ; then - AC_MSG_ERROR([could not find package $2]); -fi -]) - -AC_DEFUN(TUXBOX_APPS_LIB_PKGCONFIG_CHECK,[ -_TUXBOX_APPS_LIB_PKGCONFIG($1,$2) -]) - -AC_DEFUN(_TUXBOX_APPS_LIB_SYMBOL,[ -AC_CHECK_LIB($2,$3,HAVE_$1="yes",HAVE_$1="no") -if test "$HAVE_$1" = "yes"; then - $1_LIBS=-l$2 -fi - -AC_SUBST($1_LIBS) -]) - -AC_DEFUN(TUXBOX_APPS_LIB_SYMBOL,[ -_TUXBOX_APPS_LIB_SYMBOL($1,$2,$3,ERROR) -if test "$HAVE_$1" = "no"; then - AC_MSG_ERROR([could not find $2]); -fi -]) - -AC_DEFUN(TUXBOX_APPS_LIB_CONFIG_SYMBOL,[ -_TUXBOX_APPS_LIB_SYMBOL($1,$2,$3,WARN) -]) - -AC_DEFUN(TUXBOX_APPS_GETTEXT,[ -AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 && - (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], - :) -AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - -AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [$ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 && - (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], - :) - -AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,[$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1],:) - -AC_MSG_CHECKING([whether NLS is requested]) -AC_ARG_ENABLE(nls, - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) -AC_MSG_RESULT($USE_NLS) -AC_SUBST(USE_NLS) - -if test "$USE_NLS" = "yes"; then - AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,[ - AC_TRY_LINK([ - #include - #ifndef __GNU_GETTEXT_SUPPORTED_REVISION - #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) - #endif - extern int _nl_msg_cat_cntr; - extern int *_nl_domain_bindings; - ],[ - bindtextdomain ("", ""); - return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings; - ], gt_cv_func_gnugettext_libc=yes, gt_cv_func_gnugettext_libc=no - )] - ) - - if test "$gt_cv_func_gnugettext_libc" = "yes"; then - AC_DEFINE(ENABLE_NLS, 1, [Define to 1 if translation of program messages to the user's native language is requested.]) - gt_use_preinstalled_gnugettext=yes - else - USE_NLS=no - fi -fi - -if test -f "$srcdir/po/LINGUAS"; then - ALL_LINGUAS=$(sed -e "/^#/d" "$srcdir/po/LINGUAS") -fi - -POFILES= -GMOFILES= -UPDATEPOFILES= -DUMMYPOFILES= -for lang in $ALL_LINGUAS; do - POFILES="$POFILES $srcdirpre$lang.po" - GMOFILES="$GMOFILES $srcdirpre$lang.gmo" - UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" - DUMMYPOFILES="$DUMMYPOFILES $lang.nop" -done -INST_LINGUAS= -if test -n "$ALL_LINGUAS"; then - for presentlang in $ALL_LINGUAS; do - useit=no - if test -n "$LINGUAS"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - INST_LINGUAS="$INST_LINGUAS $presentlang" - fi - done -fi -CATALOGS= -if test -n "$INST_LINGUAS"; then - for lang in $INST_LINGUAS; do - CATALOGS="$CATALOGS $lang.gmo" - done -fi -AC_SUBST(POFILES) -AC_SUBST(GMOFILES) -AC_SUBST(UPDATEPOFILES) -AC_SUBST(DUMMYPOFILES) -AC_SUBST(CATALOGS) -]) - - - -AC_DEFUN([AC_GNU_SOURCE], -[AH_VERBATIM([_GNU_SOURCE], -[/* Enable GNU extensions on systems that have them. */ -#ifndef _GNU_SOURCE -# undef _GNU_SOURCE -#endif])dnl -AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl -AC_BEFORE([$0], [AC_RUN_IFELSE])dnl -AC_DEFINE([_GNU_SOURCE]) -]) - diff --git a/aclocal.m4 b/aclocal.m4 deleted file mode 100644 index e69de29..0000000 diff --git a/lib/.cvsignore b/lib/.cvsignore new file mode 100644 index 0000000..e995588 --- /dev/null +++ b/lib/.cvsignore @@ -0,0 +1,3 @@ +.deps +Makefile +Makefile.in diff --git a/lib/Makefile.in b/lib/Makefile.in deleted file mode 100644 index e69de29..0000000 diff --git a/lib/base/.cvsignore b/lib/base/.cvsignore new file mode 100644 index 0000000..e995588 --- /dev/null +++ b/lib/base/.cvsignore @@ -0,0 +1,3 @@ +.deps +Makefile +Makefile.in diff --git a/lib/base/Makefile.in b/lib/base/Makefile.in deleted file mode 100644 index e69de29..0000000 diff --git a/lib/driver/.cvsignore b/lib/driver/.cvsignore new file mode 100644 index 0000000..e995588 --- /dev/null +++ b/lib/driver/.cvsignore @@ -0,0 +1,3 @@ +.deps +Makefile +Makefile.in diff --git a/lib/driver/Makefile.in b/lib/driver/Makefile.in deleted file mode 100644 index e69de29..0000000 diff --git a/lib/dvb/.cvsignore b/lib/dvb/.cvsignore new file mode 100644 index 0000000..e995588 --- /dev/null +++ b/lib/dvb/.cvsignore @@ -0,0 +1,3 @@ +.deps +Makefile +Makefile.in diff --git a/lib/dvb/Makefile.in b/lib/dvb/Makefile.in deleted file mode 100644 index e69de29..0000000 diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp index b3c4b2c..e8c6b47 100644 --- a/lib/dvb/sec.cpp +++ b/lib/dvb/sec.cpp @@ -25,7 +25,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, struct dvb // frontend.sentDiseqc(...); - parm.inversion = sat.inversion ? INVERSION_ON : INVERSION_OFF; + parm.inversion = (!sat.inversion) ? INVERSION_ON : INVERSION_OFF; switch (sat.fec) { diff --git a/lib/dvb_si/.cvsignore b/lib/dvb_si/.cvsignore new file mode 100644 index 0000000..e69de29 diff --git a/lib/dvb_si/Makefile.in b/lib/dvb_si/Makefile.in deleted file mode 100644 index e69de29..0000000 diff --git a/lib/gdi/.cvsignore b/lib/gdi/.cvsignore index 316b06f..e995588 100644 --- a/lib/gdi/.cvsignore +++ b/lib/gdi/.cvsignore @@ -1,7 +1,3 @@ -*.moc.* +.deps Makefile Makefile.in -.deps -.libs -*.lo -*.la diff --git a/lib/gdi/lcd.cpp b/lib/gdi/lcd.cpp index 844ad08..33eb619 100644 --- a/lib/gdi/lcd.cpp +++ b/lib/gdi/lcd.cpp @@ -1,3 +1,4 @@ +#if 0 #ifndef DISABLE_LCD #include @@ -208,3 +209,4 @@ public: eAutoInitP0 init_eDBoxLCDHardware(eAutoInitNumbers::lowlevel, "d-Box LCD Hardware"); #endif //DISABLE_LCD +#endif diff --git a/lib/nav/.cvsignore b/lib/nav/.cvsignore new file mode 100644 index 0000000..e995588 --- /dev/null +++ b/lib/nav/.cvsignore @@ -0,0 +1,3 @@ +.deps +Makefile +Makefile.in diff --git a/lib/network/.cvsignore b/lib/network/.cvsignore new file mode 100644 index 0000000..e995588 --- /dev/null +++ b/lib/network/.cvsignore @@ -0,0 +1,3 @@ +.deps +Makefile +Makefile.in diff --git a/lib/network/Makefile.in b/lib/network/Makefile.in deleted file mode 100644 index e69de29..0000000 diff --git a/lib/service/.cvsignore b/lib/service/.cvsignore new file mode 100644 index 0000000..e995588 --- /dev/null +++ b/lib/service/.cvsignore @@ -0,0 +1,3 @@ +.deps +Makefile +Makefile.in diff --git a/lib/service/Makefile.in b/lib/service/Makefile.in deleted file mode 100644 index e69de29..0000000 -- 2.7.4