Changeset 1660 for trunk/Cbc/Makefile.in


Ignore:
Timestamp:
Jun 9, 2011 9:09:23 AM (8 years ago)
Author:
stefan
Message:

change to new way of using and installing configuration header files

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/Makefile.in

    r1646 r1660  
    6464        $(srcdir)/osi-cbc.pc.in $(top_srcdir)/configure \
    6565        $(top_srcdir)/doxydoc/doxygen.conf.in \
    66         $(top_srcdir)/examples/Makefile.in \
    67         $(top_srcdir)/inc/config_cbc.h.in AUTHORS INSTALL config.guess \
    68         config.sub depcomp install-sh ltmain.sh missing
     66        $(top_srcdir)/examples/Makefile.in AUTHORS INSTALL \
     67        config.guess config.sub depcomp install-sh ltmain.sh missing
    6968@HAVE_EXTERNALS_TRUE@am__append_2 = Dependencies
    7069@HAVE_EXTERNALS_TRUE@am__append_3 = .Dependencies-stamp
     
    7877 configure.lineno configure.status.lineno
    7978mkinstalldirs = $(install_sh) -d
    80 CONFIG_HEADER = $(top_builddir)/inc/config_cbc.h
     79CONFIG_HEADER = $(top_builddir)/src/config.h \
     80        $(top_builddir)/src/config_cbc.h
    8181CONFIG_CLEAN_FILES = examples/Makefile cbc.pc cbc-uninstalled.pc \
    8282        osi-cbc.pc osi-cbc-uninstalled.pc doxydoc/doxygen.conf
     
    524524$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
    525525        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
    526 
    527 inc/config_cbc.h: inc/stamp-h1
    528         @if test ! -f $@; then \
    529           rm -f inc/stamp-h1; \
    530           $(MAKE) inc/stamp-h1; \
    531         else :; fi
    532 
    533 inc/stamp-h1: $(top_srcdir)/inc/config_cbc.h.in $(top_builddir)/config.status
    534         @rm -f inc/stamp-h1
    535         cd $(top_builddir) && $(SHELL) ./config.status inc/config_cbc.h
    536 $(top_srcdir)/inc/config_cbc.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
    537         cd $(top_srcdir) && $(AUTOHEADER)
    538         rm -f inc/stamp-h1
    539         touch $@
    540 
    541 distclean-hdr:
    542         -rm -f inc/config_cbc.h inc/stamp-h1
    543526examples/Makefile: $(top_builddir)/config.status $(top_srcdir)/examples/Makefile.in
    544527        cd $(top_builddir) && $(SHELL) ./config.status $@
     
    716699        $(am__remove_distdir)
    717700        mkdir $(distdir)
    718         $(mkdir_p) $(distdir)/. $(distdir)/BuildTools $(distdir)/doc $(distdir)/doxydoc $(distdir)/examples $(distdir)/inc
     701        $(mkdir_p) $(distdir)/. $(distdir)/BuildTools $(distdir)/doc $(distdir)/doxydoc $(distdir)/examples
    719702        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    720703        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
     
    896879        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
    897880        -rm -f Makefile
    898 distclean-am: clean-am distclean-generic distclean-hdr \
    899         distclean-libtool distclean-local distclean-tags
     881distclean-am: clean-am distclean-generic distclean-libtool \
     882        distclean-local distclean-tags
    900883
    901884dvi: dvi-recursive
     
    950933        clean-recursive ctags ctags-recursive dist dist-all dist-bzip2 \
    951934        dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
    952         distclean-generic distclean-hdr distclean-libtool \
    953         distclean-local distclean-recursive distclean-tags \
    954         distcleancheck distdir distuninstallcheck dvi dvi-am html \
    955         html-am info info-am install install-am install-data \
    956         install-data-am install-data-hook install-exec install-exec-am \
     935        distclean-generic distclean-libtool distclean-local \
     936        distclean-recursive distclean-tags distcleancheck distdir \
     937        distuninstallcheck dvi dvi-am html html-am info info-am \
     938        install install-am install-data install-data-am \
     939        install-data-hook install-exec install-exec-am \
    957940        install-exec-local install-info install-info-am install-man \
    958941        install-pkgconfiglibDATA install-strip installcheck \
Note: See TracChangeset for help on using the changeset viewer.