Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3191 in orxonox.OLD


Ignore:
Timestamp:
Dec 16, 2004, 1:58:38 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: Changed filestructure:
moved gui, console to src/gui, src/console
fixed Makefiles.

Location:
orxonox/trunk
Files:
8 edited
2 moved

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/Makefile.am

    r3182 r3191  
    11AUTOMAKE_OPTIONS = foreign no-installman no-installinfo
    22
    3 if HAVE_GTK2
    4   GTK_PROGS =console
    5 else
    6   GTK_PROGS =
    7 endif
    8 
    93SUBDIRS = src \
    10           importer \
    11           gui \
    12           $(GTK_PROGS)
     4          importer
    135
    146
    … …  
    1810##
    1911
    20 DOXYGEN_INPUT = src gui
     12DOXYGEN_INPUT = src src/gui
    2113
    2214## Exclude the application wizard templates, and some file templates

  • orxonox/trunk/Makefile.in

    r3182 r3191  
    6060ETAGS = etags
    6161CTAGS = ctags
    62 DIST_SUBDIRS = src importer gui console
     62DIST_SUBDIRS = $(SUBDIRS)
    6363DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    6464distdir = $(PACKAGE)-$(VERSION)
    … …  
    166166target_vendor = @target_vendor@
    167167AUTOMAKE_OPTIONS = foreign no-installman no-installinfo
    168 @HAVE_GTK2_FALSE@GTK_PROGS =
    169 @HAVE_GTK2_TRUE@GTK_PROGS = console
    170168SUBDIRS = src \
    171           importer \
    172           gui \
    173           $(GTK_PROGS)
    174 
    175 DOXYGEN_INPUT = src gui
     169          importer
     170
     171DOXYGEN_INPUT = src src/gui
    176172DOXYGEN_EXCLUDE =
    177173DOXYGEN_EXAMPLE_PATH =
    … …  
    385381          fi; \
    386382        done
    387         list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
     383        list='$(SUBDIRS)'; for subdir in $$list; do \
    388384          if test "$$subdir" = .; then :; else \
    389385            test -d "$(distdir)/$$subdir" \

  • orxonox/trunk/configure

    r3181 r3191  
    75457545
    75467546
    7547                                                   ac_config_files="$ac_config_files Makefile console/Makefile gui/Makefile src/Makefile importer/Makefile"
     7547                                                  ac_config_files="$ac_config_files Makefile src/console/Makefile src/gui/Makefile src/Makefile importer/Makefile"
    75487548
    75497549cat >confcache <<\_ACEOF
    … …  
    81118111  # Handling of arguments.
    81128112  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    8113   "console/Makefile" ) CONFIG_FILES="$CONFIG_FILES console/Makefile" ;;
    8114   "gui/Makefile" ) CONFIG_FILES="$CONFIG_FILES gui/Makefile" ;;
     8113  "src/console/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/console/Makefile" ;;
     8114  "src/gui/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/gui/Makefile" ;;
    81158115  "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
    81168116  "importer/Makefile" ) CONFIG_FILES="$CONFIG_FILES importer/Makefile" ;;

  • orxonox/trunk/configure.ac

    r3181 r3191  
    350350
    351351AC_CONFIG_FILES([Makefile
    352                  console/Makefile
    353                  gui/Makefile
     352                 src/console/Makefile
     353                 src/gui/Makefile
    354354                 src/Makefile
    355355                 importer/Makefile])

  • orxonox/trunk/src/Makefile.am

    r3182 r3191  
    6666
    6767
     68if HAVE_GTK2
     69  GTK_PROGS =console
     70else
     71  GTK_PROGS =
     72endif
     73
     74SUBDIRS = gui \
     75          $(GTK_PROGS)
    6876
    6977#  uncomment the following if orxonox requires the math library

  • orxonox/trunk/src/Makefile.in

    r3182 r3191  
    8686SOURCES = $(orxonox_SOURCES)
    8787DIST_SOURCES = $(orxonox_SOURCES)
     88RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
     89        html-recursive info-recursive install-data-recursive \
     90        install-exec-recursive install-info-recursive \
     91        install-recursive installcheck-recursive installdirs-recursive \
     92        pdf-recursive ps-recursive uninstall-info-recursive \
     93        uninstall-recursive
    8894HEADERS = $(noinst_HEADERS)
    8995ETAGS = etags
    9096CTAGS = ctags
     97DIST_SUBDIRS = gui console
    9198DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    9299ACLOCAL = @ACLOCAL@
    … …  
    244251                 campaign.h
    245252
    246 all: all-am
     253@HAVE_GTK2_FALSE@GTK_PROGS =
     254@HAVE_GTK2_TRUE@GTK_PROGS = console
     255SUBDIRS = gui \
     256          $(GTK_PROGS)
     257
     258all: all-recursive
    247259
    248260.SUFFIXES:
    … …  
    349361uninstall-info-am:
    350362
     363# This directory's subdirectories are mostly independent; you can cd
     364# into them and run `make' without going through this Makefile.
     365# To change the values of `make' variables: instead of editing Makefiles,
     366# (1) if the variable is set in `config.status', edit `config.status'
     367#     (which will cause the Makefiles to be regenerated when you run `make');
     368# (2) otherwise, pass the desired values on the `make' command line.
     369$(RECURSIVE_TARGETS):
     370        @set fnord $$MAKEFLAGS; amf=$$2; \
     371        dot_seen=no; \
     372        target=`echo $@ | sed s/-recursive//`; \
     373        list='$(SUBDIRS)'; for subdir in $$list; do \
     374          echo "Making $$target in $$subdir"; \
     375          if test "$$subdir" = "."; then \
     376            dot_seen=yes; \
     377            local_target="$$target-am"; \
     378          else \
     379            local_target="$$target"; \
     380          fi; \
     381          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
     382           || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
     383        done; \
     384        if test "$$dot_seen" = "no"; then \
     385          $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
     386        fi; test -z "$$fail"
     387
     388mostlyclean-recursive clean-recursive distclean-recursive \
     389maintainer-clean-recursive:
     390        @set fnord $$MAKEFLAGS; amf=$$2; \
     391        dot_seen=no; \
     392        case "$@" in \
     393          distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
     394          *) list='$(SUBDIRS)' ;; \
     395        esac; \
     396        rev=''; for subdir in $$list; do \
     397          if test "$$subdir" = "."; then :; else \
     398            rev="$$subdir $$rev"; \
     399          fi; \
     400        done; \
     401        rev="$$rev ."; \
     402        target=`echo $@ | sed s/-recursive//`; \
     403        for subdir in $$rev; do \
     404          echo "Making $$target in $$subdir"; \
     405          if test "$$subdir" = "."; then \
     406            local_target="$$target-am"; \
     407          else \
     408            local_target="$$target"; \
     409          fi; \
     410          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
     411           || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
     412        done && test -z "$$fail"
     413tags-recursive:
     414        list='$(SUBDIRS)'; for subdir in $$list; do \
     415          test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
     416        done
     417ctags-recursive:
     418        list='$(SUBDIRS)'; for subdir in $$list; do \
     419          test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
     420        done
     421
    351422ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
    352423        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
    … …  
    359430tags: TAGS
    360431
    361 TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
     432TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
    362433                $(TAGS_FILES) $(LISP)
    363434        tags=; \
    364435        here=`pwd`; \
     436        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
     437          include_option=--etags-include; \
     438          empty_fix=.; \
     439        else \
     440          include_option=--include; \
     441          empty_fix=; \
     442        fi; \
     443        list='$(SUBDIRS)'; for subdir in $$list; do \
     444          if test "$$subdir" = .; then :; else \
     445            test ! -f $$subdir/TAGS || \
     446              tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
     447          fi; \
     448        done; \
    365449        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
    366450        unique=`for i in $$list; do \
    … …  
    375459        fi
    376460ctags: CTAGS
    377 CTAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
     461CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
    378462                $(TAGS_FILES) $(LISP)
    379463        tags=; \
    … …  
    424508          fi; \
    425509        done
     510        list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
     511          if test "$$subdir" = .; then :; else \
     512            test -d "$(distdir)/$$subdir" \
     513            || mkdir "$(distdir)/$$subdir" \
     514            || exit 1; \
     515            (cd $$subdir && \
     516              $(MAKE) $(AM_MAKEFLAGS) \
     517                top_distdir="../$(top_distdir)" \
     518                distdir="../$(distdir)/$$subdir" \
     519                distdir) \
     520              || exit 1; \
     521          fi; \
     522        done
    426523check-am: all-am
    427 check: check-am
     524check: check-recursive
    428525all-am: Makefile $(PROGRAMS) $(HEADERS)
    429 installdirs:
     526installdirs: installdirs-recursive
     527installdirs-am:
    430528        for dir in "$(DESTDIR)$(bindir)"; do \
    431529          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    432530        done
    433 install: install-am
    434 install-exec: install-exec-am
    435 install-data: install-data-am
    436 uninstall: uninstall-am
     531install: install-recursive
     532install-exec: install-exec-recursive
     533install-data: install-data-recursive
     534uninstall: uninstall-recursive
    437535
    438536install-am: all-am
    439537        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
    440538
    441 installcheck: installcheck-am
     539installcheck: installcheck-recursive
    442540install-strip:
    443541        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
    … …  
    455553        @echo "This command is intended for maintainers to use"
    456554        @echo "it deletes files that may require special tools to rebuild."
    457 clean: clean-am
     555clean: clean-recursive
    458556
    459557clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
    460558
    461 distclean: distclean-am
     559distclean: distclean-recursive
    462560        -rm -rf ./$(DEPDIR)
    463561        -rm -f Makefile
    … …  
    465563        distclean-tags
    466564
    467 dvi: dvi-am
     565dvi: dvi-recursive
    468566
    469567dvi-am:
    470568
    471 html: html-am
    472 
    473 info: info-am
     569html: html-recursive
     570
     571info: info-recursive
    474572
    475573info-am:
    … …  
    479577install-exec-am: install-binPROGRAMS
    480578
    481 install-info: install-info-am
     579install-info: install-info-recursive
    482580
    483581install-man:
    … …  
    485583installcheck-am:
    486584
    487 maintainer-clean: maintainer-clean-am
     585maintainer-clean: maintainer-clean-recursive
    488586        -rm -rf ./$(DEPDIR)
    489587        -rm -f Makefile
    490588maintainer-clean-am: distclean-am maintainer-clean-generic
    491589
    492 mostlyclean: mostlyclean-am
     590mostlyclean: mostlyclean-recursive
    493591
    494592mostlyclean-am: mostlyclean-compile mostlyclean-generic
    495593
    496 pdf: pdf-am
     594pdf: pdf-recursive
    497595
    498596pdf-am:
    499597
    500 ps: ps-am
     598ps: ps-recursive
    501599
    502600ps-am:
    … …  
    504602uninstall-am: uninstall-binPROGRAMS uninstall-info-am
    505603
    506 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
    507         clean-generic ctags distclean distclean-compile \
    508         distclean-generic distclean-tags distdir dvi dvi-am html \
     604uninstall-info: uninstall-info-recursive
     605
     606.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
     607        clean clean-binPROGRAMS clean-generic clean-recursive ctags \
     608        ctags-recursive distclean distclean-compile distclean-generic \
     609        distclean-recursive distclean-tags distdir dvi dvi-am html \
    509610        html-am info info-am install install-am install-binPROGRAMS \
    510611        install-data install-data-am install-exec install-exec-am \
    511612        install-info install-info-am install-man install-strip \
    512         installcheck installcheck-am installdirs maintainer-clean \
    513         maintainer-clean-generic mostlyclean mostlyclean-compile \
    514         mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
    515         uninstall-am uninstall-binPROGRAMS uninstall-info-am
     613        installcheck installcheck-am installdirs installdirs-am \
     614        maintainer-clean maintainer-clean-generic \
     615        maintainer-clean-recursive mostlyclean mostlyclean-compile \
     616        mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
     617        tags tags-recursive uninstall uninstall-am \
     618        uninstall-binPROGRAMS uninstall-info-am
    516619
    517620

  • orxonox/trunk/src/console/Makefile.in

    r3182 r3191  
    2424pkglibdir = $(libdir)/@PACKAGE@
    2525pkgincludedir = $(includedir)/@PACKAGE@
    26 top_builddir = ..
     26top_builddir = ../..
    2727am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
    2828INSTALL = @INSTALL@
    … …  
    4040host_triplet = @host@
    4141bin_PROGRAMS = console$(EXEEXT)
    42 subdir = console
     42subdir = src/console
    4343DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
    4444        $(srcdir)/Makefile.in
    … …  
    190190          esac; \
    191191        done; \
    192         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  console/Makefile'; \
     192        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/console/Makefile'; \
    193193        cd $(top_srcdir) && \
    194           $(AUTOMAKE) --foreign  console/Makefile
     194          $(AUTOMAKE) --foreign  src/console/Makefile
    195195.PRECIOUS: Makefile
    196196Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/gui/Makefile.in

    r3173 r3191  
    2424pkglibdir = $(libdir)/@PACKAGE@
    2525pkgincludedir = $(includedir)/@PACKAGE@
    26 top_builddir = ..
     26top_builddir = ../..
    2727am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
    2828INSTALL = @INSTALL@
    … …  
    4040host_triplet = @host@
    4141bin_PROGRAMS = gui$(EXEEXT)
    42 subdir = gui
     42subdir = src/gui
    4343DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
    4444        $(srcdir)/Makefile.in
    … …  
    217217          esac; \
    218218        done; \
    219         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  gui/Makefile'; \
     219        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/gui/Makefile'; \
    220220        cd $(top_srcdir) && \
    221           $(AUTOMAKE) --foreign  gui/Makefile
     221          $(AUTOMAKE) --foreign  src/gui/Makefile
    222222.PRECIOUS: Makefile
    223223Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Note: See TracChangeset for help on using the changeset viewer.