Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3561 in orxonox.OLD for orxonox/branches/levelloader


Ignore:
Timestamp:
Mar 15, 2005, 5:59:44 PM (20 years ago)
Author:
bensch
Message:

orxonox/branches: deleted obsolete branche trackManager. all necessary data already moved into the trunk

Location:
orxonox/branches/levelloader
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/levelloader/Makefile.in

    r3530 r3561  
    1 # Makefile.in generated by automake 1.8.2 from Makefile.am.
     1# Makefile.in generated by automake 1.8.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    3838        $(srcdir)/Makefile.in $(srcdir)/config.h.in \
    3939        $(srcdir)/doc/documentation.am $(top_srcdir)/configure AUTHORS \
    40         COPYING ChangeLog INSTALL NEWS TODO config.guess config.sub \
    41         depcomp install-sh missing mkinstalldirs
     40        COPYING ChangeLog INSTALL NEWS config.guess config.sub depcomp \
     41        install-sh missing mkinstalldirs
    4242subdir = .
    4343ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    … …  
    326326        tags=; \
    327327        here=`pwd`; \
    328         if (etags --etags-include --version) >/dev/null 2>&1; then \
     328        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
    329329          include_option=--etags-include; \
     330          empty_fix=.; \
    330331        else \
    331332          include_option=--include; \
     333          empty_fix=; \
    332334        fi; \
    333335        list='$(SUBDIRS)'; for subdir in $$list; do \
    334336          if test "$$subdir" = .; then :; else \
    335             test -f $$subdir/TAGS && \
     337            test ! -f $$subdir/TAGS || \
    336338              tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
    337339          fi; \
    … …  
    343345          $(AWK) '    { files[$$0] = 1; } \
    344346               END { for (i in files) print i; }'`; \
    345         test -z "$(ETAGS_ARGS)$$tags$$unique" \
    346           || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
    347              $$tags $$unique
     347        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
     348          test -n "$$unique" || unique=$$empty_fix; \
     349          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     350            $$tags $$unique; \
     351        fi
    348352ctags: CTAGS
    349353CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
    … …  
    454458          uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
    455459        *.shar.gz*) \
    456           GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\
     460          GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
    457461        *.zip*) \
    458462          unzip $(distdir).zip ;;\
    … …  
    477481          && chmod -R a-w "$$dc_install_base" \
    478482          && ({ \
    479                (cd ../.. && $(mkdir_p) "$$dc_destdir") \
     483               (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
    480484               && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
    481485               && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \

  • orxonox/branches/levelloader/aclocal.m4

    r3530 r3561  
    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/levelloader/configure

    r3530 r3561  
    15991599fi
    16001600
    1601 if mkdir -p -- . 2>/dev/null; then
     1601if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
    16021602  # Keeping the `.' argument allows $(mkdir_p) to be used without
    16031603  # argument.  Indeed, we sometimes output rules like
    … …  
    16121612  # directories to create, and then abort because `.' already
    16131613  # exists.
    1614   for d in ./-p ./--;
     1614  for d in ./-p ./--version;
    16151615  do
    16161616    test -d $d && rmdir $d
    … …  
    25182518    for i in 1 2 3 4 5 6; do
    25192519      echo '#include "conftst'$i'.h"' >> sub/conftest.c
    2520       : > sub/conftst$i.h
     2520      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
     2521      # Solaris 8's {/usr,}/bin/sh.
     2522      touch sub/conftst$i.h
    25212523    done
    25222524    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
    … …  
    25462548       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
    25472549      # icc doesn't choke on unknown options, it will just issue warnings
    2548       # (even with -Werror).  So we grep stderr for any message
    2549       # that says an option was ignored.
    2550       if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
     2550      # or remarks (even with -Werror).  So we grep stderr for any message
     2551      # that says an option was ignored or not supported.
     2552      # When given -MP, icc 7.0 and 7.1 complain thusly:
     2553      #   icc: Command line warning: ignoring option '-M'; no argument required
     2554      # The diagnosis changed in icc 8.0:
     2555      #   icc: Command line remark: option '-MP' not supported
     2556      if (grep 'ignoring option' conftest.err ||
     2557          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
    25512558        am_cv_CXX_dependencies_compiler_type=$depmode
    25522559        break
    … …  
    33493356    for i in 1 2 3 4 5 6; do
    33503357      echo '#include "conftst'$i'.h"' >> sub/conftest.c
    3351       : > sub/conftst$i.h
     3358      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
     3359      # Solaris 8's {/usr,}/bin/sh.
     3360      touch sub/conftst$i.h
    33523361    done
    33533362    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
    … …  
    33773386       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
    33783387      # icc doesn't choke on unknown options, it will just issue warnings
    3379       # (even with -Werror).  So we grep stderr for any message
    3380       # that says an option was ignored.
    3381       if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
     3388      # or remarks (even with -Werror).  So we grep stderr for any message
     3389      # that says an option was ignored or not supported.
     3390      # When given -MP, icc 7.0 and 7.1 complain thusly:
     3391      #   icc: Command line warning: ignoring option '-M'; no argument required
     3392      # The diagnosis changed in icc 8.0:
     3393      #   icc: Command line remark: option '-MP' not supported
     3394      if (grep 'ignoring option' conftest.err ||
     3395          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
    33823396        am_cv_CC_dependencies_compiler_type=$depmode
    33833397        break
    … …  
    95599573  # Extract the definition of DEP_FILES from the Makefile without
    95609574  # running `make'.
    9561   DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
     9575  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
    95629576  test -z "$DEPDIR" && continue
    95639577  # When using ansi2knr, U may be empty or an underscore; expand it
    9564   U=`sed -n -e '/^U = / s///p' < "$mf"`
     9578  U=`sed -n 's/^U = //p' < "$mf"`
    95659579  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
    95669580  # We invoke sed twice because it is the simplest approach to
    95679581  # changing $(DEPDIR) to its actual value in the expansion.
    9568   for file in `sed -n -e '
     9582  for file in `sed -n '
    95699583    /^DEP_FILES = .*\\\\$/ {
    95709584      s/^DEP_FILES = //

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

    r3525 r3561  
    1 # Makefile.in generated by automake 1.8.2 from Makefile.am.
     1# Makefile.in generated by automake 1.8.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    5050CONFIG_HEADER = $(top_builddir)/config.h
    5151CONFIG_CLEAN_FILES =
    52 am__installdirs = $(DESTDIR)$(bindir)
     52am__installdirs = "$(DESTDIR)$(bindir)"
    5353binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
    5454PROGRAMS = $(bin_PROGRAMS)
    … …  
    350350install-binPROGRAMS: $(bin_PROGRAMS)
    351351        @$(NORMAL_INSTALL)
    352         $(mkdir_p) $(DESTDIR)$(bindir)
     352        test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
    353353        @list='$(bin_PROGRAMS)'; for p in $$list; do \
    354354          p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
    … …  
    356356          ; then \
    357357            f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
    358            echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
    359            $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
     358           echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
     359           $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
    360360          else :; fi; \
    361361        done
    … …  
    365365        @list='$(bin_PROGRAMS)'; for p in $$list; do \
    366366          f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
    367           echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
    368           rm -f $(DESTDIR)$(bindir)/$$f; \
     367          echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
     368          rm -f "$(DESTDIR)$(bindir)/$$f"; \
    369369        done
    370370
    … …  
    10071007        tags=; \
    10081008        here=`pwd`; \
    1009         if (etags --etags-include --version) >/dev/null 2>&1; then \
     1009        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
    10101010          include_option=--etags-include; \
     1011          empty_fix=.; \
    10111012        else \
    10121013          include_option=--include; \
     1014          empty_fix=; \
    10131015        fi; \
    10141016        list='$(SUBDIRS)'; for subdir in $$list; do \
    10151017          if test "$$subdir" = .; then :; else \
    1016             test -f $$subdir/TAGS && \
     1018            test ! -f $$subdir/TAGS || \
    10171019              tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
    10181020          fi; \
    … …  
    10241026          $(AWK) '    { files[$$0] = 1; } \
    10251027               END { for (i in files) print i; }'`; \
    1026         test -z "$(ETAGS_ARGS)$$tags$$unique" \
    1027           || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
    1028              $$tags $$unique
     1028        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
     1029          test -n "$$unique" || unique=$$empty_fix; \
     1030          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     1031            $$tags $$unique; \
     1032        fi
    10291033ctags: CTAGS
    10301034CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
    … …  
    10961100installdirs: installdirs-recursive
    10971101installdirs-am:
    1098         $(mkdir_p) $(DESTDIR)$(bindir)
     1102        for dir in "$(DESTDIR)$(bindir)"; do \
     1103          test -z "$$dir" || $(mkdir_p) "$$dir"; \
     1104        done
    10991105install: install-recursive
    11001106install-exec: install-exec-recursive

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

    r3525 r3561  
    1 # Makefile.in generated by automake 1.8.2 from Makefile.am.
     1# Makefile.in generated by automake 1.8.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    276276        tags=; \
    277277        here=`pwd`; \
    278         if (etags --etags-include --version) >/dev/null 2>&1; then \
     278        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
    279279          include_option=--etags-include; \
     280          empty_fix=.; \
    280281        else \
    281282          include_option=--include; \
     283          empty_fix=; \
    282284        fi; \
    283285        list='$(SUBDIRS)'; for subdir in $$list; do \
    284286          if test "$$subdir" = .; then :; else \
    285             test -f $$subdir/TAGS && \
     287            test ! -f $$subdir/TAGS || \
    286288              tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
    287289          fi; \
    … …  
    293295          $(AWK) '    { files[$$0] = 1; } \
    294296               END { for (i in files) print i; }'`; \
    295         test -z "$(ETAGS_ARGS)$$tags$$unique" \
    296           || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
    297              $$tags $$unique
     297        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
     298          test -n "$$unique" || unique=$$empty_fix; \
     299          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     300            $$tags $$unique; \
     301        fi
    298302ctags: CTAGS
    299303CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

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

    r3525 r3561  
    1 # Makefile.in generated by automake 1.8.2 from Makefile.am.
     1# Makefile.in generated by automake 1.8.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    270270        tags=; \
    271271        here=`pwd`; \
    272         if (etags --etags-include --version) >/dev/null 2>&1; then \
     272        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
    273273          include_option=--etags-include; \
     274          empty_fix=.; \
    274275        else \
    275276          include_option=--include; \
     277          empty_fix=; \
    276278        fi; \
    277279        list='$(SUBDIRS)'; for subdir in $$list; do \
    278280          if test "$$subdir" = .; then :; else \
    279             test -f $$subdir/TAGS && \
     281            test ! -f $$subdir/TAGS || \
    280282              tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
    281283          fi; \
    … …  
    287289          $(AWK) '    { files[$$0] = 1; } \
    288290               END { for (i in files) print i; }'`; \
    289         test -z "$(ETAGS_ARGS)$$tags$$unique" \
    290           || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
    291              $$tags $$unique
     291        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
     292          test -n "$$unique" || unique=$$empty_fix; \
     293          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     294            $$tags $$unique; \
     295        fi
    292296ctags: CTAGS
    293297CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

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

    r3525 r3561  
    1 # Makefile.in generated by automake 1.8.2 from Makefile.am.
     1# Makefile.in generated by automake 1.8.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    4242subdir = src/lib/graphics/importer
    4343DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
    44         $(srcdir)/Makefile.in TODO
     44        $(srcdir)/Makefile.in
    4545ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    4646am__aclocal_m4_deps = $(top_srcdir)/configure.ac
    … …  
    5050CONFIG_HEADER = $(top_builddir)/config.h
    5151CONFIG_CLEAN_FILES =
    52 am__installdirs = $(DESTDIR)$(bindir)
     52am__installdirs = "$(DESTDIR)$(bindir)"
    5353binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
    5454PROGRAMS = $(bin_PROGRAMS)
    … …  
    237237install-binPROGRAMS: $(bin_PROGRAMS)
    238238        @$(NORMAL_INSTALL)
    239         $(mkdir_p) $(DESTDIR)$(bindir)
     239        test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
    240240        @list='$(bin_PROGRAMS)'; for p in $$list; do \
    241241          p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
    … …  
    243243          ; then \
    244244            f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
    245            echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
    246            $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
     245           echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
     246           $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
    247247          else :; fi; \
    248248        done
    … …  
    252252        @list='$(bin_PROGRAMS)'; for p in $$list; do \
    253253          f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
    254           echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
    255           rm -f $(DESTDIR)$(bindir)/$$f; \
     254          echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
     255          rm -f "$(DESTDIR)$(bindir)/$$f"; \
    256256        done
    257257
    … …  
    330330          $(AWK) '    { files[$$0] = 1; } \
    331331               END { for (i in files) print i; }'`; \
    332         test -z "$(ETAGS_ARGS)$$tags$$unique" \
    333           || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
    334              $$tags $$unique
     332        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
     333          test -n "$$unique" || unique=$$empty_fix; \
     334          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     335            $$tags $$unique; \
     336        fi
    335337ctags: CTAGS
    336338CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
    … …  
    387389all-am: Makefile $(PROGRAMS) $(HEADERS)
    388390installdirs:
    389         $(mkdir_p) $(DESTDIR)$(bindir)
     391        for dir in "$(DESTDIR)$(bindir)"; do \
     392          test -z "$$dir" || $(mkdir_p) "$$dir"; \
     393        done
    390394install: install-am
    391395install-exec: install-exec-am

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

    r3525 r3561  
    1 # Makefile.in generated by automake 1.8.2 from Makefile.am.
     1# Makefile.in generated by automake 1.8.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    272272        tags=; \
    273273        here=`pwd`; \
    274         if (etags --etags-include --version) >/dev/null 2>&1; then \
     274        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
    275275          include_option=--etags-include; \
     276          empty_fix=.; \
    276277        else \
    277278          include_option=--include; \
     279          empty_fix=; \
    278280        fi; \
    279281        list='$(SUBDIRS)'; for subdir in $$list; do \
    280282          if test "$$subdir" = .; then :; else \
    281             test -f $$subdir/TAGS && \
     283            test ! -f $$subdir/TAGS || \
    282284              tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
    283285          fi; \
    … …  
    289291          $(AWK) '    { files[$$0] = 1; } \
    290292               END { for (i in files) print i; }'`; \
    291         test -z "$(ETAGS_ARGS)$$tags$$unique" \
    292           || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
    293              $$tags $$unique
     293        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
     294          test -n "$$unique" || unique=$$empty_fix; \
     295          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     296            $$tags $$unique; \
     297        fi
    294298ctags: CTAGS
    295299CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

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

    r3525 r3561  
    1 # Makefile.in generated by automake 1.8.2 from Makefile.am.
     1# Makefile.in generated by automake 1.8.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    5050CONFIG_HEADER = $(top_builddir)/config.h
    5151CONFIG_CLEAN_FILES =
    52 am__installdirs = $(DESTDIR)$(bindir)
     52am__installdirs = "$(DESTDIR)$(bindir)"
    5353binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
    5454PROGRAMS = $(bin_PROGRAMS)
    … …  
    225225install-binPROGRAMS: $(bin_PROGRAMS)
    226226        @$(NORMAL_INSTALL)
    227         $(mkdir_p) $(DESTDIR)$(bindir)
     227        test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
    228228        @list='$(bin_PROGRAMS)'; for p in $$list; do \
    229229          p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
    … …  
    231231          ; then \
    232232            f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
    233            echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
    234            $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
     233           echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
     234           $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
    235235          else :; fi; \
    236236        done
    … …  
    240240        @list='$(bin_PROGRAMS)'; for p in $$list; do \
    241241          f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
    242           echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
    243           rm -f $(DESTDIR)$(bindir)/$$f; \
     242          echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
     243          rm -f "$(DESTDIR)$(bindir)/$$f"; \
    244244        done
    245245
    … …  
    297297          $(AWK) '    { files[$$0] = 1; } \
    298298               END { for (i in files) print i; }'`; \
    299         test -z "$(ETAGS_ARGS)$$tags$$unique" \
    300           || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
    301              $$tags $$unique
     299        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
     300          test -n "$$unique" || unique=$$empty_fix; \
     301          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     302            $$tags $$unique; \
     303        fi
    302304ctags: CTAGS
    303305CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
    … …  
    354356all-am: Makefile $(PROGRAMS) $(HEADERS)
    355357installdirs:
    356         $(mkdir_p) $(DESTDIR)$(bindir)
     358        for dir in "$(DESTDIR)$(bindir)"; do \
     359          test -z "$$dir" || $(mkdir_p) "$$dir"; \
     360        done
    357361install: install-am
    358362install-exec: install-exec-am

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

    r3525 r3561  
    1 # Makefile.in generated by automake 1.8.2 from Makefile.am.
     1# Makefile.in generated by automake 1.8.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    5050CONFIG_HEADER = $(top_builddir)/config.h
    5151CONFIG_CLEAN_FILES =
    52 am__installdirs = $(DESTDIR)$(bindir)
     52am__installdirs = "$(DESTDIR)$(bindir)"
    5353binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
    5454PROGRAMS = $(bin_PROGRAMS)
    … …  
    258258install-binPROGRAMS: $(bin_PROGRAMS)
    259259        @$(NORMAL_INSTALL)
    260         $(mkdir_p) $(DESTDIR)$(bindir)
     260        test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
    261261        @list='$(bin_PROGRAMS)'; for p in $$list; do \
    262262          p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
    … …  
    264264          ; then \
    265265            f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
    266            echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
    267            $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
     266           echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
     267           $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
    268268          else :; fi; \
    269269        done
    … …  
    273273        @list='$(bin_PROGRAMS)'; for p in $$list; do \
    274274          f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
    275           echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
    276           rm -f $(DESTDIR)$(bindir)/$$f; \
     275          echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
     276          rm -f "$(DESTDIR)$(bindir)/$$f"; \
    277277        done
    278278
    … …  
    336336          $(AWK) '    { files[$$0] = 1; } \
    337337               END { for (i in files) print i; }'`; \
    338         test -z "$(ETAGS_ARGS)$$tags$$unique" \
    339           || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
    340              $$tags $$unique
     338        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
     339          test -n "$$unique" || unique=$$empty_fix; \
     340          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     341            $$tags $$unique; \
     342        fi
    341343ctags: CTAGS
    342344CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
    … …  
    393395all-am: Makefile $(PROGRAMS) $(HEADERS)
    394396installdirs:
    395         $(mkdir_p) $(DESTDIR)$(bindir)
     397        for dir in "$(DESTDIR)$(bindir)"; do \
     398          test -z "$$dir" || $(mkdir_p) "$$dir"; \
     399        done
    396400install: install-am
    397401install-exec: install-exec-am
Note: See TracChangeset for help on using the changeset viewer.