Changeset 4054 in orxonox.OLD for orxonox/trunk/src/lib/gui/gui/Makefile.am

Timestamp:

May 5, 2005, 1:32:47 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the guiMerge-branche back into the trunk
merged with command:
svn merge -r 4043:HEAD guiMerge/ ../trunk/
no conflicts, only updates and moves

File:

• orxonox/trunk/src/lib/gui/gui/Makefile.am (modified) (2 diffs)

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

@@ -11 +11 @@
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/importer
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gui
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/lang
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/util
@@ -24 +25 @@
 
 bin_PROGRAMS=gui
-gui_SOURCES=orxonox_gui_main.cc \
-            orxonox_gui.cc \
-            orxonox_gui_gtk.cc \
-            orxonox_gui_element.cc \
-            orxonox_gui_video.cc \
-            orxonox_gui_audio.cc \
-            orxonox_gui_exec.cc \
-            orxonox_gui_flags.cc \
-            orxonox_gui_banner.cc \
-            orxonox_gui_keys.cc \
-            orxonox_gui_update.cc
+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
 
-noinst_HEADERS=orxonox_gui.h \
-            orxonox_gui_gtk.h \
-            orxonox_gui_element.h \
-            orxonox_gui_video.h \
-            orxonox_gui_audio.h \
-            orxonox_gui_exec.h \
-            orxonox_gui_flags.h \
-            orxonox_gui_banner.h \
-            orxonox_gui_keys.h \
-            orxonox_gui_update.h
+noinst_HEADERS=gui.h \
+            gui_gtk.h \
+            gui_element.h \
+            gui_video.h \
+            gui_audio.h \
+            gui_exec.h \
+            gui_flags.h \
+            gui_banner.h \
+            gui_keys.h \
+            gui_update.h
 
 #  uncomment the following if orxonox requires the mathlibrary