Ignore:
Timestamp:
Jun 8, 2011 1:28:29 PM (8 years ago)
Author:
stefan
Message:

change to new way on how to use and install configuration header files

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/Makefile.in

    r1701 r1734  
    6464subdir = src
    6565DIST_COMMON = $(am__includecoin_HEADERS_DIST) $(srcdir)/Makefile.am \
    66         $(srcdir)/Makefile.in
     66        $(srcdir)/Makefile.in $(srcdir)/config.h.in \
     67        $(srcdir)/config_clp.h.in
    6768ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    6869am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
     
    7172        $(ACLOCAL_M4)
    7273mkinstalldirs = $(install_sh) -d
    73 CONFIG_HEADER = $(top_builddir)/inc/config_clp.h
     74CONFIG_HEADER = config.h config_clp.h
    7475CONFIG_CLEAN_FILES =
    7576am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
     
    181182        pdf-recursive ps-recursive uninstall-info-recursive \
    182183        uninstall-recursive
    183 am__includecoin_HEADERS_DIST = ../inc/config_clp.h Clp_C_Interface.h \
    184         ClpCholeskyBase.hpp ClpCholeskyDense.hpp ClpConstraint.hpp \
    185         ClpConstraintLinear.hpp ClpConstraintQuadratic.hpp \
    186         ClpDualRowDantzig.hpp ClpDualRowPivot.hpp \
    187         ClpDualRowSteepest.hpp ClpDummyMatrix.hpp \
     184am__includecoin_HEADERS_DIST = Clp_C_Interface.h ClpCholeskyBase.hpp \
     185        ClpCholeskyDense.hpp ClpConstraint.hpp ClpConstraintLinear.hpp \
     186        ClpConstraintQuadratic.hpp ClpDualRowDantzig.hpp \
     187        ClpDualRowPivot.hpp ClpDualRowSteepest.hpp ClpDummyMatrix.hpp \
    188188        ClpDynamicExampleMatrix.hpp ClpDynamicMatrix.hpp \
    189189        ClpEventHandler.hpp ClpFactorization.hpp \
     
    536536        $(am__append_7)
    537537
    538 # This line is necessary to allow VPATH compilation with MS compilers
    539 # on Cygwin
    540 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     538# This line is necessary to allow VPATH compilation
     539DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)`
    541540
    542541########################################################################
     
    549548
    550549# needed by Cbc
    551 includecoin_HEADERS = ../inc/config_clp.h Clp_C_Interface.h \
    552         ClpCholeskyBase.hpp ClpCholeskyDense.hpp ClpConstraint.hpp \
    553         ClpConstraintLinear.hpp ClpConstraintQuadratic.hpp \
    554         ClpDualRowDantzig.hpp ClpDualRowPivot.hpp \
    555         ClpDualRowSteepest.hpp ClpDummyMatrix.hpp \
     550includecoin_HEADERS = Clp_C_Interface.h ClpCholeskyBase.hpp \
     551        ClpCholeskyDense.hpp ClpConstraint.hpp ClpConstraintLinear.hpp \
     552        ClpConstraintQuadratic.hpp ClpDualRowDantzig.hpp \
     553        ClpDualRowPivot.hpp ClpDualRowSteepest.hpp ClpDummyMatrix.hpp \
    556554        ClpDynamicExampleMatrix.hpp ClpDynamicMatrix.hpp \
    557555        ClpEventHandler.hpp ClpFactorization.hpp \
     
    568566        $(am__append_8) $(am__append_9) $(am__append_10) \
    569567        $(am__append_11) $(am__append_12) CbcOrClpParam.cpp
    570 
    571 #############################################################################
    572 # Create the Config.h file that always defines HAVE_CONFIG_H and install it #
    573 #############################################################################
    574 
    575 # You only need to adapt the following line
    576 ConfigHeader = ClpConfig.h
    577 all: all-recursive
     568all: config.h config_clp.h
     569        $(MAKE) $(AM_MAKEFLAGS) all-recursive
    578570
    579571.SUFFIXES:
     
    608600$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
    609601        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
     602
     603config.h: stamp-h1
     604        @if test ! -f $@; then \
     605          rm -f stamp-h1; \
     606          $(MAKE) stamp-h1; \
     607        else :; fi
     608
     609stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
     610        @rm -f stamp-h1
     611        cd $(top_builddir) && $(SHELL) ./config.status src/config.h
     612$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
     613        cd $(top_srcdir) && $(AUTOHEADER)
     614        rm -f stamp-h1
     615        touch $@
     616
     617config_clp.h: stamp-h2
     618        @if test ! -f $@; then \
     619          rm -f stamp-h2; \
     620          $(MAKE) stamp-h2; \
     621        else :; fi
     622
     623stamp-h2: $(srcdir)/config_clp.h.in $(top_builddir)/config.status
     624        @rm -f stamp-h2
     625        cd $(top_builddir) && $(SHELL) ./config.status src/config_clp.h
     626
     627distclean-hdr:
     628        -rm -f config.h stamp-h1 config_clp.h stamp-h2
    610629install-libLTLIBRARIES: $(lib_LTLIBRARIES)
    611630        @$(NORMAL_INSTALL)
     
    860879tags: TAGS
    861880
    862 TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
     881TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in config_clp.h.in $(TAGS_DEPENDENCIES) \
    863882                $(TAGS_FILES) $(LISP)
    864883        tags=; \
     
    877896          fi; \
    878897        done; \
    879         list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
     898        list='$(SOURCES) $(HEADERS) config.h.in config_clp.h.in $(LISP) $(TAGS_FILES)'; \
    880899        unique=`for i in $$list; do \
    881900            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
     
    889908        fi
    890909ctags: CTAGS
    891 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
     910CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in config_clp.h.in $(TAGS_DEPENDENCIES) \
    892911                $(TAGS_FILES) $(LISP)
    893912        tags=; \
    894913        here=`pwd`; \
    895         list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
     914        list='$(SOURCES) $(HEADERS) config.h.in config_clp.h.in $(LISP) $(TAGS_FILES)'; \
    896915        unique=`for i in $$list; do \
    897916            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
     
    912931
    913932distdir: $(DISTFILES)
    914         $(mkdir_p) $(distdir)/../inc
    915933        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    916934        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
     
    956974check-am: all-am
    957975check: check-recursive
    958 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
     976all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) config.h \
     977                config_clp.h
    959978install-binPROGRAMS: install-libLTLIBRARIES
    960979
     
    9971016        -rm -f Makefile
    9981017distclean-am: clean-am distclean-compile distclean-generic \
    999         distclean-libtool distclean-tags
     1018        distclean-hdr distclean-libtool distclean-tags
    10001019
    10011020dvi: dvi-recursive
     
    10461065        clean clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
    10471066        clean-libtool clean-recursive ctags ctags-recursive distclean \
    1048         distclean-compile distclean-generic distclean-libtool \
    1049         distclean-recursive distclean-tags distdir dvi dvi-am html \
    1050         html-am info info-am install install-am install-binPROGRAMS \
    1051         install-data install-data-am install-exec install-exec-am \
    1052         install-exec-local install-includecoinHEADERS install-info \
    1053         install-info-am install-libLTLIBRARIES install-man \
    1054         install-strip installcheck installcheck-am installdirs \
    1055         installdirs-am maintainer-clean maintainer-clean-generic \
    1056         maintainer-clean-recursive mostlyclean mostlyclean-compile \
    1057         mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
    1058         pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
     1067        distclean-compile distclean-generic distclean-hdr \
     1068        distclean-libtool distclean-recursive distclean-tags distdir \
     1069        dvi dvi-am html html-am info info-am install install-am \
     1070        install-binPROGRAMS install-data install-data-am install-exec \
     1071        install-exec-am install-exec-local install-includecoinHEADERS \
     1072        install-info install-info-am install-libLTLIBRARIES \
     1073        install-man install-strip installcheck installcheck-am \
     1074        installdirs installdirs-am maintainer-clean \
     1075        maintainer-clean-generic maintainer-clean-recursive \
     1076        mostlyclean mostlyclean-compile mostlyclean-generic \
     1077        mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
     1078        tags tags-recursive uninstall uninstall-am \
    10591079        uninstall-binPROGRAMS uninstall-includecoinHEADERS \
    10601080        uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
     
    10621082
    10631083install-exec-local:
    1064         echo "#ifndef HAVE_CONFIG_H" >bla
    1065         echo "#define HAVE_CONFIG_H" >>bla
    1066         echo "#endif" >> bla
    1067         cat $(srcdir)/$(ConfigHeader) >> bla
    1068         $(install_sh_DATA) bla $(DESTDIR)$(includecoindir)/$(ConfigHeader)
    1069         rm -f bla
     1084        $(install_sh_DATA) config_clp.h $(DESTDIR)$(includecoindir)/ClpConfig.h
    10701085
    10711086uninstall-local:
    1072         rm -f $(DESTDIR)$(includecoindir)/$(ConfigHeader)
     1087        rm -f $(DESTDIR)$(includecoindir)/ClpConfig.h
    10731088# Tell versions [3.59,3.63) of GNU make to not export all variables.
    10741089# Otherwise a system limit (for SysV at least) may be exceeded.
Note: See TracChangeset for help on using the changeset viewer.