Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4090 in orxonox.OLD for orxonox/branches/heightMap/src/subprojects


Ignore:
Timestamp:
May 6, 2005, 6:01:06 PM (19 years ago)
Author:
nico
Message:

branches/heightMap: some makefile and include stuff fixed

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

Legend:

Unmodified
Added
Removed

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

    r3789 r4090  
    1 # Makefile.in generated by automake 1.8.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.3 from Makefile.am.
    22# @configure_input@
    33
    … …  
    3434PRE_UNINSTALL = :
    3535POST_UNINSTALL = :
     36build_triplet = @build@
    3637host_triplet = @host@
     38target_triplet = @target@
    3739subdir = src/subprojects
    3840DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
    … …  
    133135am__leading_dot = @am__leading_dot@
    134136am__quote = @am__quote@
     137am__tar = @am__tar@
     138am__untar = @am__untar@
    135139bindir = @bindir@
    136140build = @build@
    … …  
    178182          esac; \
    179183        done; \
    180         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/Makefile'; \
     184        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/Makefile'; \
    181185        cd $(top_srcdir) && \
    182           $(AUTOMAKE) --foreign  src/subprojects/Makefile
     186          $(AUTOMAKE) --gnu  src/subprojects/Makefile
    183187.PRECIOUS: Makefile
    184188Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    347351          fi; \
    348352        done
    349         list='$(SUBDIRS)'; for subdir in $$list; do \
     353        list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
    350354          if test "$$subdir" = .; then :; else \
    351355            test -d "$(distdir)/$$subdir" \
    352             || mkdir "$(distdir)/$$subdir" \
     356            || $(mkdir_p) "$(distdir)/$$subdir" \
    353357            || exit 1; \
     358            distdir=`$(am__cd) $(distdir) && pwd`; \
     359            top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
    354360            (cd $$subdir && \
    355361              $(MAKE) $(AM_MAKEFLAGS) \
    356                 top_distdir="../$(top_distdir)" \
    357                 distdir="../$(distdir)/$$subdir" \
     362                top_distdir="$$top_distdir" \
     363                distdir="$$distdir/$$subdir" \
    358364                distdir) \
    359365              || exit 1; \
    … …  
    384390
    385391distclean-generic:
    386         -rm -f $(CONFIG_CLEAN_FILES)
     392        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
    387393
    388394maintainer-clean-generic:

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

    r3789 r4090  
    1 # Makefile.in generated by automake 1.8.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.3 from Makefile.am.
    22# @configure_input@
    33
    … …  
    3838PRE_UNINSTALL = :
    3939POST_UNINSTALL = :
     40build_triplet = @build@
    4041host_triplet = @host@
     42target_triplet = @target@
    4143bin_PROGRAMS = testmain$(EXEEXT)
    4244subdir = src/subprojects/testmain
    … …  
    5961depcomp = $(SHELL) $(top_srcdir)/depcomp
    6062am__depfiles_maybe = depfiles
    61 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/testmain.Po
    6263CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6364        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    … …  
    148149am__leading_dot = @am__leading_dot@
    149150am__quote = @am__quote@
     151am__tar = @am__tar@
     152am__untar = @am__untar@
    150153bindir = @bindir@
    151154build = @build@
    … …  
    181184target_vendor = @target_vendor@
    182185MAINSRCDIR = ../..
    183 AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/gaphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai
     186AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities \
     187        -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib \
     188        -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/gaphics \
     189        -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/lang \
     190        -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math \
     191        -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font \
     192        -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu \
     193        -I$(MAINSRCDIR)/ai
    184194AM_LDFLAGS = $(MWINDOWS)
    185195testmain_SOURCES = testmain.cc
    … …  
    198208          esac; \
    199209        done; \
    200         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/testmain/Makefile'; \
     210        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/testmain/Makefile'; \
    201211        cd $(top_srcdir) && \
    202           $(AUTOMAKE) --foreign  src/subprojects/testmain/Makefile
     212          $(AUTOMAKE) --gnu  src/subprojects/testmain/Makefile
    203213.PRECIOUS: Makefile
    204214Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    257267@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    258268@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    259 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
    260 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     269@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    261270@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ $<
    262271
    … …  
    265274@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    266275@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    267 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
    268 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     276@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    269277@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    270278uninstall-info-am:
    … …  
    371379
    372380distclean-generic:
    373         -rm -f $(CONFIG_CLEAN_FILES)
     381        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
    374382
    375383maintainer-clean-generic:
Note: See TracChangeset for help on using the changeset viewer.