Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3238 in orxonox.OLD for orxonox/branches/nico/Makefile.in


Ignore:
Timestamp:
Dec 20, 2004, 2:42:54 AM (20 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.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/nico/Makefile.in

    r2991 r3238  
    3737DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
    3838        $(srcdir)/Makefile.in $(srcdir)/config.h.in \
    39         $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
    40         config.guess config.sub depcomp install-sh missing \
    41         mkinstalldirs
     39        $(srcdir)/doc/documentation.am $(top_srcdir)/configure AUTHORS \
     40        COPYING ChangeLog INSTALL NEWS config.guess config.sub depcomp \
     41        install-sh missing mkinstalldirs
    4242subdir = .
    4343ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    … …  
    8989CXXFLAGS = @CXXFLAGS@
    9090CYGPATH_W = @CYGPATH_W@
     91DEBUG = @DEBUG@
    9192DEFS = @DEFS@
    9293DEPDIR = @DEPDIR@
     94DOXYGEN = @DOXYGEN@
     95DOXYGEN_FALSE = @DOXYGEN_FALSE@
     96DOXYGEN_TRUE = @DOXYGEN_TRUE@
    9397ECHO_C = @ECHO_C@
    9498ECHO_N = @ECHO_N@
    … …  
    118122PACKAGE_VERSION = @PACKAGE_VERSION@
    119123PATH_SEPARATOR = @PATH_SEPARATOR@
    120 PKG_CONFIG = @PKG_CONFIG@
    121124SET_MAKE = @SET_MAKE@
    122125SHELL = @SHELL@
    … …  
    165168target_os = @target_os@
    166169target_vendor = @target_vendor@
    167 SUBDIRS = src console gui importer
     170AUTOMAKE_OPTIONS = foreign no-installman no-installinfo
     171SUBDIRS = src
     172EXTRA_DIST = CODING-STANDARDS \
     173             IDEAS \
     174             TASKS \
     175             doc/CREDITS \
     176             doc/doxyconf/build \
     177             doc/doxyconf/confopts \
     178             doc/doxyconf/input \
     179             doc/doxyconf/preprocessor \
     180             doc/doxyconf/progress \
     181             doc/doxyconf/project
     182
     183@DOXYGEN_TRUE@DOXYGEN_INPUT = "src src/gui src/importer"
     184@DOXYGEN_TRUE@DOXYGEN_EXCLUDE =
     185@DOXYGEN_TRUE@DOXYGEN_EXAMPLE_PATH =
     186@DOXYGEN_TRUE@DOXYGEN_SEARCHENGINE = YES
     187@DOXYGEN_TRUE@DX_CONFIG_FILE = "$(top_srcdir)/orxodox"
     188@DOXYGEN_TRUE@DX_CONF_DIR = "$(top_srcdir)/doc/doxyconf"
    168189all: config.h
    169190        $(MAKE) $(AM_MAKEFLAGS) all-recursive
    … …  
    172193am--refresh:
    173194        @:
    174 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(am__configure_deps)
     195$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/doc/documentation.am $(am__configure_deps)
    175196        @for dep in $?; do \
    176197          case '$(am__configure_deps)' in \
    177198            *$$dep*) \
    178               echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
    179               cd $(srcdir) && $(AUTOMAKE) --gnu  \
     199              echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
     200              cd $(srcdir) && $(AUTOMAKE) --foreign  \
    180201                && exit 0; \
    181202              exit 1;; \
    182203          esac; \
    183204        done; \
    184         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
     205        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
    185206        cd $(top_srcdir) && \
    186           $(AUTOMAKE) --gnu  Makefile
     207          $(AUTOMAKE) --foreign  Makefile
    187208.PRECIOUS: Makefile
    188209Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    345366        $(am__remove_distdir)
    346367        mkdir $(distdir)
     368        $(mkdir_p) $(distdir)/doc $(distdir)/doc/doxyconf
    347369        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    348370        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
    … …  
    483505check-am: all-am
    484506check: check-recursive
    485 all-am: Makefile config.h
     507all-am: Makefile config.h all-local
    486508installdirs: installdirs-recursive
    487509installdirs-am:
    … …  
    512534clean: clean-recursive
    513535
    514 clean-am: clean-generic mostlyclean-am
     536clean-am: clean-generic clean-local mostlyclean-am
    515537
    516538distclean: distclean-recursive
    517539        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
    518540        -rm -f Makefile
    519 distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
     541distclean-am: clean-am distclean-generic distclean-hdr distclean-local \
     542        distclean-tags
    520543
    521544dvi: dvi-recursive
    … …  
    557580ps-am:
    558581
    559 uninstall-am: uninstall-info-am
     582uninstall-am:
    560583
    561584uninstall-info: uninstall-info-recursive
    562585
    563 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
    564         check-am clean clean-generic clean-recursive ctags \
    565         ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \
    566         dist-tarZ dist-zip distcheck distclean distclean-generic \
    567         distclean-hdr distclean-recursive distclean-tags \
    568         distcleancheck distdir distuninstallcheck dvi dvi-am html \
    569         html-am info info-am install install-am install-data \
    570         install-data-am install-exec install-exec-am install-info \
    571         install-info-am install-man install-strip installcheck \
    572         installcheck-am installdirs installdirs-am maintainer-clean \
    573         maintainer-clean-generic maintainer-clean-recursive \
    574         mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
    575         pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
    576         uninstall-info-am
    577 
     586.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local \
     587        am--refresh check check-am clean clean-generic clean-local \
     588        clean-recursive ctags ctags-recursive dist dist-all dist-bzip2 \
     589        dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
     590        distclean-generic distclean-hdr distclean-local \
     591        distclean-recursive distclean-tags distcleancheck distdir \
     592        distuninstallcheck dvi dvi-am html html-am info info-am \
     593        install install-am install-data install-data-am install-exec \
     594        install-exec-am install-info install-info-am install-man \
     595        install-strip installcheck installcheck-am installdirs \
     596        installdirs-am maintainer-clean maintainer-clean-generic \
     597        maintainer-clean-recursive mostlyclean mostlyclean-generic \
     598        mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
     599        uninstall uninstall-am uninstall-info-am
     600
     601
     602@DOXYGEN_TRUE@doc:
     603@DOXYGEN_TRUE@  if test ! -e $(DX_CONFIG_FILE); then \
     604@DOXYGEN_TRUE@   make doc-config; \
     605@DOXYGEN_TRUE@  fi
     606@DOXYGEN_TRUE@  @echo "Generating doxygen Documentation"; \
     607@DOXYGEN_TRUE@  $(DOXYGEN) $(DX_CONFIG_FILE)
     608
     609@DOXYGEN_TRUE@doc-config:
     610@DOXYGEN_TRUE@  @echo "Generationg doxygen configuration File." ; \
     611@DOXYGEN_TRUE@  if test -e  "$(top_srcdir)/orxodox"; then \
     612@DOXYGEN_TRUE@    echo "deleting existing Configuration File" ; \
     613@DOXYGEN_TRUE@    rm $(top_srcdir)/orxodox ; \
     614@DOXYGEN_TRUE@  fi ; \
     615@DOXYGEN_TRUE@  touch $(DX_CONFIG_FILE) ; \
     616@DOXYGEN_TRUE@  $(DX_CONF_DIR)/project                                          >> $(DX_CONFIG_FILE); \
     617@DOXYGEN_TRUE@  echo "PROJECT_NAME              = \"$(PACKAGE_NAME)\""          >> $(DX_CONFIG_FILE); \
     618@DOXYGEN_TRUE@  echo "PROJECT_NUMBER            = \"$(PACKAGE_VERSION)\""       >> $(DX_CONFIG_FILE); \
     619@DOXYGEN_TRUE@  echo "OUTPUT_DIRECTORY          = \"$(top_srcdir)/doc/\""       >> $(DX_CONFIG_FILE); \
     620@DOXYGEN_TRUE@  echo " " >> $(DX_CONFIG_FILE); \
     621@DOXYGEN_TRUE@\
     622@DOXYGEN_TRUE@  $(DX_CONF_DIR)/build                                            >> $(DX_CONFIG_FILE); \
     623@DOXYGEN_TRUE@\
     624@DOXYGEN_TRUE@  $(DX_CONF_DIR)/progress                                         >> $(DX_CONFIG_FILE); \
     625@DOXYGEN_TRUE@  if test $(DEBUG) -ge 2 ; then \
     626@DOXYGEN_TRUE@   echo "QUIET                    = \"NO\""                       >> $(DX_CONFIG_FILE); \
     627@DOXYGEN_TRUE@  else \
     628@DOXYGEN_TRUE@   echo "QUIET                    = \"YES\""                      >> $(DX_CONFIG_FILE); \
     629@DOXYGEN_TRUE@  fi ;\
     630@DOXYGEN_TRUE@\
     631@DOXYGEN_TRUE@  $(DX_CONF_DIR)/input                                            >> $(DX_CONFIG_FILE); \
     632@DOXYGEN_TRUE@  echo "INPUT                     = $(DOXYGEN_INPUT)"             >> $(DX_CONFIG_FILE); \
     633@DOXYGEN_TRUE@\
     634@DOXYGEN_TRUE@  $(DX_CONF_DIR)/preprocessor                                     >> $(DX_CONFIG_FILE); \
     635@DOXYGEN_TRUE@  echo "INCLUDE_PATH              = \"$(top_srcdir)\""            >> $(DX_CONFIG_FILE); \
     636@DOXYGEN_TRUE@  echo "PREDEFINED                = \"HAVE_CONFIG_H= \""          >> $(DX_CONFIG_FILE); \
     637@DOXYGEN_TRUE@  \
     638@DOXYGEN_TRUE@  $(DX_CONF_DIR)/confopts                                         >> $(DX_CONFIG_FILE)
     639
     640@DOXYGEN_TRUE@doc-delete:
     641@DOXYGEN_TRUE@  @echo "Deleting doxygen Documentation"
     642@DOXYGEN_TRUE@  rm -rf $(top_srcdir)/doc/html
     643@DOXYGEN_TRUE@  rm -rf $(top_srcdir)/doc/latex
     644
     645@DOXYGEN_TRUE@distclean-local: doc-delete
     646@DOXYGEN_TRUE@  rm -f $(top_srcdir)/orxodox
     647
     648@DOXYGEN_TRUE@clean-local:  doc-delete
     649
     650@DOXYGEN_TRUE@all-local: doc
     651
     652@DOXYGEN_TRUE@.PHONY: doc doc-config doc-delete
     653
     654# Local Variables:
     655# mode: makefile
     656# End:
    578657# Tell versions [3.59,3.63) of GNU make to not export all variables.
    579658# Otherwise a system limit (for SysV at least) may be exceeded.
Note: See TracChangeset for help on using the changeset viewer.