Changeset 3238 in orxonox.OLD for orxonox/branches/buerli/src/gui/Makefile.in

Timestamp:

Dec 20, 2004, 2:42:54 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches: updated branches: buerli, nico, sound. And moved bezierTrack to old.bezierTrack. Conflicts resolved in a usefull order.
Conflics mostly resolved in favor of trunk
merge.

Location:

orxonox/branches/buerli/src/gui

Files:

• . (copied) (copied from orxonox/trunk/src/gui)
• Makefile.in (copied) (copied from orxonox/trunk/src/gui/Makefile.in) (1 diff)

orxonox/branches/buerli/src/gui/Makefile.in

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