Changeset 3493 in orxonox.OLD for orxonox/trunk/src/lib

Timestamp:

Mar 11, 2005, 9:48:35 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: added new Makefile.am-structure, so it compiles again

Location:

orxonox/trunk/src/lib

Files:

• Makefile.am (added)
• Makefile.in (added)
• graphics/Makefile.am (added)
• graphics/Makefile.in (added)
• graphics/importer/Makefile.in (modified) (1 diff)
• gui/Makefile.am (added)
• gui/Makefile.in (added)
• gui/console/Makefile.in (modified) (1 diff)
• gui/gui (moved) (moved from orxonox/trunk/src/gui)
• gui/gui/Makefile.am (modified) (1 diff)
• gui/gui/Makefile.in (modified) (5 diffs)
• gui/gui/orxonox_gui_gtk.h (modified) (1 diff)

orxonox/trunk/src/lib/graphics/importer/Makefile.in

@@ -215 +215 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile
+          $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

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

@@ -203 +203 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/console/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/console/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/lib/gui/console/Makefile
+          $(AUTOMAKE) --gnu  src/lib/gui/console/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

orxonox/trunk/src/lib/gui/gui/Makefile.am

@@ +1 @@
+MAINSRCDIR=../../..
 AM_CXXFLAGS=$(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
+AM_CXXFLAGS+=-I$(MAINSRCDIR)
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/world_entities
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/story_entities
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/coord
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/data
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gaphics
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/font
+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
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/math
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/defs
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/font
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/network
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/glmenu
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/ai
+
 #AM_LDFLAGS=$(GTK2_LIBS)   $(GTHREAD_LIBS)
 LIBS=$(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)

orxonox/trunk/src/lib/gui/gui/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 = gui$(EXEEXT)
-subdir = src/gui
+subdir = src/lib/gui/gui
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
         $(srcdir)/Makefile.in
@@ -129 +129 @@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
+
 #AM_LDFLAGS=$(GTK2_LIBS)   $(GTHREAD_LIBS)
 LIBS = $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
@@ -190 +191 @@
 target_os = @target_os@
 target_vendor = @target_vendor@
-AM_CXXFLAGS = $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
+MAINSRCDIR = ../../..
+AM_CXXFLAGS = $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS) -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/font -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
 gui_SOURCES = orxonox_gui.cc \
             orxonox_gui_gtk.cc \
@@ -234 +236 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/gui/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/gui/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/gui/Makefile
+          $(AUTOMAKE) --gnu  src/lib/gui/gui/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

orxonox/trunk/src/lib/gui/gui/orxonox_gui_gtk.h

@@ -13 +13 @@
 extern int verbose; // soon obsolete here
 
-#include "../debug.h"
+#include "debug.h"
 
 #ifdef HAVE_GTK2