Changeset 4054 in orxonox.OLD for orxonox/trunk/src/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/Makefile.am (modified) (3 diffs)

orxonox/trunk/src/Makefile.am

@@ -10 +10 @@
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/particles
 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
@@ -23 +24 @@
 
 
-AM_LDFLAGS= $(MWINDOWS)
 
 #"-O3 -pedantic -fPIC -ffast-math -I/usr/X11R6/include"
 
 
-bin_PROGRAMS=orxonox orxonoxGui
-
+bin_PROGRAMS=orxonox 
+noinst_LIBRARIES = lib_orxonox_gui.a
+
+orxonox_DEPENDENCIES = lib_orxonox_gui.a
+orxonox_LDADD = lib_orxonox_gui.a
 orxonox_SOURCES= orxonox.cc \
                  game_loader.cc \
@@ -147 +150 @@
                  lib/math/curve.h \
                  glmenu/glmenu_imagescreen.h \
-                 lib/gui/gui/orxonox_gui.h \
-                 lib/gui/gui/orxonox_gui_gtk.h \
-                 lib/gui/gui/orxonox_gui_element.h \
-                 lib/gui/gui/orxonox_gui_video.h \
-                 lib/gui/gui/orxonox_gui_audio.h \
-                 lib/gui/gui/orxonox_gui_exec.h \
-                 lib/gui/gui/orxonox_gui_flags.h \
-                 lib/gui/gui/orxonox_gui_banner.h \
-                 lib/gui/gui/orxonox_gui_keys.h \
-                 lib/gui/gui/orxonox_gui_update.h
-
-orxonoxGui_CPPFLAGS=$(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
-orxonoxGui_LDFLAGS=$(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
-
-orxonoxGui_SOURCES = lib/gui/gui/orxonox_gui_main.cc \
-                     lib/gui/gui/orxonox_gui.cc \
-                     lib/gui/gui/orxonox_gui_gtk.cc \
-                     lib/gui/gui/orxonox_gui_element.cc \
-                     lib/gui/gui/orxonox_gui_video.cc \
-                     lib/gui/gui/orxonox_gui_audio.cc \
-                     lib/gui/gui/orxonox_gui_exec.cc \
-                     lib/gui/gui/orxonox_gui_flags.cc \
-                     lib/gui/gui/orxonox_gui_banner.cc \
-                     lib/gui/gui/orxonox_gui_keys.cc \
-                     lib/gui/gui/orxonox_gui_update.cc
+                 lib/gui/gui/gui.h \
+                 lib/gui/gui/gui_gtk.h \
+                 lib/gui/gui/gui_element.h \
+                 lib/gui/gui/gui_video.h \
+                 lib/gui/gui/gui_audio.h \
+                 lib/gui/gui/gui_exec.h \
+                 lib/gui/gui/gui_flags.h \
+                 lib/gui/gui/gui_banner.h \
+                 lib/gui/gui/gui_keys.h \
+                 lib/gui/gui/gui_update.h
+
+lib_orxonox_gui_a_CPPFLAGS=$(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
+AM_LDFLAGS=$(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
+
+lib_orxonox_gui_a_SOURCES = lib/gui/gui/gui.cc \
+                            lib/gui/gui/gui_gtk.cc \
+                            lib/gui/gui/gui_element.cc \
+                            lib/gui/gui/gui_video.cc \
+                            lib/gui/gui/gui_audio.cc \
+                            lib/gui/gui/gui_exec.cc \
+                            lib/gui/gui/gui_flags.cc \
+                            lib/gui/gui/gui_banner.cc \
+                            lib/gui/gui/gui_keys.cc \
+                            lib/gui/gui/gui_update.cc