Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
Timestamp:
Oct 8, 2005, 2:28:34 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: some renaiming of GUI
i am looking forward to coding some simple buttons… hopefully it works

Location:
trunk/src/lib/gui
Files:
5 edited
2 moved

Legend:

Unmodified
Added
Removed

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

    r5312 r5315  
    1 SUBDIRS = gui_gtk \
    2           gui_opengl
     1SUBDIRS = gtk_gui \
     2          gl_gui

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

    r5312 r5315  
    164164target_os = @target_os@
    165165target_vendor = @target_vendor@
    166 SUBDIRS = gui_gtk \
    167           gui_opengl
     166SUBDIRS = gtk_gui \
     167          gl_gui
    168168
    169169all: all-recursive
    … …  
    179179          esac; \
    180180        done; \
    181         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/Makefile'; \
     181        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/Makefile'; \
    182182        cd $(top_srcdir) && \
    183           $(AUTOMAKE) --foreign  src/lib/gui/Makefile
     183          $(AUTOMAKE) --gnu  src/lib/gui/Makefile
    184184.PRECIOUS: Makefile
    185185Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • trunk/src/lib/gui/gl_gui/Makefile.am

    r5312 r5315  
    44AM_LDFLAGS =
    55
    6 noinst_LIBRARIES = libORXguiGL.a
     6noinst_LIBRARIES = libORXglgui.a
    77
    8 libORXguiGL_a_CPPFLAGS = -DBUILD_ORXONOX
     8libORXglgui_a_CPPFLAGS = -DBUILD_ORXONOX
    99
    1010
    11 libORXguiGL_a_SOURCES = glmenu/glmenu_imagescreen.cc
     11libORXglgui_a_SOURCES = glmenu/glmenu_imagescreen.cc
    1212
    1313noinst_HEADERS= glmenu/glmenu_imagescreen.h

  • trunk/src/lib/gui/gl_gui/Makefile.in

    r5312 r5315  
    1616
    1717
    18 SOURCES = $(libORXguiGL_a_SOURCES)
     18SOURCES = $(libORXglgui_a_SOURCES)
    1919
    2020srcdir = @srcdir@
    … …  
    3939POST_UNINSTALL = :
    4040host_triplet = @host@
    41 subdir = src/lib/gui/gui_opengl
     41subdir = src/lib/gui/gl_gui
    4242DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
    4343        $(srcdir)/Makefile.in
    … …  
    5252AR = ar
    5353ARFLAGS = cru
    54 libORXguiGL_a_AR = $(AR) $(ARFLAGS)
    55 libORXguiGL_a_LIBADD =
    56 am_libORXguiGL_a_OBJECTS = libORXguiGL_a-glmenu_imagescreen.$(OBJEXT)
    57 libORXguiGL_a_OBJECTS = $(am_libORXguiGL_a_OBJECTS)
     54libORXglgui_a_AR = $(AR) $(ARFLAGS)
     55libORXglgui_a_LIBADD =
     56am_libORXglgui_a_OBJECTS = libORXglgui_a-glmenu_imagescreen.$(OBJEXT)
     57libORXglgui_a_OBJECTS = $(am_libORXglgui_a_OBJECTS)
    5858DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    5959depcomp = $(SHELL) $(top_srcdir)/depcomp
    6060am__depfiles_maybe = depfiles
    6161@AMDEP_TRUE@DEP_FILES =  \
    62 @AMDEP_TRUE@    ./$(DEPDIR)/libORXguiGL_a-glmenu_imagescreen.Po
     62@AMDEP_TRUE@    ./$(DEPDIR)/libORXglgui_a-glmenu_imagescreen.Po
    6363CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6464        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    … …  
    6666CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
    6767        -o $@
    68 SOURCES = $(libORXguiGL_a_SOURCES)
    69 DIST_SOURCES = $(libORXguiGL_a_SOURCES)
     68SOURCES = $(libORXglgui_a_SOURCES)
     69DIST_SOURCES = $(libORXglgui_a_SOURCES)
    7070HEADERS = $(noinst_HEADERS)
    7171ETAGS = etags
    … …  
    182182MAINSRCDIR = ../../..
    183183AM_LDFLAGS =
    184 noinst_LIBRARIES = libORXguiGL.a
    185 libORXguiGL_a_CPPFLAGS = -DBUILD_ORXONOX
    186 libORXguiGL_a_SOURCES = glmenu/glmenu_imagescreen.cc
     184noinst_LIBRARIES = libORXglgui.a
     185libORXglgui_a_CPPFLAGS = -DBUILD_ORXONOX
     186libORXglgui_a_SOURCES = glmenu/glmenu_imagescreen.cc
    187187noinst_HEADERS = glmenu/glmenu_imagescreen.h
    188188EXTRA_DIST =
    … …  
    200200          esac; \
    201201        done; \
    202         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/gui_opengl/Makefile'; \
     202        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/gl_gui/Makefile'; \
    203203        cd $(top_srcdir) && \
    204           $(AUTOMAKE) --foreign  src/lib/gui/gui_opengl/Makefile
     204          $(AUTOMAKE) --gnu  src/lib/gui/gl_gui/Makefile
    205205.PRECIOUS: Makefile
    206206Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    223223clean-noinstLIBRARIES:
    224224        -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
    225 libORXguiGL.a: $(libORXguiGL_a_OBJECTS) $(libORXguiGL_a_DEPENDENCIES)
    226         -rm -f libORXguiGL.a
    227         $(libORXguiGL_a_AR) libORXguiGL.a $(libORXguiGL_a_OBJECTS) $(libORXguiGL_a_LIBADD)
    228         $(RANLIB) libORXguiGL.a
     225libORXglgui.a: $(libORXglgui_a_OBJECTS) $(libORXglgui_a_DEPENDENCIES)
     226        -rm -f libORXglgui.a
     227        $(libORXglgui_a_AR) libORXglgui.a $(libORXglgui_a_OBJECTS) $(libORXglgui_a_LIBADD)
     228        $(RANLIB) libORXglgui.a
    229229
    230230mostlyclean-compile:
    … …  
    234234        -rm -f *.tab.c
    235235
    236 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXguiGL_a-glmenu_imagescreen.Po@am__quote@
     236@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXglgui_a-glmenu_imagescreen.Po@am__quote@
    237237
    238238.cc.o:
    … …  
    252252@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    253253
    254 libORXguiGL_a-glmenu_imagescreen.o: glmenu/glmenu_imagescreen.cc
    255 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXguiGL_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXguiGL_a-glmenu_imagescreen.o -MD -MP -MF "$(DEPDIR)/libORXguiGL_a-glmenu_imagescreen.Tpo" -c -o libORXguiGL_a-glmenu_imagescreen.o `test -f 'glmenu/glmenu_imagescreen.cc' || echo '$(srcdir)/'`glmenu/glmenu_imagescreen.cc; \
    256 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXguiGL_a-glmenu_imagescreen.Tpo" "$(DEPDIR)/libORXguiGL_a-glmenu_imagescreen.Po"; else rm -f "$(DEPDIR)/libORXguiGL_a-glmenu_imagescreen.Tpo"; exit 1; fi
    257 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='glmenu/glmenu_imagescreen.cc' object='libORXguiGL_a-glmenu_imagescreen.o' libtool=no @AMDEPBACKSLASH@
    258 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXguiGL_a-glmenu_imagescreen.Po' tmpdepfile='$(DEPDIR)/libORXguiGL_a-glmenu_imagescreen.TPo' @AMDEPBACKSLASH@
     254libORXglgui_a-glmenu_imagescreen.o: glmenu/glmenu_imagescreen.cc
     255@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXglgui_a-glmenu_imagescreen.o -MD -MP -MF "$(DEPDIR)/libORXglgui_a-glmenu_imagescreen.Tpo" -c -o libORXglgui_a-glmenu_imagescreen.o `test -f 'glmenu/glmenu_imagescreen.cc' || echo '$(srcdir)/'`glmenu/glmenu_imagescreen.cc; \
     256@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXglgui_a-glmenu_imagescreen.Tpo" "$(DEPDIR)/libORXglgui_a-glmenu_imagescreen.Po"; else rm -f "$(DEPDIR)/libORXglgui_a-glmenu_imagescreen.Tpo"; exit 1; fi
     257@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='glmenu/glmenu_imagescreen.cc' object='libORXglgui_a-glmenu_imagescreen.o' libtool=no @AMDEPBACKSLASH@
     258@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXglgui_a-glmenu_imagescreen.Po' tmpdepfile='$(DEPDIR)/libORXglgui_a-glmenu_imagescreen.TPo' @AMDEPBACKSLASH@
    259259@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    260 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXguiGL_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXguiGL_a-glmenu_imagescreen.o `test -f 'glmenu/glmenu_imagescreen.cc' || echo '$(srcdir)/'`glmenu/glmenu_imagescreen.cc
    261 
    262 libORXguiGL_a-glmenu_imagescreen.obj: glmenu/glmenu_imagescreen.cc
    263 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXguiGL_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXguiGL_a-glmenu_imagescreen.obj -MD -MP -MF "$(DEPDIR)/libORXguiGL_a-glmenu_imagescreen.Tpo" -c -o libORXguiGL_a-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`; \
    264 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXguiGL_a-glmenu_imagescreen.Tpo" "$(DEPDIR)/libORXguiGL_a-glmenu_imagescreen.Po"; else rm -f "$(DEPDIR)/libORXguiGL_a-glmenu_imagescreen.Tpo"; exit 1; fi
    265 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='glmenu/glmenu_imagescreen.cc' object='libORXguiGL_a-glmenu_imagescreen.obj' libtool=no @AMDEPBACKSLASH@
    266 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXguiGL_a-glmenu_imagescreen.Po' tmpdepfile='$(DEPDIR)/libORXguiGL_a-glmenu_imagescreen.TPo' @AMDEPBACKSLASH@
     260@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXglgui_a-glmenu_imagescreen.o `test -f 'glmenu/glmenu_imagescreen.cc' || echo '$(srcdir)/'`glmenu/glmenu_imagescreen.cc
     261
     262libORXglgui_a-glmenu_imagescreen.obj: glmenu/glmenu_imagescreen.cc
     263@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXglgui_a-glmenu_imagescreen.obj -MD -MP -MF "$(DEPDIR)/libORXglgui_a-glmenu_imagescreen.Tpo" -c -o libORXglgui_a-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`; \
     264@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXglgui_a-glmenu_imagescreen.Tpo" "$(DEPDIR)/libORXglgui_a-glmenu_imagescreen.Po"; else rm -f "$(DEPDIR)/libORXglgui_a-glmenu_imagescreen.Tpo"; exit 1; fi
     265@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='glmenu/glmenu_imagescreen.cc' object='libORXglgui_a-glmenu_imagescreen.obj' libtool=no @AMDEPBACKSLASH@
     266@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXglgui_a-glmenu_imagescreen.Po' tmpdepfile='$(DEPDIR)/libORXglgui_a-glmenu_imagescreen.TPo' @AMDEPBACKSLASH@
    267267@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    268 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXguiGL_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXguiGL_a-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`
     268@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXglgui_a-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`
    269269uninstall-info-am:
    270270

  • trunk/src/lib/gui/gtk_gui/Makefile.in

    r5312 r5315  
    3939POST_UNINSTALL = :
    4040host_triplet = @host@
    41 subdir = src/lib/gui/gui_gtk
     41subdir = src/lib/gui/gtk_gui
    4242DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
    4343        $(srcdir)/Makefile.in
    … …  
    241241          esac; \
    242242        done; \
    243         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/gui_gtk/Makefile'; \
     243        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/gtk_gui/Makefile'; \
    244244        cd $(top_srcdir) && \
    245           $(AUTOMAKE) --foreign  src/lib/gui/gui_gtk/Makefile
     245          $(AUTOMAKE) --gnu  src/lib/gui/gtk_gui/Makefile
    246246.PRECIOUS: Makefile
    247247Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Note: See TracChangeset for help on using the changeset viewer.