Changeset 3489 in orxonox.OLD for orxonox/trunk/src

Timestamp:

Mar 11, 2005, 1:13:15 AM (19 years ago)

Author:

patrick

Message:

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

Location:

orxonox/trunk/src

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (3 diffs)
• lib/gui (added)
• lib/gui/console (moved) (moved from orxonox/trunk/src/console)
• lib/gui/console/Makefile.in (modified) (3 diffs)

orxonox/trunk/src/Makefile.am

@@ -8 +8 @@
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gaphics
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/importer
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/lang
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/util
@@ -112 +113 @@
 endif
 if SUB_PROJECTS
-  SUB_PROGS = gui \
-              $(GTK_PROGS)
+  SUB_PROGS = gui 
+#             $(GTK_PROGS)
 ##lib/graphics/importer \
 else

orxonox/trunk/src/Makefile.in

@@ -106 +106 @@
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = . gui console
+DIST_SUBDIRS = . gui
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -215 +215 @@
 target_vendor = @target_vendor@
 MAINSRCDIR = .
-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
+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/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
 AM_LDFLAGS = $(MWINDOWS)
 orxonox_SOURCES = orxonox.cc \
@@ -299 +299 @@
 ### GTK_RELATED
 @HAVE_GTK2_TRUE@GTK_PROGS = console
+#             $(GTK_PROGS)
 @SUB_PROJECTS_FALSE@SUB_PROGS = 
-@SUB_PROJECTS_TRUE@SUB_PROGS = gui \
-@SUB_PROJECTS_TRUE@           $(GTK_PROGS)
-
+@SUB_PROJECTS_TRUE@SUB_PROGS = gui 
 SUBDIRS = . \
           $(SUB_PROGS)

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

@@ -24 +24 @@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
+top_builddir = ../../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
@@ -40 +40 @@
 host_triplet = @host@
 bin_PROGRAMS = console$(EXEEXT)
-subdir = src/console
+subdir = src/lib/gui/console
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
         $(srcdir)/Makefile.in
@@ -203 +203 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/console/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/console/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/console/Makefile
+          $(AUTOMAKE) --foreign  src/lib/gui/console/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status