Changeset 5312 in orxonox.OLD for trunk/src/Makefile.in

Timestamp:

Oct 8, 2005, 1:21:30 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: build the glMenu as part of the new LIB: libORXguiGL

File:

• trunk/src/Makefile.in (modified) (10 diffs)

trunk/src/Makefile.in

@@ -82 +82 @@
         orxonox-color.$(OBJEXT) orxonox-helper_functions.$(OBJEXT) \
         orxonox-vector.$(OBJEXT) orxonox-curve.$(OBJEXT) \
-        orxonox-glmenu_imagescreen.$(OBJEXT) \
         orxonox-benchmark.$(OBJEXT)
 orxonox_OBJECTS = $(am_orxonox_OBJECTS)
@@ -107 +106 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-game_loader.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-garbage_collector.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-glmenu_imagescreen.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-graphics_engine.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-helper_functions.Po \
@@ -273 +271 @@
 orxonox_CPPFLAGS = -DIS_ORXONOX
 orxonox_DEPENDENCIES = lib/gui/gui_gtk/libORXgui.a \
+                       lib/gui/gui_opengl/libORXguiGL.a \
                        lib/graphics/importer/libORXimporter.a \
                        lib/sound/libORXsound.a \
@@ -284 +283 @@
 
 orxonox_LDADD = lib/gui/gui_gtk/libORXgui.a \
+                lib/gui/gui_opengl/libORXguiGL.a \
                 lib/graphics/importer/libORXimporter.a \
                 lib/sound/libORXsound.a \
@@ -348 +348 @@
                   lib/math/vector.cc \
                   lib/math/curve.cc \
-                  glmenu/glmenu_imagescreen.cc \
                   subprojects/benchmark.cc
 
@@ -424 +423 @@
                  lib/math/vector.h \
                  lib/math/curve.h \
-                 glmenu/glmenu_imagescreen.h \
                  subprojects/benchmark.h
 
@@ -451 +449 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --gnu  src/Makefile
+          $(AUTOMAKE) --foreign  src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -522 +520 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-game_loader.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-garbage_collector.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-glmenu_imagescreen.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-graphics_engine.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-helper_functions.Po@am__quote@
@@ -1423 +1420 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-curve.obj `if test -f 'lib/math/curve.cc'; then $(CYGPATH_W) 'lib/math/curve.cc'; else $(CYGPATH_W) '$(srcdir)/lib/math/curve.cc'; fi`
-
-orxonox-glmenu_imagescreen.o: glmenu/glmenu_imagescreen.cc
-@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-glmenu_imagescreen.o -MD -MP -MF "$(DEPDIR)/orxonox-glmenu_imagescreen.Tpo" -c -o orxonox-glmenu_imagescreen.o `test -f 'glmenu/glmenu_imagescreen.cc' || echo '$(srcdir)/'`glmenu/glmenu_imagescreen.cc; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-glmenu_imagescreen.Tpo" "$(DEPDIR)/orxonox-glmenu_imagescreen.Po"; else rm -f "$(DEPDIR)/orxonox-glmenu_imagescreen.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='glmenu/glmenu_imagescreen.cc' object='orxonox-glmenu_imagescreen.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-glmenu_imagescreen.Po' tmpdepfile='$(DEPDIR)/orxonox-glmenu_imagescreen.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-glmenu_imagescreen.o `test -f 'glmenu/glmenu_imagescreen.cc' || echo '$(srcdir)/'`glmenu/glmenu_imagescreen.cc
-
-orxonox-glmenu_imagescreen.obj: glmenu/glmenu_imagescreen.cc
-@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-glmenu_imagescreen.obj -MD -MP -MF "$(DEPDIR)/orxonox-glmenu_imagescreen.Tpo" -c -o orxonox-glmenu_imagescreen.obj `if test -f 'glmenu/glmenu_imagescreen.cc'; then $(CYGPATH_W) 'glmenu/glmenu_imagescreen.cc'; else $(CYGPATH_W) '$(srcdir)/glmenu/glmenu_imagescreen.cc'; fi`; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-glmenu_imagescreen.Tpo" "$(DEPDIR)/orxonox-glmenu_imagescreen.Po"; else rm -f "$(DEPDIR)/orxonox-glmenu_imagescreen.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='glmenu/glmenu_imagescreen.cc' object='orxonox-glmenu_imagescreen.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-glmenu_imagescreen.Po' tmpdepfile='$(DEPDIR)/orxonox-glmenu_imagescreen.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-glmenu_imagescreen.obj `if test -f 'glmenu/glmenu_imagescreen.cc'; then $(CYGPATH_W) 'glmenu/glmenu_imagescreen.cc'; else $(CYGPATH_W) '$(srcdir)/glmenu/glmenu_imagescreen.cc'; fi`
 
 orxonox-benchmark.o: subprojects/benchmark.cc
@@ -1578 +1559 @@
 
 distdir: $(DISTFILES)
-        $(mkdir_p) $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/graphics $(distdir)/lib/graphics/render2D $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/util $(distdir)/util/animation $(distdir)/util/loading $(distdir)/util/track $(distdir)/world_entities $(distdir)/world_entities/weapons
+        $(mkdir_p) $(distdir)/defs $(distdir)/lib/coord $(distdir)/lib/graphics $(distdir)/lib/graphics/render2D $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/util $(distdir)/util/animation $(distdir)/util/loading $(distdir)/util/track $(distdir)/world_entities $(distdir)/world_entities/weapons
         @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
         topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \