Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3525 in orxonox.OLD for orxonox/branches/levelloader/src/lib


Ignore:
Timestamp:
Mar 13, 2005, 6:59:20 PM (20 years ago)
Author:
chris
Message:

orxonox/branches/levelloader: removed excess class usage adn messed with makefile definitions

Location:
orxonox/branches/levelloader/src/lib
Files:
9 added
6 edited

Legend:

Unmodified
Added
Removed
  • orxonox/branches/levelloader/src/lib/Makefile.in

    r3499 r3525  
    1 # Makefile.in generated by automake 1.8.5 from Makefile.am.
     1# Makefile.in generated by automake 1.8.2 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=.; \
    281280        else \
    282281          include_option=--include; \
    283           empty_fix=; \
    284282        fi; \
    285283        list='$(SUBDIRS)'; for subdir in $$list; do \
    286284          if test "$$subdir" = .; then :; else \
    287             test ! -f $$subdir/TAGS || \
     285            test -f $$subdir/TAGS && \
    288286              tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
    289287          fi; \
     
    295293          $(AWK) '    { files[$$0] = 1; } \
    296294               END { for (i in files) print i; }'`; \
    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
     295        test -z "$(ETAGS_ARGS)$$tags$$unique" \
     296          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     297             $$tags $$unique
    302298ctags: CTAGS
    303299CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  • orxonox/branches/levelloader/src/lib/graphics/Makefile.in

    r3499 r3525  
    1 # Makefile.in generated by automake 1.8.5 from Makefile.am.
     1# Makefile.in generated by automake 1.8.2 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=.; \
    275274        else \
    276275          include_option=--include; \
    277           empty_fix=; \
    278276        fi; \
    279277        list='$(SUBDIRS)'; for subdir in $$list; do \
    280278          if test "$$subdir" = .; then :; else \
    281             test ! -f $$subdir/TAGS || \
     279            test -f $$subdir/TAGS && \
    282280              tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
    283281          fi; \
     
    289287          $(AWK) '    { files[$$0] = 1; } \
    290288               END { for (i in files) print i; }'`; \
    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
     289        test -z "$(ETAGS_ARGS)$$tags$$unique" \
     290          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     291             $$tags $$unique
    296292ctags: CTAGS
    297293CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  • orxonox/branches/levelloader/src/lib/graphics/importer/Makefile.in

    r3499 r3525  
    1 # Makefile.in generated by automake 1.8.5 from Makefile.am.
     1# Makefile.in generated by automake 1.8.2 from Makefile.am.
    22# @configure_input@
    33
     
    4242subdir = src/lib/graphics/importer
    4343DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
    44         $(srcdir)/Makefile.in
     44        $(srcdir)/Makefile.in TODO
    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         test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
     239        $(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         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
     332        test -z "$(ETAGS_ARGS)$$tags$$unique" \
     333          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     334             $$tags $$unique
    337335ctags: CTAGS
    338336CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
     
    389387all-am: Makefile $(PROGRAMS) $(HEADERS)
    390388installdirs:
    391         for dir in "$(DESTDIR)$(bindir)"; do \
    392           test -z "$$dir" || $(mkdir_p) "$$dir"; \
    393         done
     389        $(mkdir_p) $(DESTDIR)$(bindir)
    394390install: install-am
    395391install-exec: install-exec-am
  • orxonox/branches/levelloader/src/lib/gui/Makefile.in

    r3499 r3525  
    1 # Makefile.in generated by automake 1.8.5 from Makefile.am.
     1# Makefile.in generated by automake 1.8.2 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=.; \
    277276        else \
    278277          include_option=--include; \
    279           empty_fix=; \
    280278        fi; \
    281279        list='$(SUBDIRS)'; for subdir in $$list; do \
    282280          if test "$$subdir" = .; then :; else \
    283             test ! -f $$subdir/TAGS || \
     281            test -f $$subdir/TAGS && \
    284282              tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
    285283          fi; \
     
    291289          $(AWK) '    { files[$$0] = 1; } \
    292290               END { for (i in files) print i; }'`; \
    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
     291        test -z "$(ETAGS_ARGS)$$tags$$unique" \
     292          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     293             $$tags $$unique
    298294ctags: CTAGS
    299295CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  • orxonox/branches/levelloader/src/lib/gui/console/Makefile.in

    r3499 r3525  
    1 # Makefile.in generated by automake 1.8.5 from Makefile.am.
     1# Makefile.in generated by automake 1.8.2 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         test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
     227        $(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         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
     299        test -z "$(ETAGS_ARGS)$$tags$$unique" \
     300          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     301             $$tags $$unique
    304302ctags: CTAGS
    305303CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
     
    356354all-am: Makefile $(PROGRAMS) $(HEADERS)
    357355installdirs:
    358         for dir in "$(DESTDIR)$(bindir)"; do \
    359           test -z "$$dir" || $(mkdir_p) "$$dir"; \
    360         done
     356        $(mkdir_p) $(DESTDIR)$(bindir)
    361357install: install-am
    362358install-exec: install-exec-am
  • orxonox/branches/levelloader/src/lib/gui/gui/Makefile.in

    r3499 r3525  
    1 # Makefile.in generated by automake 1.8.5 from Makefile.am.
     1# Makefile.in generated by automake 1.8.2 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         test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
     260        $(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         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
     338        test -z "$(ETAGS_ARGS)$$tags$$unique" \
     339          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     340             $$tags $$unique
    343341ctags: CTAGS
    344342CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
     
    395393all-am: Makefile $(PROGRAMS) $(HEADERS)
    396394installdirs:
    397         for dir in "$(DESTDIR)$(bindir)"; do \
    398           test -z "$$dir" || $(mkdir_p) "$$dir"; \
    399         done
     395        $(mkdir_p) $(DESTDIR)$(bindir)
    400396install: install-am
    401397install-exec: install-exec-am
Note: See TracChangeset for help on using the changeset viewer.