Changeset 3218 in orxonox.OLD
- Timestamp:
- Dec 19, 2004, 4:05:07 PM (19 years ago)
- Location:
- orxonox/trunk
- Files:
-
- 4 edited
-
Makefile.in (modified) (4 diffs)
-
configure (modified) (1 diff)
-
configure.ac (modified) (2 diffs)
-
doc/documentation.am (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
orxonox/trunk/Makefile.in
r3205 r3218 502 502 check-am: all-am 503 503 check: check-recursive 504 all-am: Makefile config.h 504 all-am: Makefile config.h all-local 505 505 installdirs: installdirs-recursive 506 506 installdirs-am: … … 531 531 clean: clean-recursive 532 532 533 clean-am: clean-generic mostlyclean-am533 clean-am: clean-generic clean-local mostlyclean-am 534 534 535 535 distclean: distclean-recursive 536 536 -rm -f $(am__CONFIG_DISTCLEAN_FILES) 537 537 -rm -f Makefile 538 distclean-am: clean-am distclean-generic distclean-hdr distclean-tags 538 distclean-am: clean-am distclean-generic distclean-hdr distclean-local \ 539 distclean-tags 539 540 540 541 dvi: dvi-recursive … … 580 581 uninstall-info: uninstall-info-recursive 581 582 582 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am a m--refresh check\583 check-am clean clean-generic clean-recursive ctags\584 c tags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar\585 dist- tarZ dist-zip distcheck distclean distclean-generic\586 distclean- hdr distclean-recursive distclean-tags\587 distclean check distdir distuninstallcheck dvi dvi-am html\588 html-am info info-am install install-am install-data\589 install -data-am install-exec install-exec-am install-info\590 install- info-am install-man install-strip installcheck\591 install check-am installdirs installdirs-am maintainer-clean\592 maintainer-clean-generic maintainer-clean-recursive\593 m ostlyclean mostlyclean-generic mostlyclean-recursive pdf\594 pdf-am ps ps-am tags tags-recursive uninstall uninstall-am\595 uninstall -info-am583 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local \ 584 am--refresh check check-am clean clean-generic clean-local \ 585 clean-recursive ctags ctags-recursive dist dist-all dist-bzip2 \ 586 dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ 587 distclean-generic distclean-hdr distclean-local \ 588 distclean-recursive distclean-tags distcleancheck distdir \ 589 distuninstallcheck dvi dvi-am html html-am info info-am \ 590 install install-am install-data install-data-am install-exec \ 591 install-exec-am install-info install-info-am install-man \ 592 install-strip installcheck installcheck-am installdirs \ 593 installdirs-am maintainer-clean maintainer-clean-generic \ 594 maintainer-clean-recursive mostlyclean mostlyclean-generic \ 595 mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ 596 uninstall uninstall-am uninstall-info-am 596 597 597 598 598 599 doc: 599 @echo "Generating doxygen Documentation"; \600 600 if test ! -e $(DX_CONFIG_FILE); then \ 601 601 make doc-config; \ 602 602 fi 603 @echo "Generating doxygen Documentation"; \ 603 604 doxygen $(DX_CONFIG_FILE) 604 605 … … 635 636 636 637 doc-delete: 637 @echo "Deleting doxygen Documentation" ; \638 rm -rf $(top_srcdir)/doc/html ; \638 @echo "Deleting doxygen Documentation" 639 rm -rf $(top_srcdir)/doc/html 639 640 rm -rf $(top_srcdir)/doc/latex 641 642 distclean-local: doc-delete 643 rm -f $(top_srcdir)/orxodox 644 645 clean-local: doc-delete 646 647 all-local: doc 640 648 641 649 .PHONY: doc doc-config doc-delete -
orxonox/trunk/configure
r3205 r3218 6603 6603 6604 6604 #checking for pthread libs 6605 echo "$as_me:$LINENO: checking for main in -lpthread" >&5 6606 echo $ECHO_N "checking for main in -lpthread... $ECHO_C" >&6 6607 if test "${ac_cv_lib_pthread_main+set}" = set; then 6608 echo $ECHO_N "(cached) $ECHO_C" >&6 6609 else 6610 ac_check_lib_save_LIBS=$LIBS 6611 LIBS="-lpthread $LIBS" 6612 cat >conftest.$ac_ext <<_ACEOF 6613 /* confdefs.h. */ 6614 _ACEOF 6615 cat confdefs.h >>conftest.$ac_ext 6616 cat >>conftest.$ac_ext <<_ACEOF 6617 /* end confdefs.h. */ 6618 6619 6620 int 6621 main () 6622 { 6623 main (); 6624 ; 6625 return 0; 6626 } 6627 _ACEOF 6628 rm -f conftest.$ac_objext conftest$ac_exeext 6629 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 6630 (eval $ac_link) 2>conftest.er1 6631 ac_status=$? 6632 grep -v '^ *+' conftest.er1 >conftest.err 6633 rm -f conftest.er1 6634 cat conftest.err >&5 6635 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6636 (exit $ac_status); } && 6637 { ac_try='test -z "$ac_c_werror_flag" 6638 || test ! -s conftest.err' 6639 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6640 (eval $ac_try) 2>&5 6641 ac_status=$? 6642 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6643 (exit $ac_status); }; } && 6644 { ac_try='test -s conftest$ac_exeext' 6645 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6646 (eval $ac_try) 2>&5 6647 ac_status=$? 6648 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6649 (exit $ac_status); }; }; then 6650 ac_cv_lib_pthread_main=yes 6651 else 6652 echo "$as_me: failed program was:" >&5 6653 sed 's/^/| /' conftest.$ac_ext >&5 6654 6655 ac_cv_lib_pthread_main=no 6656 fi 6657 rm -f conftest.err conftest.$ac_objext \ 6658 conftest$ac_exeext conftest.$ac_ext 6659 LIBS=$ac_check_lib_save_LIBS 6660 fi 6661 echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_main" >&5 6662 echo "${ECHO_T}$ac_cv_lib_pthread_main" >&6 6663 if test $ac_cv_lib_pthread_main = yes; then 6664 FOUND_pthread=yes 6665 fi 6666 6667 if test "$FOUND_pthread" = "yes" ; then 6668 LIBS="$LIBS -lpthread" 6669 fi 6605 # AC_CHECK_LIB([pthread], [main], FOUND_pthread=yes) 6606 # if test "$FOUND_pthread" = "yes" ; then 6607 # LIBS="$LIBS -lpthread" 6608 # fi 6670 6609 6671 6610 -
orxonox/trunk/configure.ac
r3205 r3218 2 2 # Process this file with autoconf to produce a configure script. 3 3 4 #AC_PREREQ(2.56)4 AC_PREREQ(2.56) 5 5 AC_INIT(orxonox, 0.2.0_alpha-r1, orxonox-dev@mail.datacore.ch) 6 6 … … 337 337 338 338 #checking for pthread libs 339 AC_CHECK_LIB([pthread], [main], FOUND_pthread=yes)340 if test "$FOUND_pthread" = "yes" ; then341 LIBS="$LIBS -lpthread"342 fi339 # AC_CHECK_LIB([pthread], [main], FOUND_pthread=yes) 340 # if test "$FOUND_pthread" = "yes" ; then 341 # LIBS="$LIBS -lpthread" 342 # fi 343 343 344 344 -
orxonox/trunk/doc/documentation.am
r3205 r3218 3 3 4 4 doc: 5 @echo "Generating doxygen Documentation"; \6 5 if test ! -e $(DX_CONFIG_FILE); then \ 7 6 make doc-config; \ 8 7 fi 8 @echo "Generating doxygen Documentation"; \ 9 9 doxygen $(DX_CONFIG_FILE) 10 10 … … 41 41 42 42 doc-delete: 43 @echo "Deleting doxygen Documentation" ; \44 rm -rf $(top_srcdir)/doc/html ; \43 @echo "Deleting doxygen Documentation" 44 rm -rf $(top_srcdir)/doc/html 45 45 rm -rf $(top_srcdir)/doc/latex 46 46 47 distclean-local: doc-delete 48 rm -f $(top_srcdir)/orxodox 47 49 50 clean-local: doc-delete 51 52 all-local: doc 48 53 49 54 .PHONY: doc doc-config doc-delete
Note: See TracChangeset
for help on using the changeset viewer.
