Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3489 in orxonox.OLD for orxonox/trunk


Ignore:
Timestamp:
Mar 11, 2005, 1:13:15 AM (20 years ago)
Author:
patrick
Message:

orxonox/trunk: dir restruture, moved console to lib/gui/console

Location:
orxonox/trunk
Files:
1 added
7 edited
1 moved

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/Makefile.am

    r3219 r3489  
    1616## doxygen stuff
    1717if DOXYGEN
    18 DOXYGEN_INPUT = "src src/gui src/importer"
     18DOXYGEN_INPUT = "src src/gui src/lib/graphics/importer"
    1919
    2020## Exclude the application wizard templates, and some file templates

  • orxonox/trunk/Makefile.in

    r3423 r3489  
    191191             doc/doxyconf/project
    192192
    193 @DOXYGEN_TRUE@DOXYGEN_INPUT = "src src/gui src/importer"
     193@DOXYGEN_TRUE@DOXYGEN_INPUT = "src src/gui src/lib/graphics/importer"
    194194@DOXYGEN_TRUE@DOXYGEN_EXCLUDE =
    195195@DOXYGEN_TRUE@DOXYGEN_EXAMPLE_PATH =

  • orxonox/trunk/configure

    r3460 r3489  
    81828182## OUTPUT CONFIGURE ##
    81838183######################
    8184                                                   ac_config_files="$ac_config_files Makefile src/Makefile src/importer/Makefile src/console/Makefile src/gui/Makefile"
     8184                                                  ac_config_files="$ac_config_files Makefile src/Makefile src/lib/graphics/importer/Makefile src/lib/gui/console/Makefile src/gui/Makefile"
    81858185
    81868186
    … …  
    87788778  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    87798779  "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
    8780   "src/importer/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/importer/Makefile" ;;
    8781   "src/console/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/console/Makefile" ;;
     8780  "src/lib/graphics/importer/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/graphics/importer/Makefile" ;;
     8781  "src/lib/gui/console/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/gui/console/Makefile" ;;
    87828782  "src/gui/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/gui/Makefile" ;;
    87838783  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;

  • orxonox/trunk/configure.ac

    r3485 r3489  
    530530                 src/Makefile
    531531                 src/lib/graphics/importer/Makefile
    532                  src/console/Makefile
     532                 src/lib/gui/console/Makefile
    533533                 src/gui/Makefile])
    534534

  • orxonox/trunk/src/Makefile.am

    r3488 r3489  
    88AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gaphics
    99AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/importer
     10AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui
    1011AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/lang
    1112AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/util
    … …  
    112113endif
    113114if SUB_PROJECTS
    114   SUB_PROGS = gui \
    115               $(GTK_PROGS)
     115  SUB_PROGS = gui
     116#             $(GTK_PROGS)
    116117##lib/graphics/importer \
    117118else

  • orxonox/trunk/src/Makefile.in

    r3488 r3489  
    106106ETAGS = etags
    107107CTAGS = ctags
    108 DIST_SUBDIRS = . gui console
     108DIST_SUBDIRS = . gui
    109109DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    110110ACLOCAL = @ACLOCAL@
    … …  
    215215target_vendor = @target_vendor@
    216216MAINSRCDIR = .
    217 AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/gaphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai
     217AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/gaphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai
    218218AM_LDFLAGS = $(MWINDOWS)
    219219orxonox_SOURCES = orxonox.cc \
    … …  
    299299### GTK_RELATED
    300300@HAVE_GTK2_TRUE@GTK_PROGS = console
     301#             $(GTK_PROGS)
    301302@SUB_PROJECTS_FALSE@SUB_PROGS =
    302 @SUB_PROJECTS_TRUE@SUB_PROGS = gui \
    303 @SUB_PROJECTS_TRUE@           $(GTK_PROGS)
    304 
     303@SUB_PROJECTS_TRUE@SUB_PROGS = gui
    305304SUBDIRS = . \
    306305          $(SUB_PROGS)

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

    r3484 r3489  
    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 = src/console
     42subdir = src/lib/gui/console
    4343DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
    4444        $(srcdir)/Makefile.in
    … …  
    203203          esac; \
    204204        done; \
    205         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/console/Makefile'; \
     205        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/console/Makefile'; \
    206206        cd $(top_srcdir) && \
    207           $(AUTOMAKE) --foreign  src/console/Makefile
     207          $(AUTOMAKE) --foreign  src/lib/gui/console/Makefile
    208208.PRECIOUS: Makefile
    209209Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Note: See TracChangeset for help on using the changeset viewer.