Changeset 788


Ignore:
Timestamp:
Jun 1, 2006 2:57:08 PM (13 years ago)
Author:
andreasw
Message:

moved doxygen generation into base directory

Location:
trunk
Files:
2 added
1 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/Makefile.am

    r784 r788  
    3535        doc/clpuserguide.xml \
    3636        doc/doxygen.xml \
    37         doc/doxygen.conf \
    3837        doc/faqcontent.xml \
    3938        doc/faq.xml \
     
    8281        cd test; make test
    8382
    84 doc:
    85         cd $(srcdir); doxygen doc/doxygen.conf
    86 
    8783unitTest: test
    8884
     
    9389        if test -r test/Makefile; then cd test; make distclean; fi
    9490
    95 .PHONY: test unitTest doc
     91.PHONY: test unitTest
    9692
    9793########################################################################
  • trunk/Clp/Makefile.in

    r786 r788  
    240240# Here we need include all files that are not mentioned in other Makefiles
    241241EXTRA_DIST = doc/authors.xml doc/basicmodelclasses.xml doc/clpexe.xml \
    242         doc/clpuserguide.xml doc/doxygen.xml doc/doxygen.conf \
    243         doc/faqcontent.xml doc/faq.xml doc/intro.xml doc/legal.xml \
    244         doc/messages.xml doc/moresamples.xml doc/notsobasic.xml \
    245         doc/revhist.xml doc/Howto/docbook4clp.xml examples/addBits.cpp \
     242        doc/clpuserguide.xml doc/doxygen.xml doc/faqcontent.xml \
     243        doc/faq.xml doc/intro.xml doc/legal.xml doc/messages.xml \
     244        doc/moresamples.xml doc/notsobasic.xml doc/revhist.xml \
     245        doc/Howto/docbook4clp.xml examples/addBits.cpp \
    246246        examples/addColumns.cpp examples/addRows.cpp \
    247247        examples/decompose.cpp examples/defaults.cpp \
     
    718718        cd test; make test
    719719
    720 doc:
    721         cd $(srcdir); doxygen doc/doxygen.conf
    722 
    723720unitTest: test
    724721
     
    729726        if test -r test/Makefile; then cd test; make distclean; fi
    730727
    731 .PHONY: test unitTest doc
     728.PHONY: test unitTest
    732729
    733730install-exec-local:
  • trunk/Makefile.am

    r787 r788  
    99AUTOMAKE_OPTIONS = foreign
    1010
    11 EXTRA_DIST =
     11EXTRA_DIST = doxydoc/doxygen.conf
    1212
    1313########################################################################
     
    3737unitTests: tests
    3838
    39 .PHONY: test unitTest tests unitTests
     39doxydoc:
     40        cd $(srcdir); doxygen doxydoc/doxygen.conf
     41
     42.PHONY: test unitTest tests unitTests doxydoc
    4043
    4144########################################################################
  • trunk/Makefile.in

    r787 r788  
    156156target_alias = @target_alias@
    157157AUTOMAKE_OPTIONS = foreign
    158 EXTRA_DIST = $(am__append_1)
     158EXTRA_DIST = doxydoc/doxygen.conf $(am__append_1)
    159159
    160160########################################################################
     
    345345        $(am__remove_distdir)
    346346        mkdir $(distdir)
    347         $(mkdir_p) $(distdir)/BuildTools
     347        $(mkdir_p) $(distdir)/BuildTools $(distdir)/doxydoc
    348348        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    349349        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
     
    598598unitTests: tests
    599599
    600 .PHONY: test unitTest tests unitTests
     600doxydoc:
     601        cd $(srcdir); doxygen doxydoc/doxygen.conf
     602
     603.PHONY: test unitTest tests unitTests doxydoc
    601604
    602605# Make sure acinclude is using most recent coin.m4
Note: See TracChangeset for help on using the changeset viewer.