Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4484 in orxonox.OLD for orxonox/trunk


Ignore:
Timestamp:
Jun 2, 2005, 11:46:13 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: building the EventSystem as libORXevent.a

Location:
orxonox/trunk
Files:
6 edited
2 copied

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/configure

    r4427 r4484  
    79627962## OUTPUT CONFIGURE ##
    79637963######################
    7964                                                                                                                                             ac_config_files="$ac_config_files Makefile src/Makefile src/lib/Makefile src/lib/graphics/Makefile src/lib/graphics/importer/Makefile src/lib/physics/Makefile src/lib/particles/Makefile src/lib/gui/Makefile src/lib/tinyxml/Makefile src/subprojects/Makefile src/subprojects/testmain/Makefile src/subprojects/importer/Makefile src/subprojects/particles/Makefile src/subprojects/gui/Makefile"
     7964                                                                                                                                                      ac_config_files="$ac_config_files Makefile src/Makefile src/lib/Makefile src/lib/graphics/Makefile src/lib/graphics/importer/Makefile src/lib/event/Makefile src/lib/physics/Makefile src/lib/particles/Makefile src/lib/gui/Makefile src/lib/tinyxml/Makefile src/subprojects/Makefile src/subprojects/testmain/Makefile src/subprojects/importer/Makefile src/subprojects/particles/Makefile src/subprojects/gui/Makefile"
    79657965
    79667966
    … …  
    85618561  "src/lib/graphics/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/graphics/Makefile" ;;
    85628562  "src/lib/graphics/importer/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/graphics/importer/Makefile" ;;
     8563  "src/lib/event/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/event/Makefile" ;;
    85638564  "src/lib/physics/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/physics/Makefile" ;;
    85648565  "src/lib/particles/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/particles/Makefile" ;;

  • orxonox/trunk/configure.ac

    r4427 r4484  
    519519                 src/lib/graphics/Makefile
    520520                 src/lib/graphics/importer/Makefile
     521                 src/lib/event/Makefile
    521522                 src/lib/physics/Makefile
    522523                 src/lib/particles/Makefile

  • orxonox/trunk/src/Makefile.am

    r4457 r4484  
    1010
    1111orxonox_DEPENDENCIES = lib/gui/libORXgui.a \
     12                       lib/event/libORXevent.a \
    1213                       lib/physics/libORXphysics.a \
    1314                       lib/particles/libORXparticles.a \
    … …  
    1516
    1617orxonox_LDADD = lib/gui/libORXgui.a \
     18                lib/event/libORXevent.a \
    1719                lib/physics/libORXphysics.a \
    1820                lib/particles/libORXparticles.a \
    … …  
    5658                 lib/coord/null_parent.cc \
    5759                 lib/coord/helper_parent.cc \
    58                  lib/event/event.cc \
    59                  lib/event/event_handler.cc \
    60                  lib/event/event_listener.cc \
    61                  lib/event/key_mapper.cc \
    62                  lib/event/key_names.cc \
    6360                 lib/graphics/graphics_engine.cc \
    6461                 lib/graphics/light.cc \
    … …  
    127124                 lib/coord/null_parent.h \
    128125                 lib/coord/helper_parent.h \
    129                  lib/event/event.h \
    130                  lib/event/event_def.h \
    131                  lib/event/event_listener.h \
    132                  lib/event/event_handler.h \
    133                  lib/event/key_mapper.h \
    134                  lib/event/key_names.h \
    135126                 lib/graphics/graphics_engine.h \
    136127                 lib/graphics/light.h \

  • orxonox/trunk/src/Makefile.in

    r4476 r4484  
    6666        character_attributes.$(OBJEXT) test_gun.$(OBJEXT) \
    6767        test_bullet.$(OBJEXT) test_entity.$(OBJEXT) p_node.$(OBJEXT) \
    68         null_parent.$(OBJEXT) helper_parent.$(OBJEXT) event.$(OBJEXT) \
    69         event_handler.$(OBJEXT) event_listener.$(OBJEXT) \
    70         key_mapper.$(OBJEXT) key_names.$(OBJEXT) \
     68        null_parent.$(OBJEXT) helper_parent.$(OBJEXT) \
    7169        graphics_engine.$(OBJEXT) light.$(OBJEXT) \
    7270        text_engine.$(OBJEXT) array.$(OBJEXT) objModel.$(OBJEXT) \
    … …  
    8987@AMDEP_TRUE@    ./$(DEPDIR)/character_attributes.Po \
    9088@AMDEP_TRUE@    ./$(DEPDIR)/curve.Po ./$(DEPDIR)/environment.Po \
    91 @AMDEP_TRUE@    ./$(DEPDIR)/event.Po ./$(DEPDIR)/event_handler.Po \
    92 @AMDEP_TRUE@    ./$(DEPDIR)/event_listener.Po \
    9389@AMDEP_TRUE@    ./$(DEPDIR)/factory.Po ./$(DEPDIR)/game_loader.Po \
    9490@AMDEP_TRUE@    ./$(DEPDIR)/garbage_collector.Po \
    … …  
    9692@AMDEP_TRUE@    ./$(DEPDIR)/graphics_engine.Po \
    9793@AMDEP_TRUE@    ./$(DEPDIR)/helper_parent.Po \
    98 @AMDEP_TRUE@    ./$(DEPDIR)/ini_parser.Po \
    99 @AMDEP_TRUE@    ./$(DEPDIR)/key_mapper.Po ./$(DEPDIR)/key_names.Po \
    100 @AMDEP_TRUE@    ./$(DEPDIR)/light.Po ./$(DEPDIR)/list.Po \
    101 @AMDEP_TRUE@    ./$(DEPDIR)/load_param.Po ./$(DEPDIR)/material.Po \
    102 @AMDEP_TRUE@    ./$(DEPDIR)/md2Model.Po ./$(DEPDIR)/model.Po \
    103 @AMDEP_TRUE@    ./$(DEPDIR)/null_parent.Po ./$(DEPDIR)/objModel.Po \
     94@AMDEP_TRUE@    ./$(DEPDIR)/ini_parser.Po ./$(DEPDIR)/light.Po \
     95@AMDEP_TRUE@    ./$(DEPDIR)/list.Po ./$(DEPDIR)/load_param.Po \
     96@AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/md2Model.Po \
     97@AMDEP_TRUE@    ./$(DEPDIR)/model.Po ./$(DEPDIR)/null_parent.Po \
     98@AMDEP_TRUE@    ./$(DEPDIR)/objModel.Po \
    10499@AMDEP_TRUE@    ./$(DEPDIR)/object_manager.Po \
    105100@AMDEP_TRUE@    ./$(DEPDIR)/orxonox.Po ./$(DEPDIR)/p_node.Po \
    … …  
    247242MAINSRCDIR = .
    248243orxonox_DEPENDENCIES = lib/gui/libORXgui.a \
     244                       lib/event/libORXevent.a \
    249245                       lib/physics/libORXphysics.a \
    250246                       lib/particles/libORXparticles.a \
    … …  
    252248
    253249orxonox_LDADD = lib/gui/libORXgui.a \
     250                lib/event/libORXevent.a \
    254251                lib/physics/libORXphysics.a \
    255252                lib/particles/libORXparticles.a \
    … …  
    292289                 lib/coord/null_parent.cc \
    293290                 lib/coord/helper_parent.cc \
    294                  lib/event/event.cc \
    295                  lib/event/event_handler.cc \
    296                  lib/event/event_listener.cc \
    297                  lib/event/key_mapper.cc \
    298                  lib/event/key_names.cc \
    299291                 lib/graphics/graphics_engine.cc \
    300292                 lib/graphics/light.cc \
    … …  
    363355                 lib/coord/null_parent.h \
    364356                 lib/coord/helper_parent.h \
    365                  lib/event/event.h \
    366                  lib/event/event_def.h \
    367                  lib/event/event_listener.h \
    368                  lib/event/event_handler.h \
    369                  lib/event/key_mapper.h \
    370                  lib/event/key_names.h \
    371357                 lib/graphics/graphics_engine.h \
    372358                 lib/graphics/light.h \
    … …  
    420406          esac; \
    421407        done; \
    422         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
     408        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
    423409        cd $(top_srcdir) && \
    424           $(AUTOMAKE) --gnu  src/Makefile
     410          $(AUTOMAKE) --foreign  src/Makefile
    425411.PRECIOUS: Makefile
    426412Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    484470@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curve.Po@am__quote@
    485471@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/environment.Po@am__quote@
    486 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event.Po@am__quote@
    487 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event_handler.Po@am__quote@
    488 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event_listener.Po@am__quote@
    489472@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/factory.Po@am__quote@
    490473@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/game_loader.Po@am__quote@
    … …  
    494477@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/helper_parent.Po@am__quote@
    495478@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ini_parser.Po@am__quote@
    496 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/key_mapper.Po@am__quote@
    497 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/key_names.Po@am__quote@
    498479@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/light.Po@am__quote@
    499480@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Po@am__quote@
    … …  
    10901071@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    10911072@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o helper_parent.obj `if test -f 'lib/coord/helper_parent.cc'; then $(CYGPATH_W) 'lib/coord/helper_parent.cc'; else $(CYGPATH_W) '$(srcdir)/lib/coord/helper_parent.cc'; fi`
    1092 
    1093 event.o: lib/event/event.cc
    1094 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT event.o -MD -MP -MF "$(DEPDIR)/event.Tpo" -c -o event.o `test -f 'lib/event/event.cc' || echo '$(srcdir)/'`lib/event/event.cc; \
    1095 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/event.Tpo" "$(DEPDIR)/event.Po"; else rm -f "$(DEPDIR)/event.Tpo"; exit 1; fi
    1096 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/event/event.cc' object='event.o' libtool=no @AMDEPBACKSLASH@
    1097 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/event.Po' tmpdepfile='$(DEPDIR)/event.TPo' @AMDEPBACKSLASH@
    1098 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1099 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o event.o `test -f 'lib/event/event.cc' || echo '$(srcdir)/'`lib/event/event.cc
    1100 
    1101 event.obj: lib/event/event.cc
    1102 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT event.obj -MD -MP -MF "$(DEPDIR)/event.Tpo" -c -o event.obj `if test -f 'lib/event/event.cc'; then $(CYGPATH_W) 'lib/event/event.cc'; else $(CYGPATH_W) '$(srcdir)/lib/event/event.cc'; fi`; \
    1103 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/event.Tpo" "$(DEPDIR)/event.Po"; else rm -f "$(DEPDIR)/event.Tpo"; exit 1; fi
    1104 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/event/event.cc' object='event.obj' libtool=no @AMDEPBACKSLASH@
    1105 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/event.Po' tmpdepfile='$(DEPDIR)/event.TPo' @AMDEPBACKSLASH@
    1106 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1107 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o event.obj `if test -f 'lib/event/event.cc'; then $(CYGPATH_W) 'lib/event/event.cc'; else $(CYGPATH_W) '$(srcdir)/lib/event/event.cc'; fi`
    1108 
    1109 event_handler.o: lib/event/event_handler.cc
    1110 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT event_handler.o -MD -MP -MF "$(DEPDIR)/event_handler.Tpo" -c -o event_handler.o `test -f 'lib/event/event_handler.cc' || echo '$(srcdir)/'`lib/event/event_handler.cc; \
    1111 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/event_handler.Tpo" "$(DEPDIR)/event_handler.Po"; else rm -f "$(DEPDIR)/event_handler.Tpo"; exit 1; fi
    1112 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/event/event_handler.cc' object='event_handler.o' libtool=no @AMDEPBACKSLASH@
    1113 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/event_handler.Po' tmpdepfile='$(DEPDIR)/event_handler.TPo' @AMDEPBACKSLASH@
    1114 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1115 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o event_handler.o `test -f 'lib/event/event_handler.cc' || echo '$(srcdir)/'`lib/event/event_handler.cc
    1116 
    1117 event_handler.obj: lib/event/event_handler.cc
    1118 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT event_handler.obj -MD -MP -MF "$(DEPDIR)/event_handler.Tpo" -c -o event_handler.obj `if test -f 'lib/event/event_handler.cc'; then $(CYGPATH_W) 'lib/event/event_handler.cc'; else $(CYGPATH_W) '$(srcdir)/lib/event/event_handler.cc'; fi`; \
    1119 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/event_handler.Tpo" "$(DEPDIR)/event_handler.Po"; else rm -f "$(DEPDIR)/event_handler.Tpo"; exit 1; fi
    1120 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/event/event_handler.cc' object='event_handler.obj' libtool=no @AMDEPBACKSLASH@
    1121 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/event_handler.Po' tmpdepfile='$(DEPDIR)/event_handler.TPo' @AMDEPBACKSLASH@
    1122 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1123 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o event_handler.obj `if test -f 'lib/event/event_handler.cc'; then $(CYGPATH_W) 'lib/event/event_handler.cc'; else $(CYGPATH_W) '$(srcdir)/lib/event/event_handler.cc'; fi`
    1124 
    1125 event_listener.o: lib/event/event_listener.cc
    1126 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT event_listener.o -MD -MP -MF "$(DEPDIR)/event_listener.Tpo" -c -o event_listener.o `test -f 'lib/event/event_listener.cc' || echo '$(srcdir)/'`lib/event/event_listener.cc; \
    1127 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/event_listener.Tpo" "$(DEPDIR)/event_listener.Po"; else rm -f "$(DEPDIR)/event_listener.Tpo"; exit 1; fi
    1128 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/event/event_listener.cc' object='event_listener.o' libtool=no @AMDEPBACKSLASH@
    1129 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/event_listener.Po' tmpdepfile='$(DEPDIR)/event_listener.TPo' @AMDEPBACKSLASH@
    1130 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1131 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o event_listener.o `test -f 'lib/event/event_listener.cc' || echo '$(srcdir)/'`lib/event/event_listener.cc
    1132 
    1133 event_listener.obj: lib/event/event_listener.cc
    1134 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT event_listener.obj -MD -MP -MF "$(DEPDIR)/event_listener.Tpo" -c -o event_listener.obj `if test -f 'lib/event/event_listener.cc'; then $(CYGPATH_W) 'lib/event/event_listener.cc'; else $(CYGPATH_W) '$(srcdir)/lib/event/event_listener.cc'; fi`; \
    1135 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/event_listener.Tpo" "$(DEPDIR)/event_listener.Po"; else rm -f "$(DEPDIR)/event_listener.Tpo"; exit 1; fi
    1136 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/event/event_listener.cc' object='event_listener.obj' libtool=no @AMDEPBACKSLASH@
    1137 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/event_listener.Po' tmpdepfile='$(DEPDIR)/event_listener.TPo' @AMDEPBACKSLASH@
    1138 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1139 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o event_listener.obj `if test -f 'lib/event/event_listener.cc'; then $(CYGPATH_W) 'lib/event/event_listener.cc'; else $(CYGPATH_W) '$(srcdir)/lib/event/event_listener.cc'; fi`
    1140 
    1141 key_mapper.o: lib/event/key_mapper.cc
    1142 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT key_mapper.o -MD -MP -MF "$(DEPDIR)/key_mapper.Tpo" -c -o key_mapper.o `test -f 'lib/event/key_mapper.cc' || echo '$(srcdir)/'`lib/event/key_mapper.cc; \
    1143 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/key_mapper.Tpo" "$(DEPDIR)/key_mapper.Po"; else rm -f "$(DEPDIR)/key_mapper.Tpo"; exit 1; fi
    1144 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/event/key_mapper.cc' object='key_mapper.o' libtool=no @AMDEPBACKSLASH@
    1145 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/key_mapper.Po' tmpdepfile='$(DEPDIR)/key_mapper.TPo' @AMDEPBACKSLASH@
    1146 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1147 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o key_mapper.o `test -f 'lib/event/key_mapper.cc' || echo '$(srcdir)/'`lib/event/key_mapper.cc
    1148 
    1149 key_mapper.obj: lib/event/key_mapper.cc
    1150 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT key_mapper.obj -MD -MP -MF "$(DEPDIR)/key_mapper.Tpo" -c -o key_mapper.obj `if test -f 'lib/event/key_mapper.cc'; then $(CYGPATH_W) 'lib/event/key_mapper.cc'; else $(CYGPATH_W) '$(srcdir)/lib/event/key_mapper.cc'; fi`; \
    1151 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/key_mapper.Tpo" "$(DEPDIR)/key_mapper.Po"; else rm -f "$(DEPDIR)/key_mapper.Tpo"; exit 1; fi
    1152 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/event/key_mapper.cc' object='key_mapper.obj' libtool=no @AMDEPBACKSLASH@
    1153 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/key_mapper.Po' tmpdepfile='$(DEPDIR)/key_mapper.TPo' @AMDEPBACKSLASH@
    1154 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1155 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o key_mapper.obj `if test -f 'lib/event/key_mapper.cc'; then $(CYGPATH_W) 'lib/event/key_mapper.cc'; else $(CYGPATH_W) '$(srcdir)/lib/event/key_mapper.cc'; fi`
    1156 
    1157 key_names.o: lib/event/key_names.cc
    1158 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT key_names.o -MD -MP -MF "$(DEPDIR)/key_names.Tpo" -c -o key_names.o `test -f 'lib/event/key_names.cc' || echo '$(srcdir)/'`lib/event/key_names.cc; \
    1159 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/key_names.Tpo" "$(DEPDIR)/key_names.Po"; else rm -f "$(DEPDIR)/key_names.Tpo"; exit 1; fi
    1160 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/event/key_names.cc' object='key_names.o' libtool=no @AMDEPBACKSLASH@
    1161 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/key_names.Po' tmpdepfile='$(DEPDIR)/key_names.TPo' @AMDEPBACKSLASH@
    1162 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1163 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o key_names.o `test -f 'lib/event/key_names.cc' || echo '$(srcdir)/'`lib/event/key_names.cc
    1164 
    1165 key_names.obj: lib/event/key_names.cc
    1166 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT key_names.obj -MD -MP -MF "$(DEPDIR)/key_names.Tpo" -c -o key_names.obj `if test -f 'lib/event/key_names.cc'; then $(CYGPATH_W) 'lib/event/key_names.cc'; else $(CYGPATH_W) '$(srcdir)/lib/event/key_names.cc'; fi`; \
    1167 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/key_names.Tpo" "$(DEPDIR)/key_names.Po"; else rm -f "$(DEPDIR)/key_names.Tpo"; exit 1; fi
    1168 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/event/key_names.cc' object='key_names.obj' libtool=no @AMDEPBACKSLASH@
    1169 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/key_names.Po' tmpdepfile='$(DEPDIR)/key_names.TPo' @AMDEPBACKSLASH@
    1170 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1171 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o key_names.obj `if test -f 'lib/event/key_names.cc'; then $(CYGPATH_W) 'lib/event/key_names.cc'; else $(CYGPATH_W) '$(srcdir)/lib/event/key_names.cc'; fi`
    11721073
    11731074graphics_engine.o: lib/graphics/graphics_engine.cc
    … …  
    15651466
    15661467distdir: $(DISTFILES)
    1567         $(mkdir_p) $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/event $(distdir)/lib/graphics $(distdir)/lib/graphics/importer $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/util $(distdir)/util/animation $(distdir)/util/common $(distdir)/util/loading $(distdir)/util/track $(distdir)/world_entities
     1468        $(mkdir_p) $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/graphics $(distdir)/lib/graphics/importer $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/util $(distdir)/util/animation $(distdir)/util/common $(distdir)/util/loading $(distdir)/util/track $(distdir)/world_entities
    15681469        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    15691470        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \

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

    r4416 r4484  
    33
    44SUBDIRS = graphics \
     5          event \
    56          physics \
    67          particles \

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

    r4438 r4484  
    168168GTK_PROGS = gui
    169169SUBDIRS = graphics \
     170          event \
    170171          physics \
    171172          particles \

  • orxonox/trunk/src/lib/event/Makefile.am

    r4483 r4484  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 noinst_LIBRARIES = libORXparticles.a
     4noinst_LIBRARIES = libORXevent.a
    55
    6 libORXparticles_a_SOURCES = particle_engine.cc \
    7                           particle_emitter.cc \
    8                           particle_system.cc \
    9                           quick_animation.cc
     6libORXevent_a_SOURCES = event.cc \
     7                        event_handler.cc \
     8                        event_listener.cc \
     9                        key_mapper.cc \
     10                        key_names.cc
    1011
    1112
    12 noinst_HEADERS= particle_engine.h \
    13                 particle_emitter.h \
    14                 particle_system.h \
    15                 quick_animation.h
     13noinst_HEADERS = event.h \
     14                 event_handler.h \
     15                 event_listener.h \
     16                 key_mapper.h \
     17                 key_names.h \
     18                 event_def.h
     19

  • orxonox/trunk/src/lib/event/Makefile.in

    r4483 r4484  
    1616
    1717
    18 SOURCES = $(libORXparticles_a_SOURCES)
     18SOURCES = $(libORXevent_a_SOURCES)
    1919
    2020srcdir = @srcdir@
    … …  
    3939POST_UNINSTALL = :
    4040host_triplet = @host@
    41 subdir = src/lib/particles
     41subdir = src/lib/event
    4242DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
    4343        $(srcdir)/Makefile.in
    … …  
    5252AR = ar
    5353ARFLAGS = cru
    54 libORXparticles_a_AR = $(AR) $(ARFLAGS)
    55 libORXparticles_a_LIBADD =
    56 am_libORXparticles_a_OBJECTS = particle_engine.$(OBJEXT) \
    57         particle_emitter.$(OBJEXT) particle_system.$(OBJEXT) \
    58         quick_animation.$(OBJEXT)
    59 libORXparticles_a_OBJECTS = $(am_libORXparticles_a_OBJECTS)
     54libORXevent_a_AR = $(AR) $(ARFLAGS)
     55libORXevent_a_LIBADD =
     56am_libORXevent_a_OBJECTS = event.$(OBJEXT) event_handler.$(OBJEXT) \
     57        event_listener.$(OBJEXT) key_mapper.$(OBJEXT) \
     58        key_names.$(OBJEXT)
     59libORXevent_a_OBJECTS = $(am_libORXevent_a_OBJECTS)
    6060DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    6161depcomp = $(SHELL) $(top_srcdir)/depcomp
    6262am__depfiles_maybe = depfiles
    63 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/particle_emitter.Po \
    64 @AMDEP_TRUE@    ./$(DEPDIR)/particle_engine.Po \
    65 @AMDEP_TRUE@    ./$(DEPDIR)/particle_system.Po \
    66 @AMDEP_TRUE@    ./$(DEPDIR)/quick_animation.Po
     63@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/event.Po \
     64@AMDEP_TRUE@    ./$(DEPDIR)/event_handler.Po \
     65@AMDEP_TRUE@    ./$(DEPDIR)/event_listener.Po \
     66@AMDEP_TRUE@    ./$(DEPDIR)/key_mapper.Po ./$(DEPDIR)/key_names.Po
    6767CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6868        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    … …  
    7070CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
    7171        -o $@
    72 SOURCES = $(libORXparticles_a_SOURCES)
    73 DIST_SOURCES = $(libORXparticles_a_SOURCES)
     72SOURCES = $(libORXevent_a_SOURCES)
     73DIST_SOURCES = $(libORXevent_a_SOURCES)
    7474HEADERS = $(noinst_HEADERS)
    7575ETAGS = etags
    … …  
    185185target_vendor = @target_vendor@
    186186MAINSRCDIR = ../..
    187 noinst_LIBRARIES = libORXparticles.a
    188 libORXparticles_a_SOURCES = particle_engine.cc \
    189                           particle_emitter.cc \
    190                           particle_system.cc \
    191                           quick_animation.cc
    192 
    193 noinst_HEADERS = particle_engine.h \
    194                 particle_emitter.h \
    195                 particle_system.h \
    196                 quick_animation.h
     187noinst_LIBRARIES = libORXevent.a
     188libORXevent_a_SOURCES = event.cc \
     189                        event_handler.cc \
     190                        event_listener.cc \
     191                        key_mapper.cc \
     192                        key_names.cc
     193
     194noinst_HEADERS = event.h \
     195                 event_handler.h \
     196                 event_listener.h \
     197                 key_mapper.h \
     198                 key_names.h \
     199                 event_def.h
    197200
    198201all: all-am
    … …  
    209212          esac; \
    210213        done; \
    211         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/particles/Makefile'; \
     214        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/event/Makefile'; \
    212215        cd $(top_srcdir) && \
    213           $(AUTOMAKE) --foreign  src/lib/particles/Makefile
     216          $(AUTOMAKE) --foreign  src/lib/event/Makefile
    214217.PRECIOUS: Makefile
    215218Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    232235clean-noinstLIBRARIES:
    233236        -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
    234 libORXparticles.a: $(libORXparticles_a_OBJECTS) $(libORXparticles_a_DEPENDENCIES)
    235         -rm -f libORXparticles.a
    236         $(libORXparticles_a_AR) libORXparticles.a $(libORXparticles_a_OBJECTS) $(libORXparticles_a_LIBADD)
    237         $(RANLIB) libORXparticles.a
     237libORXevent.a: $(libORXevent_a_OBJECTS) $(libORXevent_a_DEPENDENCIES)
     238        -rm -f libORXevent.a
     239        $(libORXevent_a_AR) libORXevent.a $(libORXevent_a_OBJECTS) $(libORXevent_a_LIBADD)
     240        $(RANLIB) libORXevent.a
    238241
    239242mostlyclean-compile:
    … …  
    243246        -rm -f *.tab.c
    244247
    245 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particle_emitter.Po@am__quote@
    246 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particle_engine.Po@am__quote@
    247 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particle_system.Po@am__quote@
    248 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quick_animation.Po@am__quote@
     248@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event.Po@am__quote@
     249@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event_handler.Po@am__quote@
     250@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event_listener.Po@am__quote@
     251@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/key_mapper.Po@am__quote@
     252@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/key_names.Po@am__quote@
    249253
    250254.cc.o:
Note: See TracChangeset for help on using the changeset viewer.