Changeset 1146


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

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

Location:
trunk/Clp
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/Makefile.am

    r915 r1146  
    9797addlibsfile = clp_addlibs.txt
    9898
    99 install-exec-local:
     99install-exec-local: install-doc
    100100        $(install_sh_DATA) $(addlibsfile) $(DESTDIR)$(libdir)/$(addlibsfile)
    101101
    102 uninstall-local:
     102uninstall-local: uninstall-doc
    103103        rm -f $(DESTDIR)$(libdir)/$(addlibsfile)
    104104
  • trunk/Clp/Makefile.in

    r1139 r1146  
    2828
    2929########################################################################
    30 #                         Maintainer Stuff                             #
     30#                    Documentation installation                        #
    3131########################################################################
    3232srcdir = @srcdir@
     
    282282# Files that are generated and should be cleaned with make distclean
    283283DISTCLEANFILES = $(am__append_3) $(VPATH_DISTCLEANFILES)
     284DocFiles = README AUTHORS LICENSE
     285DocInstallDir = $(prefix)/share/doc/$(PACKAGE_NAME)
    284286all: all-recursive
    285287
     
    741743.PHONY: test unitTest
    742744
    743 install-exec-local:
     745install-exec-local: install-doc
    744746        $(install_sh_DATA) $(addlibsfile) $(DESTDIR)$(libdir)/$(addlibsfile)
    745747
    746 uninstall-local:
     748uninstall-local: uninstall-doc
    747749        rm -f $(DESTDIR)$(libdir)/$(addlibsfile)
     750
     751install-doc:
     752        test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
     753        for file in $(DocFiles); do \
     754          if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
     755          if test -f "$$dir$$file"; then $(INSTALL_DATA) "$$dir$$file" "$(DESTDIR)$(DocInstallDir)/$$file"; fi; \
     756        done
     757
     758uninstall-doc:
     759        for file in $(DocFiles); do \
     760          rm -f "$(DESTDIR)$(DocInstallDir)/$$file"; \
     761        done
     762
     763########################################################################
     764#                         Maintainer Stuff                             #
     765########################################################################
    748766
    749767# Make sure acinclude is using most recent coin.m4
     
    779797@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@update-externals: .Externals-stamp
    780798@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     cd $(srcdir); svn update
     799
     800.PHONY: install-doc uninstall-doc update-externals
    781801# Tell versions [3.59,3.63) of GNU make to not export all variables.
    782802# Otherwise a system limit (for SysV at least) may be exceeded.
  • trunk/Clp/examples/Makefile.in

    r821 r1146  
    5454
    5555# Directory with COIN header files
    56 COININCDIR = @abs_include_dir@
     56COININCDIR = @abs_include_dir@/coin
    5757
    5858# Directory with COIN libraries
  • trunk/Clp/src/Makefile.am

    r1104 r1146  
    115115
    116116# Here list all the header files that are required by a user of the library,
    117 # and that therefore should be installed in 'install'
    118 include_HEADERS = \
     117# and that therefore should be installed in 'install/coin'
     118includecoindir = $(includedir)/coin
     119includecoin_HEADERS = \
    119120        ../inc/config_clp.h \
    120121        Clp_C_Interface.h \
     
    170171        echo "#endif" >> bla
    171172        cat $(srcdir)/$(ConfigHeader) >> bla
    172         $(install_sh_DATA) bla $(DESTDIR)$(includedir)/$(ConfigHeader)
     173        $(install_sh_DATA) bla $(DESTDIR)$(includecoindir)/$(ConfigHeader)
    173174        rm -f bla
    174175
    175176uninstall-local:
    176         rm -f $(DESTDIR)$(includedir)/$(ConfigHeader)
     177        rm -f $(DESTDIR)$(includecoindir)/$(ConfigHeader)
  • trunk/Clp/src/Makefile.in

    r1139 r1146  
    4747bin_PROGRAMS = clp$(EXEEXT)
    4848subdir = src
    49 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
     49DIST_COMMON = $(includecoin_HEADERS) $(srcdir)/Makefile.am \
    5050        $(srcdir)/Makefile.in
    5151ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    6464am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    6565am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
    66         "$(DESTDIR)$(includedir)"
     66        "$(DESTDIR)$(includecoindir)"
    6767libLTLIBRARIES_INSTALL = $(INSTALL)
    6868LTLIBRARIES = $(lib_LTLIBRARIES)
     
    113113SOURCES = $(libClp_la_SOURCES) $(clp_SOURCES)
    114114DIST_SOURCES = $(libClp_la_SOURCES) $(clp_SOURCES)
    115 includeHEADERS_INSTALL = $(INSTALL_HEADER)
    116 HEADERS = $(include_HEADERS)
     115includecoinHEADERS_INSTALL = $(INSTALL_HEADER)
     116HEADERS = $(includecoin_HEADERS)
    117117ETAGS = etags
    118118CTAGS = ctags
     
    362362
    363363# Here list all the header files that are required by a user of the library,
    364 # and that therefore should be installed in 'install'
    365 include_HEADERS = \
     364# and that therefore should be installed in 'install/coin'
     365includecoindir = $(includedir)/coin
     366includecoin_HEADERS = \
    366367        ../inc/config_clp.h \
    367368        Clp_C_Interface.h \
     
    591592        -rm -f libtool
    592593uninstall-info-am:
    593 install-includeHEADERS: $(include_HEADERS)
     594install-includecoinHEADERS: $(includecoin_HEADERS)
    594595        @$(NORMAL_INSTALL)
    595         test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
    596         @list='$(include_HEADERS)'; for p in $$list; do \
     596        test -z "$(includecoindir)" || $(mkdir_p) "$(DESTDIR)$(includecoindir)"
     597        @list='$(includecoin_HEADERS)'; for p in $$list; do \
    597598          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
    598599          f=$(am__strip_dir) \
    599           echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
    600           $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
    601         done
    602 
    603 uninstall-includeHEADERS:
     600          echo " $(includecoinHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includecoindir)/$$f'"; \
     601          $(includecoinHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includecoindir)/$$f"; \
     602        done
     603
     604uninstall-includecoinHEADERS:
    604605        @$(NORMAL_UNINSTALL)
    605         @list='$(include_HEADERS)'; for p in $$list; do \
     606        @list='$(includecoin_HEADERS)'; for p in $$list; do \
    606607          f=$(am__strip_dir) \
    607           echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
    608           rm -f "$(DESTDIR)$(includedir)/$$f"; \
     608          echo " rm -f '$(DESTDIR)$(includecoindir)/$$f'"; \
     609          rm -f "$(DESTDIR)$(includecoindir)/$$f"; \
    609610        done
    610611
     
    691692
    692693installdirs:
    693         for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)"; do \
     694        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includecoindir)"; do \
    694695          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    695696        done
     
    739740info-am:
    740741
    741 install-data-am: install-includeHEADERS
     742install-data-am: install-includecoinHEADERS
    742743
    743744install-exec-am: install-binPROGRAMS install-exec-local \
     
    768769ps-am:
    769770
    770 uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS \
     771uninstall-am: uninstall-binPROGRAMS uninstall-includecoinHEADERS \
    771772        uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
    772773
     
    777778        html-am info info-am install install-am install-binPROGRAMS \
    778779        install-data install-data-am install-exec install-exec-am \
    779         install-exec-local install-includeHEADERS install-info \
     780        install-exec-local install-includecoinHEADERS install-info \
    780781        install-info-am install-libLTLIBRARIES install-man \
    781782        install-strip installcheck installcheck-am installdirs \
     
    783784        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
    784785        pdf pdf-am ps ps-am tags uninstall uninstall-am \
    785         uninstall-binPROGRAMS uninstall-includeHEADERS \
     786        uninstall-binPROGRAMS uninstall-includecoinHEADERS \
    786787        uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
    787788
     
    792793        echo "#endif" >> bla
    793794        cat $(srcdir)/$(ConfigHeader) >> bla
    794         $(install_sh_DATA) bla $(DESTDIR)$(includedir)/$(ConfigHeader)
     795        $(install_sh_DATA) bla $(DESTDIR)$(includecoindir)/$(ConfigHeader)
    795796        rm -f bla
    796797
    797798uninstall-local:
    798         rm -f $(DESTDIR)$(includedir)/$(ConfigHeader)
     799        rm -f $(DESTDIR)$(includecoindir)/$(ConfigHeader)
    799800# Tell versions [3.59,3.63) of GNU make to not export all variables.
    800801# Otherwise a system limit (for SysV at least) may be exceeded.
Note: See TracChangeset for help on using the changeset viewer.