Changeset 5311 in orxonox.OLD for trunk/src/lib/gui

Timestamp:

Oct 8, 2005, 1:08:04 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: moved the entire GUI

Location:

trunk/src/lib/gui

Files:

• . (added)
• Makefile.am (copied) (copied from trunk/src/lib/Makefile.am) (1 diff)
• Makefile.in (added)
• gui_gtk (moved) (moved from trunk/src/lib/gui_gtk)
• gui_gtk/Makefile.am (modified) (1 diff)
• gui_gtk/Makefile.in (modified) (4 diffs)
• gui_opengl (added)

trunk/src/lib/gui/Makefile.am

@@ -1 @@
-### GTK_RELATED
-  GTK_PROGS =
-
-SUBDIRS = graphics \
-          sound \
-          event \
-          physics \
-          particles \
-          collision_detection \
-          tinyxml \
-          shell \
-          gui \
-          $(GTK_PROGS)
+SUBDIRS = gui_gtk          

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

@@ -1 @@
-MAINSRCDIR=../..
+MAINSRCDIR=../../..
 include $(MAINSRCDIR)/defs/include_paths.am
 

trunk/src/lib/gui/gui_gtk/Makefile.in

@@ -24 +24 @@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
+top_builddir = ../../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
@@ -39 +39 @@
 POST_UNINSTALL = :
 host_triplet = @host@
-subdir = src/lib/gui
+subdir = src/lib/gui/gui_gtk
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
         $(srcdir)/Makefile.in
@@ -196 +196 @@
 target_os = @target_os@
 target_vendor = @target_vendor@
-MAINSRCDIR = ../..
+MAINSRCDIR = ../../..
 AM_LDFLAGS = $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
 noinst_LIBRARIES = libORXgui.a 
@@ -241 +241 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/gui_gtk/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/lib/gui/Makefile
+          $(AUTOMAKE) --gnu  src/lib/gui/gui_gtk/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status