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

Timestamp:

May 24, 2005, 10:32:34 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged the trunk back to branches/physics
merged with command
svn merge -r 4223:HEAD ../../trunk/ .
conflicts additively included

Location:

orxonox/branches/physics/src/subprojects

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (2 diffs)
• gui (copied) (copied from orxonox/trunk/src/subprojects/gui)
• gui/Makefile.am (copied) (copied from orxonox/trunk/src/subprojects/gui/Makefile.am)
• gui/Makefile.in (copied) (copied from orxonox/trunk/src/subprojects/gui/Makefile.in)
• gui/gui_main.cc (copied) (copied from orxonox/trunk/src/subprojects/gui/gui_main.cc)
• importer (copied) (copied from orxonox/trunk/src/subprojects/importer)
• importer/Makefile.am (copied) (copied from orxonox/trunk/src/subprojects/importer/Makefile.am)
• importer/Makefile.in (copied) (copied from orxonox/trunk/src/subprojects/importer/Makefile.in)
• importer/framework.cc (copied) (copied from orxonox/trunk/src/subprojects/importer/framework.cc)
• importer/framework.h (copied) (copied from orxonox/trunk/src/subprojects/importer/framework.h)
• testmain/Makefile.in (modified) (1 diff)

orxonox/branches/physics/src/subprojects/Makefile.am

@@ -1 @@
-SUBDIRS = testmain
+SUBDIRS = importer \
+          gui \
+          testmain

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

@@ -164 +164 @@
 target_os = @target_os@
 target_vendor = @target_vendor@
-SUBDIRS = testmain
+SUBDIRS = importer \
+          gui \
+          testmain
+
 all: all-recursive
 
@@ -177 +180 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --gnu  src/subprojects/Makefile
+          $(AUTOMAKE) --foreign  src/subprojects/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

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

@@ -197 +197 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/testmain/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/testmain/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --gnu  src/subprojects/testmain/Makefile
+          $(AUTOMAKE) --foreign  src/subprojects/testmain/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status