Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4338 in orxonox.OLD for orxonox/trunk/src/subprojects


Ignore:
Timestamp:
May 27, 2005, 9:16:53 PM (20 years ago)
Author:
bensch
Message:

orxonox/trunk: merged branches/physics back to the trunk
merged with command
svn merge -r 3866:HEAD . ../../trunk/
many conflict that i tried to resolv
@patrick: i hope i did not interfere with your stuff :/

Location:
orxonox/trunk/src/subprojects
Files:
4 edited
6 copied

Legend:

Unmodified
Added
Removed

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

    r4266 r4338  
    11SUBDIRS = importer \
     2          particles \
    23          gui \
    34          testmain
     5
     6noinst_HEADERS = framework.h
     7
     8
     9EXTRA_DIST = framework.cc
     10

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

    r4276 r4338  
    1414
    1515@SET_MAKE@
     16
    1617srcdir = @srcdir@
    1718top_srcdir = @top_srcdir@
    … …  
    3637host_triplet = @host@
    3738subdir = src/subprojects
    38 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
     39DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
     40        $(srcdir)/Makefile.in
    3941ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    4042am__aclocal_m4_deps = $(top_srcdir)/configure.ac
    … …  
    5254        pdf-recursive ps-recursive uninstall-info-recursive \
    5355        uninstall-recursive
     56HEADERS = $(noinst_HEADERS)
    5457ETAGS = etags
    5558CTAGS = ctags
    … …  
    165168target_vendor = @target_vendor@
    166169SUBDIRS = importer \
     170          particles \
    167171          gui \
    168172          testmain
    169173
     174noinst_HEADERS = framework.h
     175EXTRA_DIST = framework.cc
    170176all: all-recursive
    171177
    … …  
    364370check-am: all-am
    365371check: check-recursive
    366 all-am: Makefile
     372all-am: Makefile $(HEADERS)
    367373installdirs: installdirs-recursive
    368374installdirs-am:

  • orxonox/trunk/src/subprojects/importer/Makefile.am

    r4272 r4338  
    4848                  $(MAINSRCDIR)/lib/coord/null_parent.cc
    4949
    50 noinst_HEADERS = framework.h \
    51                  windowHandler.h
     50noinst_HEADERS = framework.h
     51

  • orxonox/trunk/src/subprojects/importer/Makefile.in

    r4276 r4338  
    212212                  $(MAINSRCDIR)/lib/coord/null_parent.cc
    213213
    214 noinst_HEADERS = framework.h \
    215                  windowHandler.h
    216 
     214noinst_HEADERS = framework.h
    217215all: all-am
    218216
Note: See TracChangeset for help on using the changeset viewer.