Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3423 in orxonox.OLD for orxonox/trunk/src/Makefile.in


Ignore:
Timestamp:
Feb 27, 2005, 7:11:19 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: merged branches/updater back into the trunk
merged with command: svn merge branches/updater trunk -r 3241:HEAD
resolved conflicts in debug.h in favor of the trunk.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/Makefile.in

    r3419 r3423  
    121121CPP = @CPP@
    122122CPPFLAGS = @CPPFLAGS@
     123CURL_CFLAGS = @CURL_CFLAGS@
     124CURL_LIBS = @CURL_LIBS@
    123125CXX = @CXX@
    124126CXXDEPMODE = @CXXDEPMODE@
    … …  
    136138EGREP = @EGREP@
    137139EXEEXT = @EXEEXT@
     140GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
     141GTHREAD_LIBS = @GTHREAD_LIBS@
    138142GTK2_CFLAGS = @GTK2_CFLAGS@
    139143GTK2_LIBS = @GTK2_LIBS@
     144HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
     145HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
     146HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
     147HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    140148HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    141149HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
    … …  
    310318          esac; \
    311319        done; \
    312         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
     320        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
    313321        cd $(top_srcdir) && \
    314           $(AUTOMAKE) --foreign  src/Makefile
     322          $(AUTOMAKE) --gnu  src/Makefile
    315323.PRECIOUS: Makefile
    316324Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Note: See TracChangeset for help on using the changeset viewer.