Changeset 4271 in orxonox.OLD for orxonox/trunk/src/subprojects

Timestamp:

May 22, 2005, 8:21:24 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: clean in subprojects too

Location:

orxonox/trunk/src/subprojects/gui

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (2 diffs)

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

@@ -32 +32 @@
 bin_PROGRAMS = gui
 
-gui_DEPENDENCIES = $(MAINSRCDIR)/libORXgui.a
+gui_DEPENDENCIES = $(MAINSRCDIR)/lib/gui/gui/libORXgui.a
 
-gui_LDADD = $(MAINSRCDIR)/libORXgui.a \
+gui_LDADD = $(MAINSRCDIR)/lib/gui/gui/libORXgui.a \
             $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
 
@@ -53 +53 @@
 
 noinst_HEADERS= 
-
-
-
-#bin_PROGRAMS=gui
-#gui_SOURCES=gui_main.cc \
-#           gui.cc \
-#           gui_gtk.cc \
-#           gui_element.cc \
-#           gui_video.cc \
-#           gui_audio.cc \
-#           gui_exec.cc \
-#           gui_flags.cc \
-#           gui_banner.cc \
-#           gui_keys.cc \
-#           gui_update.cc \
-#                 $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
-#                 $(MAINSRCDIR)/lib/lang/base_object.cc \
-#                 $(MAINSRCDIR)/lib/math/vector.cc \
-#                 $(MAINSRCDIR)/util/resource_manager.cc \
-#                 $(MAINSRCDIR)/lib/graphics/text_engine.cc \
-#                 $(MAINSRCDIR)/lib/coord/p_node.cc \
-#                 $(MAINSRCDIR)/lib/coord/null_parent.cc \
-#                 $(MAINSRCDIR)/lib/graphics/importer/array.cc \
-#                 $(MAINSRCDIR)/lib/graphics/importer/model.cc \
-#                 $(MAINSRCDIR)/lib/graphics/importer/objModel.cc \
-#                 $(MAINSRCDIR)/lib/graphics/importer/material.cc \
-#                 $(MAINSRCDIR)/lib/graphics/importer/texture.cc \
-#                 $(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc 
-#

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

@@ -196 +196 @@
 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/graphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/graphics/particles -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/gui/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/lib/tinyxml -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai -I$(MAINSRCDIR)/util -I$(MAINSRCDIR)/util/animation -I$(MAINSRCDIR)/util/common -I$(MAINSRCDIR)/util/loading -I$(MAINSRCDIR)/util/track -I$(MAINSRCDIR)/subprojects
 AM_LDFLAGS = $(MWINDOWS)
-gui_DEPENDENCIES = $(MAINSRCDIR)/libORXgui.a
-gui_LDADD = $(MAINSRCDIR)/libORXgui.a \
+gui_DEPENDENCIES = $(MAINSRCDIR)/lib/gui/gui/libORXgui.a
+gui_LDADD = $(MAINSRCDIR)/lib/gui/gui/libORXgui.a \
             $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
 
@@ -688 +688 @@
         uninstall-am uninstall-binPROGRAMS uninstall-info-am
 
-
-#bin_PROGRAMS=gui
-#gui_SOURCES=gui_main.cc \
-#           gui.cc \
-#           gui_gtk.cc \
-#           gui_element.cc \
-#           gui_video.cc \
-#           gui_audio.cc \
-#           gui_exec.cc \
-#           gui_flags.cc \
-#           gui_banner.cc \
-#           gui_keys.cc \
-#           gui_update.cc \
-#                 $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
-#                 $(MAINSRCDIR)/lib/lang/base_object.cc \
-#                 $(MAINSRCDIR)/lib/math/vector.cc \
-#                 $(MAINSRCDIR)/util/resource_manager.cc \
-#                 $(MAINSRCDIR)/lib/graphics/text_engine.cc \
-#                 $(MAINSRCDIR)/lib/coord/p_node.cc \
-#                 $(MAINSRCDIR)/lib/coord/null_parent.cc \
-#                 $(MAINSRCDIR)/lib/graphics/importer/array.cc \
-#                 $(MAINSRCDIR)/lib/graphics/importer/model.cc \
-#                 $(MAINSRCDIR)/lib/graphics/importer/objModel.cc \
-#                 $(MAINSRCDIR)/lib/graphics/importer/material.cc \
-#                 $(MAINSRCDIR)/lib/graphics/importer/texture.cc \
-#                 $(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc 
-#
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.