Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4223 in orxonox.OLD for orxonox/branches/physics/src/subprojects


Ignore:
Timestamp:
May 19, 2005, 7:45:28 PM (20 years ago)
Author:
bensch
Message:

orxonox/branches/physics: merged back the Trunk into the Physics-branche
merged with command:
svn merge -r 4178:HEAD ../trunk/ physics
no conflicts in relevant files

Location:
orxonox/branches/physics/src/subprojects
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/physics/src/subprojects/Makefile.in

    r4178 r4223  
    177177          esac; \
    178178        done; \
    179         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/Makefile'; \
     179        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/Makefile'; \
    180180        cd $(top_srcdir) && \
    181           $(AUTOMAKE) --foreign  src/subprojects/Makefile
     181          $(AUTOMAKE) --gnu  src/subprojects/Makefile
    182182.PRECIOUS: Makefile
    183183Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/branches/physics/src/subprojects/testmain/Makefile.in

    r4178 r4223  
    197197          esac; \
    198198        done; \
    199         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/testmain/Makefile'; \
     199        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/testmain/Makefile'; \
    200200        cd $(top_srcdir) && \
    201           $(AUTOMAKE) --foreign  src/subprojects/testmain/Makefile
     201          $(AUTOMAKE) --gnu  src/subprojects/testmain/Makefile
    202202.PRECIOUS: Makefile
    203203Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Note: See TracChangeset for help on using the changeset viewer.