Changeset 846


Ignore:
Timestamp:
Dec 27, 2007 10:58:29 PM (12 years ago)
Author:
andreasw
Message:

merged recent COIN-wide changes in stable into trunk and reran autotools

Location:
trunk/Cbc
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/Makefile.am

    r640 r846  
    115115addlibsfile = cbc_addlibs.txt
    116116
    117 install-exec-local:
     117install-exec-local: install-doc
    118118        $(install_sh_DATA) $(addlibsfile) $(DESTDIR)$(libdir)/$(addlibsfile)
    119119
    120 uninstall-local:
     120uninstall-local: uninstall-doc
    121121        rm -f $(DESTDIR)$(libdir)/$(addlibsfile)
    122122
  • trunk/Cbc/Makefile.in

    r835 r846  
    2828
    2929########################################################################
    30 #                         Maintainer Stuff                             #
     30#                    Documentation installation                        #
    3131########################################################################
    3232srcdir = @srcdir@
     
    349349# Files that are generated and should be cleaned with make distclean
    350350DISTCLEANFILES = $(am__append_3) $(VPATH_DISTCLEANFILES)
     351DocFiles = README AUTHORS LICENSE
     352DocInstallDir = $(prefix)/share/doc/$(PACKAGE_NAME)
    351353all: all-recursive
    352354
     
    808810.PHONY: test unitTest
    809811
    810 install-exec-local:
     812install-exec-local: install-doc
    811813        $(install_sh_DATA) $(addlibsfile) $(DESTDIR)$(libdir)/$(addlibsfile)
    812814
    813 uninstall-local:
     815uninstall-local: uninstall-doc
    814816        rm -f $(DESTDIR)$(libdir)/$(addlibsfile)
     817
     818install-doc:
     819        test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
     820        for file in $(DocFiles); do \
     821          if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
     822          if test -f "$$dir$$file"; then $(INSTALL_DATA) "$$dir$$file" "$(DESTDIR)$(DocInstallDir)/$$file"; fi; \
     823        done
     824
     825uninstall-doc:
     826        for file in $(DocFiles); do \
     827          rm -f "$(DESTDIR)$(DocInstallDir)/$$file"; \
     828        done
     829
     830########################################################################
     831#                         Maintainer Stuff                             #
     832########################################################################
    815833
    816834# Make sure acinclude is using most recent coin.m4
     
    846864@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@update-externals: .Externals-stamp
    847865@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     cd $(srcdir); svn update
     866
     867.PHONY: install-doc uninstall-doc update-externals
    848868# Tell versions [3.59,3.63) of GNU make to not export all variables.
    849869# Otherwise a system limit (for SysV at least) may be exceeded.
  • trunk/Cbc/examples/Makefile.in

    r834 r846  
    5555
    5656# Directory with COIN header files
    57 COININCDIR = @abs_include_dir@
     57COININCDIR = @abs_include_dir@/coin
    5858
    5959# Directory with COIN libraries
  • trunk/Cbc/src/Makefile.am

    r783 r846  
    286286
    287287# Here list all the header files that are required by a user of the library,
    288 # and that therefore should be installed in 'install'
    289 include_HEADERS = \
     288# and that therefore should be installed in 'install/coin'
     289includecoindir = $(includedir)/coin
     290includecoin_HEADERS = \
    290291        ../inc/config_cbc.h \
    291292        Cbc_C_Interface.h \
     
    329330        echo "#endif" >> bla
    330331        cat $(srcdir)/$(ConfigHeader) >> bla
    331         $(install_sh_DATA) bla $(DESTDIR)$(includedir)/$(ConfigHeader)
     332        $(install_sh_DATA) bla $(DESTDIR)$(includecoindir)/$(ConfigHeader)
    332333        rm -f bla
    333334
    334335uninstall-local:
    335         rm -f $(DESTDIR)$(includedir)/$(ConfigHeader)
     336        rm -f $(DESTDIR)$(includecoindir)/$(ConfigHeader)
  • trunk/Cbc/src/Makefile.in

    r835 r846  
    136136@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_ASL_TRUE@am__append_34 = $(ASL_CPPFLAGS) -DCOIN_HAS_ASL
    137137subdir = src
    138 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
     138DIST_COMMON = $(includecoin_HEADERS) $(srcdir)/Makefile.am \
    139139        $(srcdir)/Makefile.in
    140140ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    153153am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    154154am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
    155         "$(DESTDIR)$(includedir)"
     155        "$(DESTDIR)$(includecoindir)"
    156156libLTLIBRARIES_INSTALL = $(INSTALL)
    157157LTLIBRARIES = $(lib_LTLIBRARIES)
     
    263263DIST_SOURCES = $(libCbc_la_SOURCES) $(libCbcSolver_la_SOURCES) \
    264264        $(am__cbc_SOURCES_DIST) $(am__cbc_generic_SOURCES_DIST)
    265 includeHEADERS_INSTALL = $(INSTALL_HEADER)
    266 HEADERS = $(include_HEADERS)
     265includecoinHEADERS_INSTALL = $(INSTALL_HEADER)
     266HEADERS = $(includecoin_HEADERS)
    267267ETAGS = etags
    268268CTAGS = ctags
     
    619619
    620620# Here list all the header files that are required by a user of the library,
    621 # and that therefore should be installed in 'install'
    622 include_HEADERS = \
     621# and that therefore should be installed in 'install/coin'
     622includecoindir = $(includedir)/coin
     623includecoin_HEADERS = \
    623624        ../inc/config_cbc.h \
    624625        Cbc_C_Interface.h \
     
    836837        -rm -f libtool
    837838uninstall-info-am:
    838 install-includeHEADERS: $(include_HEADERS)
     839install-includecoinHEADERS: $(includecoin_HEADERS)
    839840        @$(NORMAL_INSTALL)
    840         test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
    841         @list='$(include_HEADERS)'; for p in $$list; do \
     841        test -z "$(includecoindir)" || $(mkdir_p) "$(DESTDIR)$(includecoindir)"
     842        @list='$(includecoin_HEADERS)'; for p in $$list; do \
    842843          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
    843844          f=$(am__strip_dir) \
    844           echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
    845           $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
     845          echo " $(includecoinHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includecoindir)/$$f'"; \
     846          $(includecoinHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includecoindir)/$$f"; \
    846847        done
    847848
    848 uninstall-includeHEADERS:
     849uninstall-includecoinHEADERS:
    849850        @$(NORMAL_UNINSTALL)
    850         @list='$(include_HEADERS)'; for p in $$list; do \
     851        @list='$(includecoin_HEADERS)'; for p in $$list; do \
    851852          f=$(am__strip_dir) \
    852           echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
    853           rm -f "$(DESTDIR)$(includedir)/$$f"; \
     853          echo " rm -f '$(DESTDIR)$(includecoindir)/$$f'"; \
     854          rm -f "$(DESTDIR)$(includecoindir)/$$f"; \
    854855        done
    855856
     
    936937
    937938installdirs:
    938         for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)"; do \
     939        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includecoindir)"; do \
    939940          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    940941        done
     
    984985info-am:
    985986
    986 install-data-am: install-includeHEADERS
     987install-data-am: install-includecoinHEADERS
    987988
    988989install-exec-am: install-binPROGRAMS install-exec-local \
     
    10131014ps-am:
    10141015
    1015 uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS \
     1016uninstall-am: uninstall-binPROGRAMS uninstall-includecoinHEADERS \
    10161017        uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
    10171018
     
    10221023        html-am info info-am install install-am install-binPROGRAMS \
    10231024        install-data install-data-am install-exec install-exec-am \
    1024         install-exec-local install-includeHEADERS install-info \
     1025        install-exec-local install-includecoinHEADERS install-info \
    10251026        install-info-am install-libLTLIBRARIES install-man \
    10261027        install-strip installcheck installcheck-am installdirs \
     
    10281029        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
    10291030        pdf pdf-am ps ps-am tags uninstall uninstall-am \
    1030         uninstall-binPROGRAMS uninstall-includeHEADERS \
     1031        uninstall-binPROGRAMS uninstall-includecoinHEADERS \
    10311032        uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
    10321033
     
    10371038        echo "#endif" >> bla
    10381039        cat $(srcdir)/$(ConfigHeader) >> bla
    1039         $(install_sh_DATA) bla $(DESTDIR)$(includedir)/$(ConfigHeader)
     1040        $(install_sh_DATA) bla $(DESTDIR)$(includecoindir)/$(ConfigHeader)
    10401041        rm -f bla
    10411042
    10421043uninstall-local:
    1043         rm -f $(DESTDIR)$(includedir)/$(ConfigHeader)
     1044        rm -f $(DESTDIR)$(includecoindir)/$(ConfigHeader)
    10441045# Tell versions [3.59,3.63) of GNU make to not export all variables.
    10451046# Otherwise a system limit (for SysV at least) may be exceeded.
Note: See TracChangeset for help on using the changeset viewer.