- Timestamp:
- Dec 27, 2007 10:58:29 PM (13 years ago)
- Location:
- trunk/Cbc
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Cbc/Makefile.am
r640 r846 115 115 addlibsfile = cbc_addlibs.txt 116 116 117 install-exec-local: 117 install-exec-local: install-doc 118 118 $(install_sh_DATA) $(addlibsfile) $(DESTDIR)$(libdir)/$(addlibsfile) 119 119 120 uninstall-local: 120 uninstall-local: uninstall-doc 121 121 rm -f $(DESTDIR)$(libdir)/$(addlibsfile) 122 122 -
trunk/Cbc/Makefile.in
r835 r846 28 28 29 29 ######################################################################## 30 # Maintainer Stuff#30 # Documentation installation # 31 31 ######################################################################## 32 32 srcdir = @srcdir@ … … 349 349 # Files that are generated and should be cleaned with make distclean 350 350 DISTCLEANFILES = $(am__append_3) $(VPATH_DISTCLEANFILES) 351 DocFiles = README AUTHORS LICENSE 352 DocInstallDir = $(prefix)/share/doc/$(PACKAGE_NAME) 351 353 all: all-recursive 352 354 … … 808 810 .PHONY: test unitTest 809 811 810 install-exec-local: 812 install-exec-local: install-doc 811 813 $(install_sh_DATA) $(addlibsfile) $(DESTDIR)$(libdir)/$(addlibsfile) 812 814 813 uninstall-local: 815 uninstall-local: uninstall-doc 814 816 rm -f $(DESTDIR)$(libdir)/$(addlibsfile) 817 818 install-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 825 uninstall-doc: 826 for file in $(DocFiles); do \ 827 rm -f "$(DESTDIR)$(DocInstallDir)/$$file"; \ 828 done 829 830 ######################################################################## 831 # Maintainer Stuff # 832 ######################################################################## 815 833 816 834 # Make sure acinclude is using most recent coin.m4 … … 846 864 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@update-externals: .Externals-stamp 847 865 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@ cd $(srcdir); svn update 866 867 .PHONY: install-doc uninstall-doc update-externals 848 868 # Tell versions [3.59,3.63) of GNU make to not export all variables. 849 869 # Otherwise a system limit (for SysV at least) may be exceeded. -
trunk/Cbc/examples/Makefile.in
r834 r846 55 55 56 56 # Directory with COIN header files 57 COININCDIR = @abs_include_dir@ 57 COININCDIR = @abs_include_dir@/coin 58 58 59 59 # Directory with COIN libraries -
trunk/Cbc/src/Makefile.am
r783 r846 286 286 287 287 # 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' 289 includecoindir = $(includedir)/coin 290 includecoin_HEADERS = \ 290 291 ../inc/config_cbc.h \ 291 292 Cbc_C_Interface.h \ … … 329 330 echo "#endif" >> bla 330 331 cat $(srcdir)/$(ConfigHeader) >> bla 331 $(install_sh_DATA) bla $(DESTDIR)$(include dir)/$(ConfigHeader)332 $(install_sh_DATA) bla $(DESTDIR)$(includecoindir)/$(ConfigHeader) 332 333 rm -f bla 333 334 334 335 uninstall-local: 335 rm -f $(DESTDIR)$(include dir)/$(ConfigHeader)336 rm -f $(DESTDIR)$(includecoindir)/$(ConfigHeader) -
trunk/Cbc/src/Makefile.in
r835 r846 136 136 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_ASL_TRUE@am__append_34 = $(ASL_CPPFLAGS) -DCOIN_HAS_ASL 137 137 subdir = src 138 DIST_COMMON = $(include _HEADERS) $(srcdir)/Makefile.am \138 DIST_COMMON = $(includecoin_HEADERS) $(srcdir)/Makefile.am \ 139 139 $(srcdir)/Makefile.in 140 140 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 … … 153 153 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; 154 154 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ 155 "$(DESTDIR)$(include dir)"155 "$(DESTDIR)$(includecoindir)" 156 156 libLTLIBRARIES_INSTALL = $(INSTALL) 157 157 LTLIBRARIES = $(lib_LTLIBRARIES) … … 263 263 DIST_SOURCES = $(libCbc_la_SOURCES) $(libCbcSolver_la_SOURCES) \ 264 264 $(am__cbc_SOURCES_DIST) $(am__cbc_generic_SOURCES_DIST) 265 include HEADERS_INSTALL = $(INSTALL_HEADER)266 HEADERS = $(include _HEADERS)265 includecoinHEADERS_INSTALL = $(INSTALL_HEADER) 266 HEADERS = $(includecoin_HEADERS) 267 267 ETAGS = etags 268 268 CTAGS = ctags … … 619 619 620 620 # 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' 622 includecoindir = $(includedir)/coin 623 includecoin_HEADERS = \ 623 624 ../inc/config_cbc.h \ 624 625 Cbc_C_Interface.h \ … … 836 837 -rm -f libtool 837 838 uninstall-info-am: 838 install-include HEADERS: $(include_HEADERS)839 install-includecoinHEADERS: $(includecoin_HEADERS) 839 840 @$(NORMAL_INSTALL) 840 test -z "$(include dir)" || $(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 \ 842 843 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ 843 844 f=$(am__strip_dir) \ 844 echo " $(include HEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \845 $(include HEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \845 echo " $(includecoinHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includecoindir)/$$f'"; \ 846 $(includecoinHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includecoindir)/$$f"; \ 846 847 done 847 848 848 uninstall-include HEADERS:849 uninstall-includecoinHEADERS: 849 850 @$(NORMAL_UNINSTALL) 850 @list='$(include _HEADERS)'; for p in $$list; do \851 @list='$(includecoin_HEADERS)'; for p in $$list; do \ 851 852 f=$(am__strip_dir) \ 852 echo " rm -f '$(DESTDIR)$(include dir)/$$f'"; \853 rm -f "$(DESTDIR)$(include dir)/$$f"; \853 echo " rm -f '$(DESTDIR)$(includecoindir)/$$f'"; \ 854 rm -f "$(DESTDIR)$(includecoindir)/$$f"; \ 854 855 done 855 856 … … 936 937 937 938 installdirs: 938 for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(include dir)"; do \939 for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includecoindir)"; do \ 939 940 test -z "$$dir" || $(mkdir_p) "$$dir"; \ 940 941 done … … 984 985 info-am: 985 986 986 install-data-am: install-include HEADERS987 install-data-am: install-includecoinHEADERS 987 988 988 989 install-exec-am: install-binPROGRAMS install-exec-local \ … … 1013 1014 ps-am: 1014 1015 1015 uninstall-am: uninstall-binPROGRAMS uninstall-include HEADERS \1016 uninstall-am: uninstall-binPROGRAMS uninstall-includecoinHEADERS \ 1016 1017 uninstall-info-am uninstall-libLTLIBRARIES uninstall-local 1017 1018 … … 1022 1023 html-am info info-am install install-am install-binPROGRAMS \ 1023 1024 install-data install-data-am install-exec install-exec-am \ 1024 install-exec-local install-include HEADERS install-info \1025 install-exec-local install-includecoinHEADERS install-info \ 1025 1026 install-info-am install-libLTLIBRARIES install-man \ 1026 1027 install-strip installcheck installcheck-am installdirs \ … … 1028 1029 mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ 1029 1030 pdf pdf-am ps ps-am tags uninstall uninstall-am \ 1030 uninstall-binPROGRAMS uninstall-include HEADERS \1031 uninstall-binPROGRAMS uninstall-includecoinHEADERS \ 1031 1032 uninstall-info-am uninstall-libLTLIBRARIES uninstall-local 1032 1033 … … 1037 1038 echo "#endif" >> bla 1038 1039 cat $(srcdir)/$(ConfigHeader) >> bla 1039 $(install_sh_DATA) bla $(DESTDIR)$(include dir)/$(ConfigHeader)1040 $(install_sh_DATA) bla $(DESTDIR)$(includecoindir)/$(ConfigHeader) 1040 1041 rm -f bla 1041 1042 1042 1043 uninstall-local: 1043 rm -f $(DESTDIR)$(include dir)/$(ConfigHeader)1044 rm -f $(DESTDIR)$(includecoindir)/$(ConfigHeader) 1044 1045 # Tell versions [3.59,3.63) of GNU make to not export all variables. 1045 1046 # Otherwise a system limit (for SysV at least) may be exceeded.
Note: See TracChangeset
for help on using the changeset viewer.