Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5517 in orxonox.OLD


Ignore:
Timestamp:
Nov 9, 2005, 4:06:59 PM (18 years ago)
Author:
patrick
Message:

branches/lib/network: added the network folder to the automake project

Location:
branches/network
Files:
3 added
29 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/network/Makefile.in

    r5506 r5517  
    1 # Makefile.in generated by automake 1.9.6 from Makefile.am.
     1# Makefile.in generated by automake 1.9.5 from Makefile.am.
    22# @configure_input@
    33

  • branches/network/aclocal.m4

    r5479 r5517  
    1 # generated automatically by aclocal 1.9.6 -*- Autoconf -*-
     1# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
    22
    33# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
    … …  
    2929# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
    3030AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
    31          [AM_AUTOMAKE_VERSION([1.9.6])])
     31         [AM_AUTOMAKE_VERSION([1.9.5])])
    3232
    3333# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-

  • branches/network/configure

    r5506 r5517  
    1118511185## OUTPUT CONFIGURE ##
    1118611186######################
    11187                                                                                                                                                                                                                                       ac_config_files="$ac_config_files Makefile src/Makefile src/lib/Makefile src/lib/graphics/Makefile src/lib/graphics/importer/Makefile src/lib/graphics/spatial_separation/Makefile src/lib/sound/Makefile src/lib/event/Makefile src/lib/physics/Makefile src/lib/particles/Makefile src/lib/collision_detection/Makefile src/lib/shell/Makefile src/lib/gui/Makefile src/lib/gui/gtk_gui/Makefile src/lib/gui/gl_gui/Makefile src/lib/tinyxml/Makefile src/util/Makefile src/subprojects/Makefile src/subprojects/testmain/Makefile src/subprojects/importer/Makefile src/subprojects/particles/Makefile src/subprojects/collision_detection/Makefile src/subprojects/network/Makefile"
     11187                                                                                                                                                                                                                                                ac_config_files="$ac_config_files Makefile src/Makefile src/lib/Makefile src/lib/graphics/Makefile src/lib/graphics/importer/Makefile src/lib/graphics/spatial_separation/Makefile src/lib/sound/Makefile src/lib/event/Makefile src/lib/physics/Makefile src/lib/particles/Makefile src/lib/collision_detection/Makefile src/lib/network/Makefile src/lib/shell/Makefile src/lib/gui/Makefile src/lib/gui/gtk_gui/Makefile src/lib/gui/gl_gui/Makefile src/lib/tinyxml/Makefile src/util/Makefile src/subprojects/Makefile src/subprojects/testmain/Makefile src/subprojects/importer/Makefile src/subprojects/particles/Makefile src/subprojects/collision_detection/Makefile src/subprojects/network/Makefile"
    1118811188
    1118911189
    … …  
    1179011790  "src/lib/particles/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/particles/Makefile" ;;
    1179111791  "src/lib/collision_detection/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/collision_detection/Makefile" ;;
     11792  "src/lib/network/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/network/Makefile" ;;
    1179211793  "src/lib/shell/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/shell/Makefile" ;;
    1179311794  "src/lib/gui/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/gui/Makefile" ;;

  • branches/network/configure.ac

    r5506 r5517  
    739739                 src/lib/particles/Makefile
    740740                 src/lib/collision_detection/Makefile
     741                 src/lib/network/Makefile
    741742                 src/lib/shell/Makefile
    742743                 src/lib/gui/Makefile

  • branches/network/src/Makefile.am

    r5463 r5517  
    2020                       lib/particles/libORXparticles.a \
    2121                       lib/collision_detection/libORXcd.a \
     22                       lib/network/libORXnet.a \
    2223                       lib/graphics/spatial_separation/libORXquadtree.a \
    2324                       lib/tinyxml/libtinyxml.a \
    … …  
    3536                lib/particles/libORXparticles.a \
    3637                lib/collision_detection/libORXcd.a \
     38                lib/network/libORXnet.a \
    3739                lib/graphics/spatial_separation/libORXquadtree.a \
    3840                lib/tinyxml/libtinyxml.a \

  • branches/network/src/Makefile.in

    r5479 r5517  
    1 # Makefile.in generated by automake 1.9.6 from Makefile.am.
     1# Makefile.in generated by automake 1.9.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
     17
     18SOURCES = $(orxonox_SOURCES)
    1719
    1820srcdir = @srcdir@
    … …  
    214216                       lib/particles/libORXparticles.a \
    215217                       lib/collision_detection/libORXcd.a \
     218                       lib/network/libORXnet.a \
    216219                       lib/graphics/spatial_separation/libORXquadtree.a \
    217220                       lib/tinyxml/libtinyxml.a \
    … …  
    229232                lib/particles/libORXparticles.a \
    230233                lib/collision_detection/libORXcd.a \
     234                lib/network/libORXnet.a \
    231235                lib/graphics/spatial_separation/libORXquadtree.a \
    232236                lib/tinyxml/libtinyxml.a \

  • branches/network/src/defs/include_paths.am

    r5342 r5517  
    2020AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/util
    2121AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/math
     22AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/network
    2223AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/tinyxml
    2324AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/physics

  • branches/network/src/lib/Makefile.am

    r5463 r5517  
    1313                            particles/libORXparticles.a \
    1414                            collision_detection/libORXcd.a \
     15                            network/libORXnet.a \
    1516                            graphics/spatial_separation/libORXquadtree.a \
    1617                            tinyxml/libtinyxml.a \
    … …  
    2627                            particles/libORXparticles.a \
    2728                            collision_detection/libORXcd.a \
     29                            network/libORXnet.a \
    2830                            graphics/spatial_separation/libORXquadtree.a \
    2931                            tinyxml/libtinyxml.a \
    … …  
    6466          particles \
    6567          collision_detection \
     68          network \
    6669          tinyxml \
    6770          shell \

  • branches/network/src/lib/Makefile.in

    r5479 r5517  
    1 # Makefile.in generated by automake 1.9.6 from Makefile.am.
     1# Makefile.in generated by automake 1.9.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
     17
     18SOURCES = $(libORXlibs_a_SOURCES)
    1719
    1820srcdir = @srcdir@
    … …  
    202204#                            particles/libORXparticles.a \
    203205#                            collision_detection/libORXcd.a \
     206#                           network/libORXnet.a \
    204207#                            graphics/spatial_separation/libORXquadtree.a \
    205208#                            tinyxml/libtinyxml.a \
    … …  
    215218#                            particles/libORXparticles.a \
    216219#                            collision_detection/libORXcd.a \
     220#                           network/libORXnet.a \
    217221#                            graphics/spatial_separation/libORXquadtree.a \
    218222#                            tinyxml/libtinyxml.a \
    … …  
    252256          particles \
    253257          collision_detection \
     258          network \
    254259          tinyxml \
    255260          shell \

  • branches/network/src/lib/collision_detection/Makefile.in

    r5479 r5517  
    1 # Makefile.in generated by automake 1.9.6 from Makefile.am.
     1# Makefile.in generated by automake 1.9.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
     17
     18SOURCES = $(libORXcd_a_SOURCES)
    1719
    1820srcdir = @srcdir@

  • branches/network/src/lib/event/Makefile.in

    r5479 r5517  
    1 # Makefile.in generated by automake 1.9.6 from Makefile.am.
     1# Makefile.in generated by automake 1.9.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
     17
     18SOURCES = $(libORXevent_a_SOURCES)
    1719
    1820srcdir = @srcdir@

  • branches/network/src/lib/graphics/Makefile.in

    r5479 r5517  
    1 # Makefile.in generated by automake 1.9.6 from Makefile.am.
     1# Makefile.in generated by automake 1.9.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
     17
     18SOURCES = $(libORXgraphics_a_SOURCES)
    1719
    1820srcdir = @srcdir@

  • branches/network/src/lib/graphics/importer/Makefile.in

    r5479 r5517  
    1 # Makefile.in generated by automake 1.9.6 from Makefile.am.
     1# Makefile.in generated by automake 1.9.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
     17
     18SOURCES = $(libORXimporter_a_SOURCES)
    1719
    1820srcdir = @srcdir@

  • branches/network/src/lib/graphics/spatial_separation/Makefile.in

    r5479 r5517  
    1 # Makefile.in generated by automake 1.9.6 from Makefile.am.
     1# Makefile.in generated by automake 1.9.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
     17
     18SOURCES = $(libORXquadtree_a_SOURCES)
    1719
    1820srcdir = @srcdir@

  • branches/network/src/lib/gui/Makefile.in

    r5479 r5517  
    1 # Makefile.in generated by automake 1.9.6 from Makefile.am.
     1# Makefile.in generated by automake 1.9.5 from Makefile.am.
    22# @configure_input@
    33

  • branches/network/src/lib/gui/gl_gui/Makefile.in

    r5479 r5517  
    1 # Makefile.in generated by automake 1.9.6 from Makefile.am.
     1# Makefile.in generated by automake 1.9.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
     17
     18SOURCES = $(libORXglgui_a_SOURCES)
    1719
    1820srcdir = @srcdir@

  • branches/network/src/lib/gui/gtk_gui/Makefile.in

    r5479 r5517  
    1 # Makefile.in generated by automake 1.9.6 from Makefile.am.
     1# Makefile.in generated by automake 1.9.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
     17
     18SOURCES = $(libORXgui_a_SOURCES)
    1719
    1820srcdir = @srcdir@

  • branches/network/src/lib/network/Makefile.in

    r5516 r5517  
    1 # Makefile.in generated by automake 1.9.6 from Makefile.am.
     1# Makefile.in generated by automake 1.9.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
     17
     18SOURCES = $(libORXnet_a_SOURCES)
    1719
    1820srcdir = @srcdir@
    … …  
    3941host_triplet = @host@
    4042target_triplet = @target@
    41 subdir = src/lib/collision_detection
     43subdir = src/lib/network
    4244DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
    4345        $(srcdir)/Makefile.in
    … …  
    5254AR = ar
    5355ARFLAGS = cru
    54 libORXcd_a_AR = $(AR) $(ARFLAGS)
    55 libORXcd_a_LIBADD =
    56 am_libORXcd_a_OBJECTS = cd_engine.$(OBJEXT) collision.$(OBJEXT) \
    57         obb.$(OBJEXT) obb_tree.$(OBJEXT) obb_tree_node.$(OBJEXT) \
    58         bv_tree.$(OBJEXT) bv_tree_node.$(OBJEXT) \
    59         bounding_volume.$(OBJEXT) bounding_sphere.$(OBJEXT)
    60 libORXcd_a_OBJECTS = $(am_libORXcd_a_OBJECTS)
     56libORXnet_a_AR = $(AR) $(ARFLAGS)
     57libORXnet_a_LIBADD =
     58am_libORXnet_a_OBJECTS = synchronizeable.$(OBJEXT)
     59libORXnet_a_OBJECTS = $(am_libORXnet_a_OBJECTS)
    6160DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    6261depcomp = $(SHELL) $(top_srcdir)/depcomp
    … …  
    6766CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
    6867        -o $@
    69 SOURCES = $(libORXcd_a_SOURCES)
    70 DIST_SOURCES = $(libORXcd_a_SOURCES)
     68SOURCES = $(libORXnet_a_SOURCES)
     69DIST_SOURCES = $(libORXnet_a_SOURCES)
    7170HEADERS = $(noinst_HEADERS)
    7271ETAGS = etags
    … …  
    184183target_vendor = @target_vendor@
    185184MAINSRCDIR = ../..
    186 noinst_LIBRARIES = libORXcd.a
    187 libORXcd_a_SOURCES = cd_engine.cc \
    188                      collision.cc \
    189                      obb.cc \
    190                      obb_tree.cc \
    191                      obb_tree_node.cc \
    192                      bv_tree.cc \
    193                      bv_tree_node.cc \
    194                      bounding_volume.cc \
    195                      bounding_sphere.cc
    196 
    197 noinst_HEADERS = cd_engine.h \
    198                      collision_defs.h \
    199                      collision.h \
    200                      obb.h \
    201                      obb_tree.h \
    202                      obb_tree_node.h \
    203                      bv_tree.h \
    204                      bv_tree_node.h \
    205                      bounding_volume.h \
    206                      bounding_sphere.h \
    207                      lin_alg.h
    208 
     185noinst_LIBRARIES = libORXnet.a
     186libORXnet_a_SOURCES = synchronizeable.cc
     187noinst_HEADERS = synchronizeable.h
    209188all: all-am
    210189
    … …  
    220199          esac; \
    221200        done; \
    222         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/collision_detection/Makefile'; \
     201        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/network/Makefile'; \
    223202        cd $(top_srcdir) && \
    224           $(AUTOMAKE) --foreign  src/lib/collision_detection/Makefile
     203          $(AUTOMAKE) --foreign  src/lib/network/Makefile
    225204.PRECIOUS: Makefile
    226205Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    243222clean-noinstLIBRARIES:
    244223        -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
    245 libORXcd.a: $(libORXcd_a_OBJECTS) $(libORXcd_a_DEPENDENCIES)
    246         -rm -f libORXcd.a
    247         $(libORXcd_a_AR) libORXcd.a $(libORXcd_a_OBJECTS) $(libORXcd_a_LIBADD)
    248         $(RANLIB) libORXcd.a
     224libORXnet.a: $(libORXnet_a_OBJECTS) $(libORXnet_a_DEPENDENCIES)
     225        -rm -f libORXnet.a
     226        $(libORXnet_a_AR) libORXnet.a $(libORXnet_a_OBJECTS) $(libORXnet_a_LIBADD)
     227        $(RANLIB) libORXnet.a
    249228
    250229mostlyclean-compile:
    … …  
    254233        -rm -f *.tab.c
    255234
    256 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bounding_sphere.Po@am__quote@
    257 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bounding_volume.Po@am__quote@
    258 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bv_tree.Po@am__quote@
    259 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bv_tree_node.Po@am__quote@
    260 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cd_engine.Po@am__quote@
    261 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision.Po@am__quote@
    262 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obb.Po@am__quote@
    263 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obb_tree.Po@am__quote@
    264 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obb_tree_node.Po@am__quote@
     235@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/synchronizeable.Po@am__quote@
    265236
    266237.cc.o:

  • branches/network/src/lib/particles/Makefile.in

    r5479 r5517  
    1 # Makefile.in generated by automake 1.9.6 from Makefile.am.
     1# Makefile.in generated by automake 1.9.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
     17
     18SOURCES = $(libORXparticles_a_SOURCES)
    1719
    1820srcdir = @srcdir@

  • branches/network/src/lib/physics/Makefile.in

    r5479 r5517  
    1 # Makefile.in generated by automake 1.9.6 from Makefile.am.
     1# Makefile.in generated by automake 1.9.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
     17
     18SOURCES = $(libORXphysics_a_SOURCES)
    1719
    1820srcdir = @srcdir@

  • branches/network/src/lib/shell/Makefile.in

    r5479 r5517  
    1 # Makefile.in generated by automake 1.9.6 from Makefile.am.
     1# Makefile.in generated by automake 1.9.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
     17
     18SOURCES = $(libORXshell_a_SOURCES)
    1719
    1820srcdir = @srcdir@

  • branches/network/src/lib/sound/Makefile.in

    r5479 r5517  
    1 # Makefile.in generated by automake 1.9.6 from Makefile.am.
     1# Makefile.in generated by automake 1.9.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
     17
     18SOURCES = $(libORXsound_a_SOURCES)
    1719
    1820srcdir = @srcdir@

  • branches/network/src/lib/tinyxml/Makefile.in

    r5479 r5517  
    1 # Makefile.in generated by automake 1.9.6 from Makefile.am.
     1# Makefile.in generated by automake 1.9.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
     17
     18SOURCES = $(libtinyxml_a_SOURCES)
    1719
    1820srcdir = @srcdir@

  • branches/network/src/subprojects/Makefile.in

    r5506 r5517  
    1 # Makefile.in generated by automake 1.9.6 from Makefile.am.
     1# Makefile.in generated by automake 1.9.5 from Makefile.am.
    22# @configure_input@
    33

  • branches/network/src/subprojects/collision_detection/Makefile.in

    r5486 r5517  
    1 # Makefile.in generated by automake 1.9.6 from Makefile.am.
     1# Makefile.in generated by automake 1.9.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
     17
     18SOURCES = $(collision_SOURCES)
    1719
    1820srcdir = @srcdir@

  • branches/network/src/subprojects/importer/Makefile.in

    r5485 r5517  
    1 # Makefile.in generated by automake 1.9.6 from Makefile.am.
     1# Makefile.in generated by automake 1.9.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1414
    1515@SET_MAKE@
     16
     17SOURCES = $(importer_SOURCES)
    1618
    1719srcdir = @srcdir@

  • branches/network/src/subprojects/network/Makefile.in

    r5506 r5517  
    1 # Makefile.in generated by automake 1.9.6 from Makefile.am.
     1# Makefile.in generated by automake 1.9.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1414
    1515@SET_MAKE@
     16
     17SOURCES = $(network_SOURCES)
    1618
    1719srcdir = @srcdir@

  • branches/network/src/subprojects/particles/Makefile.in

    r5485 r5517  
    1 # Makefile.in generated by automake 1.9.6 from Makefile.am.
     1# Makefile.in generated by automake 1.9.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1414
    1515@SET_MAKE@
     16
     17SOURCES = $(particles_SOURCES)
    1618
    1719srcdir = @srcdir@

  • branches/network/src/subprojects/testmain/Makefile.in

    r5479 r5517  
    1 # Makefile.in generated by automake 1.9.6 from Makefile.am.
     1# Makefile.in generated by automake 1.9.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
     17
     18SOURCES = $(testmain_SOURCES)
    1719
    1820srcdir = @srcdir@

  • branches/network/src/util/Makefile.in

    r5479 r5517  
    1 # Makefile.in generated by automake 1.9.6 from Makefile.am.
     1# Makefile.in generated by automake 1.9.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
     17
     18SOURCES = $(libORXutils_a_SOURCES)
    1719
    1820srcdir = @srcdir@
Note: See TracChangeset for help on using the changeset viewer.