Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4014 in orxonox.OLD


Ignore:
Timestamp:
May 2, 2005, 6:06:39 PM (19 years ago)
Author:
patrick
Message:

added branche movie_player for the mpeg develpment team

Location:
orxonox/branches/movie_player
Files:
11 edited
1 copied

Legend:

Unmodified
Added
Removed

  • orxonox/branches/movie_player/aclocal.m4

    r4010 r4014  
    1 # generated automatically by aclocal 1.8.2 -*- Autoconf -*-
     1# generated automatically by aclocal 1.8.5 -*- Autoconf -*-
    22
    33# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
    … …  
    4141# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
    4242AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
    43          [AM_AUTOMAKE_VERSION([1.8.2])])
     43         [AM_AUTOMAKE_VERSION([1.8.5])])
    4444
    4545# AM_AUX_DIR_EXPAND
    … …  
    150150fi])])
    151151
    152 # serial 6                                              -*- Autoconf -*-
     152# serial 7                                              -*- Autoconf -*-
    153153
    154154# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
    … …  
    237237    for i in 1 2 3 4 5 6; do
    238238      echo '#include "conftst'$i'.h"' >> sub/conftest.c
    239       : > sub/conftst$i.h
     239      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
     240      # Solaris 8's {/usr,}/bin/sh.
     241      touch sub/conftst$i.h
    240242    done
    241243    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
    … …  
    265267       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
    266268      # icc doesn't choke on unknown options, it will just issue warnings
    267       # (even with -Werror).  So we grep stderr for any message
    268       # that says an option was ignored.
    269       if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
     269      # or remarks (even with -Werror).  So we grep stderr for any message
     270      # that says an option was ignored or not supported.
     271      # When given -MP, icc 7.0 and 7.1 complain thusly:
     272      #   icc: Command line warning: ignoring option '-M'; no argument required
     273      # The diagnosis changed in icc 8.0:
     274      #   icc: Command line remark: option '-MP' not supported
     275      if (grep 'ignoring option' conftest.err ||
     276          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
    270277        am_cv_$1_dependencies_compiler_type=$depmode
    271278        break
    … …  
    313320# Generate code to set up dependency tracking.   -*- Autoconf -*-
    314321
    315 # Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
     322# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
    316323
    317324# This program is free software; you can redistribute it and/or modify
    … …  
    352359  # Extract the definition of DEP_FILES from the Makefile without
    353360  # running `make'.
    354   DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
     361  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
    355362  test -z "$DEPDIR" && continue
    356363  # When using ansi2knr, U may be empty or an underscore; expand it
    357   U=`sed -n -e '/^U = / s///p' < "$mf"`
     364  U=`sed -n 's/^U = //p' < "$mf"`
    358365  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
    359366  # We invoke sed twice because it is the simplest approach to
    360367  # changing $(DEPDIR) to its actual value in the expansion.
    361   for file in `sed -n -e '
     368  for file in `sed -n '
    362369    /^DEP_FILES = .*\\\\$/ {
    363370      s/^DEP_FILES = //
    … …  
    718725# Do not use -m 0755 and let people choose whatever they expect by
    719726# setting umask.
     727#
     728# We cannot accept any implementation of `mkdir' that recognizes `-p'.
     729# Some implementations (such as Solaris 8's) are not thread-safe: if a
     730# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
     731# concurrently, both version can detect that a/ is missing, but only
     732# one can create it and the other will error out.  Consequently we
     733# restrict ourselves to GNU make (using the --version option ensures
     734# this.)
    720735AC_DEFUN([AM_PROG_MKDIR_P],
    721 [if mkdir -p -- . 2>/dev/null; then
     736[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
    722737  # Keeping the `.' argument allows $(mkdir_p) to be used without
    723738  # argument.  Indeed, we sometimes output rules like
    … …  
    732747  # directories to create, and then abort because `.' already
    733748  # exists.
    734   for d in ./-p ./--;
     749  for d in ./-p ./--version;
    735750  do
    736751    test -d $d && rmdir $d

  • orxonox/branches/movie_player/configure

    r4010 r4014  
    16041604fi
    16051605
    1606 if mkdir -p -- . 2>/dev/null; then
     1606if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
    16071607  # Keeping the `.' argument allows $(mkdir_p) to be used without
    16081608  # argument.  Indeed, we sometimes output rules like
    … …  
    16171617  # directories to create, and then abort because `.' already
    16181618  # exists.
    1619   for d in ./-p ./--;
     1619  for d in ./-p ./--version;
    16201620  do
    16211621    test -d $d && rmdir $d
    … …  
    25232523    for i in 1 2 3 4 5 6; do
    25242524      echo '#include "conftst'$i'.h"' >> sub/conftest.c
    2525       : > sub/conftst$i.h
     2525      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
     2526      # Solaris 8's {/usr,}/bin/sh.
     2527      touch sub/conftst$i.h
    25262528    done
    25272529    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
    … …  
    25512553       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
    25522554      # icc doesn't choke on unknown options, it will just issue warnings
    2553       # (even with -Werror).  So we grep stderr for any message
    2554       # that says an option was ignored.
    2555       if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
     2555      # or remarks (even with -Werror).  So we grep stderr for any message
     2556      # that says an option was ignored or not supported.
     2557      # When given -MP, icc 7.0 and 7.1 complain thusly:
     2558      #   icc: Command line warning: ignoring option '-M'; no argument required
     2559      # The diagnosis changed in icc 8.0:
     2560      #   icc: Command line remark: option '-MP' not supported
     2561      if (grep 'ignoring option' conftest.err ||
     2562          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
    25562563        am_cv_CXX_dependencies_compiler_type=$depmode
    25572564        break
    … …  
    33543361    for i in 1 2 3 4 5 6; do
    33553362      echo '#include "conftst'$i'.h"' >> sub/conftest.c
    3356       : > sub/conftst$i.h
     3363      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
     3364      # Solaris 8's {/usr,}/bin/sh.
     3365      touch sub/conftst$i.h
    33573366    done
    33583367    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
    … …  
    33823391       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
    33833392      # icc doesn't choke on unknown options, it will just issue warnings
    3384       # (even with -Werror).  So we grep stderr for any message
    3385       # that says an option was ignored.
    3386       if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
     3393      # or remarks (even with -Werror).  So we grep stderr for any message
     3394      # that says an option was ignored or not supported.
     3395      # When given -MP, icc 7.0 and 7.1 complain thusly:
     3396      #   icc: Command line warning: ignoring option '-M'; no argument required
     3397      # The diagnosis changed in icc 8.0:
     3398      #   icc: Command line remark: option '-MP' not supported
     3399      if (grep 'ignoring option' conftest.err ||
     3400          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
    33873401        am_cv_CC_dependencies_compiler_type=$depmode
    33883402        break
    … …  
    95259539  # Extract the definition of DEP_FILES from the Makefile without
    95269540  # running `make'.
    9527   DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
     9541  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
    95289542  test -z "$DEPDIR" && continue
    95299543  # When using ansi2knr, U may be empty or an underscore; expand it
    9530   U=`sed -n -e '/^U = / s///p' < "$mf"`
     9544  U=`sed -n 's/^U = //p' < "$mf"`
    95319545  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
    95329546  # We invoke sed twice because it is the simplest approach to
    95339547  # changing $(DEPDIR) to its actual value in the expansion.
    9534   for file in `sed -n -e '
     9548  for file in `sed -n '
    95359549    /^DEP_FILES = .*\\\\$/ {
    95369550      s/^DEP_FILES = //

  • orxonox/branches/movie_player/src/Makefile.in

    r4010 r4014  
    393393          esac; \
    394394        done; \
    395         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
     395        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
    396396        cd $(top_srcdir) && \
    397           $(AUTOMAKE) --foreign  src/Makefile
     397          $(AUTOMAKE) --gnu  src/Makefile
    398398.PRECIOUS: Makefile
    399399Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/branches/movie_player/src/lib/Makefile.in

    r3789 r4014  
    184184          esac; \
    185185        done; \
    186         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/Makefile'; \
     186        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/Makefile'; \
    187187        cd $(top_srcdir) && \
    188           $(AUTOMAKE) --foreign  src/lib/Makefile
     188          $(AUTOMAKE) --gnu  src/lib/Makefile
    189189.PRECIOUS: Makefile
    190190Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/branches/movie_player/src/lib/graphics/Makefile.in

    r3789 r4014  
    178178          esac; \
    179179        done; \
    180         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/Makefile'; \
     180        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/Makefile'; \
    181181        cd $(top_srcdir) && \
    182           $(AUTOMAKE) --foreign  src/lib/graphics/Makefile
     182          $(AUTOMAKE) --gnu  src/lib/graphics/Makefile
    183183.PRECIOUS: Makefile
    184184Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/branches/movie_player/src/lib/graphics/importer/Makefile.in

    r3907 r4014  
    236236          esac; \
    237237        done; \
    238         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile'; \
     238        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile'; \
    239239        cd $(top_srcdir) && \
    240           $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile
     240          $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile
    241241.PRECIOUS: Makefile
    242242Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/branches/movie_player/src/lib/gui/Makefile.in

    r3789 r4014  
    180180          esac; \
    181181        done; \
    182         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/Makefile'; \
     182        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/Makefile'; \
    183183        cd $(top_srcdir) && \
    184           $(AUTOMAKE) --foreign  src/lib/gui/Makefile
     184          $(AUTOMAKE) --gnu  src/lib/gui/Makefile
    185185.PRECIOUS: Makefile
    186186Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/branches/movie_player/src/lib/gui/console/Makefile.in

    r3789 r4014  
    206206          esac; \
    207207        done; \
    208         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/console/Makefile'; \
     208        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/console/Makefile'; \
    209209        cd $(top_srcdir) && \
    210           $(AUTOMAKE) --foreign  src/lib/gui/console/Makefile
     210          $(AUTOMAKE) --gnu  src/lib/gui/console/Makefile
    211211.PRECIOUS: Makefile
    212212Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/branches/movie_player/src/lib/gui/gui/Makefile.in

    r3789 r4014  
    240240          esac; \
    241241        done; \
    242         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/gui/Makefile'; \
     242        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/gui/Makefile'; \
    243243        cd $(top_srcdir) && \
    244           $(AUTOMAKE) --foreign  src/lib/gui/gui/Makefile
     244          $(AUTOMAKE) --gnu  src/lib/gui/gui/Makefile
    245245.PRECIOUS: Makefile
    246246Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/branches/movie_player/src/subprojects/Makefile.in

    r3789 r4014  
    178178          esac; \
    179179        done; \
    180         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/Makefile'; \
     180        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/Makefile'; \
    181181        cd $(top_srcdir) && \
    182           $(AUTOMAKE) --foreign  src/subprojects/Makefile
     182          $(AUTOMAKE) --gnu  src/subprojects/Makefile
    183183.PRECIOUS: Makefile
    184184Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/branches/movie_player/src/subprojects/testmain/Makefile.in

    r3789 r4014  
    198198          esac; \
    199199        done; \
    200         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/testmain/Makefile'; \
     200        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/testmain/Makefile'; \
    201201        cd $(top_srcdir) && \
    202           $(AUTOMAKE) --foreign  src/subprojects/testmain/Makefile
     202          $(AUTOMAKE) --gnu  src/subprojects/testmain/Makefile
    203203.PRECIOUS: Makefile
    204204Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Note: See TracChangeset for help on using the changeset viewer.