Skip to content

Commit

Permalink
temporarily committing release candidate
Browse files Browse the repository at this point in the history
  • Loading branch information
@tkralphs
tkralphs committed Apr 4, 2015
1 parent 83c0055 commit 53f27e2
Show file tree
Hide file tree
Showing 10 changed files with 566 additions and 73 deletions.
152 changes: 135 additions & 17 deletions Dip/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ DIST_COMMON = README $(am__configure_deps) \
$(srcdir)/BuildTools/Makemain.inc $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/dip-uninstalled.pc.in \
$(srcdir)/dip.pc.in $(top_srcdir)/configure \
$(top_srcdir)/doxydoc/doxygen.conf.in \
$(top_srcdir)/examples/ATM/Makefile.in \
$(top_srcdir)/examples/ATM/atm.parm.in \
$(top_srcdir)/examples/ATM/data_extract.sh.in \
Expand Down Expand Up @@ -164,7 +165,7 @@ CONFIG_CLEAN_FILES = examples/Makefile.Examples examples/TSP/Makefile \
examples/ExternalSolvers/VRP/get.cvrpsep \
examples/ExternalSolvers/Graph/get.boost \
examples/ExternalSolvers/TSP/get.concorde dip.pc \
dip-uninstalled.pc
dip-uninstalled.pc doxydoc/doxygen.conf
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
Expand Down Expand Up @@ -273,8 +274,12 @@ COIN_HAS_COINDEPEND_FALSE = @COIN_HAS_COINDEPEND_FALSE@
COIN_HAS_COINDEPEND_TRUE = @COIN_HAS_COINDEPEND_TRUE@
COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
COIN_HAS_DOXYGEN_FALSE = @COIN_HAS_DOXYGEN_FALSE@
COIN_HAS_DOXYGEN_TRUE = @COIN_HAS_DOXYGEN_TRUE@
COIN_HAS_HMETIS_FALSE = @COIN_HAS_HMETIS_FALSE@
COIN_HAS_HMETIS_TRUE = @COIN_HAS_HMETIS_TRUE@
COIN_HAS_LATEX_FALSE = @COIN_HAS_LATEX_FALSE@
COIN_HAS_LATEX_TRUE = @COIN_HAS_LATEX_TRUE@
COIN_HAS_PKGCONFIG_FALSE = @COIN_HAS_PKGCONFIG_FALSE@
COIN_HAS_PKGCONFIG_TRUE = @COIN_HAS_PKGCONFIG_TRUE@
COIN_HAS_SAMPLE_FALSE = @COIN_HAS_SAMPLE_FALSE@
Expand Down Expand Up @@ -425,6 +430,13 @@ build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
coin_doxy_excludes = @coin_doxy_excludes@
coin_doxy_logname = @coin_doxy_logname@
coin_doxy_tagfiles = @coin_doxy_tagfiles@
coin_doxy_tagname = @coin_doxy_tagname@
coin_doxy_usedot = @coin_doxy_usedot@
coin_have_doxygen = @coin_have_doxygen@
coin_have_latex = @coin_have_latex@
datadir = @datadir@
exec_prefix = @exec_prefix@
have_autoconf = @have_autoconf@
Expand Down Expand Up @@ -483,8 +495,10 @@ addlibsdir = $(DESTDIR)$(datadir)/coin/doc/Dip

# Files that are generated and should be cleaned with make distclean
DISTCLEANFILES = $(am__append_3) $(VPATH_DISTCLEANFILES)
DocFiles = README AUTHORS LICENSE
DocFiles = README AUTHORS LICENSE
DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME)
COIN_HAS_DOXYGEN = @COIN_HAS_DOXYGEN_TRUE@TRUE
COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE@TRUE
all: all-recursive

.SUFFIXES:
Expand Down Expand Up @@ -621,6 +635,8 @@ dip.pc: $(top_builddir)/config.status $(srcdir)/dip.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
dip-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/dip-uninstalled.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
doxydoc/doxygen.conf: $(top_builddir)/config.status $(top_srcdir)/doxydoc/doxygen.conf.in
cd $(top_builddir) && $(SHELL) ./config.status $@

mostlyclean-libtool:
-rm -f *.lo
Expand Down Expand Up @@ -784,7 +800,7 @@ distclean-tags:
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
$(mkdir_p) $(distdir)/. $(distdir)/BuildTools $(distdir)/examples $(distdir)/examples/ATM $(distdir)/examples/ExternalSolvers/Graph $(distdir)/examples/ExternalSolvers/Knapsack/Pisinger $(distdir)/examples/ExternalSolvers/TSP $(distdir)/examples/ExternalSolvers/VRP $(distdir)/examples/GAP $(distdir)/examples/MCF $(distdir)/examples/MILP $(distdir)/examples/MMKP $(distdir)/examples/SDPUC $(distdir)/examples/SmallIP $(distdir)/examples/TSP $(distdir)/examples/VRP
$(mkdir_p) $(distdir)/. $(distdir)/BuildTools $(distdir)/doxydoc $(distdir)/examples $(distdir)/examples/ATM $(distdir)/examples/ExternalSolvers/Graph $(distdir)/examples/ExternalSolvers/Knapsack/Pisinger $(distdir)/examples/ExternalSolvers/TSP $(distdir)/examples/ExternalSolvers/VRP $(distdir)/examples/GAP $(distdir)/examples/MCF $(distdir)/examples/MILP $(distdir)/examples/MMKP $(distdir)/examples/SDPUC $(distdir)/examples/SmallIP $(distdir)/examples/TSP $(distdir)/examples/VRP
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
Expand Down Expand Up @@ -980,7 +996,7 @@ install-data-am: install-pkgconfiglibDATA
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook

install-exec-am:
install-exec-am: install-exec-local

install-info: install-info-recursive

Expand All @@ -1006,7 +1022,8 @@ ps: ps-recursive

ps-am:

uninstall-am: uninstall-info-am uninstall-pkgconfiglibDATA
uninstall-am: uninstall-info-am uninstall-local \
uninstall-pkgconfiglibDATA
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook

Expand All @@ -1020,14 +1037,15 @@ uninstall-info: uninstall-info-recursive
distclean-recursive distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
install-data-hook install-exec install-exec-am install-info \
install-info-am install-man install-pkgconfiglibDATA \
install-strip installcheck installcheck-am installdirs \
installdirs-am maintainer-clean maintainer-clean-generic \
maintainer-clean-recursive mostlyclean mostlyclean-generic \
mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
tags tags-recursive uninstall uninstall-am uninstall-hook \
uninstall-info-am uninstall-pkgconfiglibDATA
install-data-hook install-exec install-exec-am \
install-exec-local install-info install-info-am install-man \
install-pkgconfiglibDATA install-strip installcheck \
installcheck-am installdirs installdirs-am maintainer-clean \
maintainer-clean-generic maintainer-clean-recursive \
mostlyclean mostlyclean-generic mostlyclean-libtool \
mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
uninstall uninstall-am uninstall-hook uninstall-info-am \
uninstall-local uninstall-pkgconfiglibDATA


########################################################################
Expand All @@ -1039,13 +1057,25 @@ test: all

unitTest: test

clean-local:
# Doxygen documentation

doxydoc:
doxygen doxydoc/doxygen.conf

clean-doxydoc:
( cd doxydoc ; rm -rf html *.log *.tag )

clean-local: clean-doxydoc
if test -r test/Makefile; then cd test; $(MAKE) clean; fi

distclean-local:
if test -r test/Makefile; then cd test; $(MAKE) distclean; fi

.PHONY: test unitTest
install-exec-local: install-doc

uninstall-local: uninstall-doc

.PHONY: test unitTest doxydoc

install-data-hook:
@$(mkdir_p) "$(addlibsdir)"
Expand All @@ -1057,12 +1087,100 @@ install-data-hook:
uninstall-hook:
rm -f $(addlibsdir)/dip_addlibs.txt

install-doc: $(DocFiles)
doxygen-docs:
if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
if test -d "doxydoc/"; then \
doxygen doxydoc/doxygen.conf;\
fi;\
fi

pdf-doxygen-docs: doxygen-docs
if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
if test -d "doxydoc/latex"; then \
if test "$(COIN_HAS_LATEX)" = TRUE; then \
cd doxydoc/latex;\
$(MAKE) pdf;\
cd -;\
fi;\
fi;\
fi

clean-doxygen-docs:
if test -d "doxydoc/"; then \
cd doxydoc ;\
rm -rf html latex *.log *.tag;\
fi

install-doxygen-docs: doxygen-docs
if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
if test -d "doxydoc/"; then \
test -d "$(DESTDIR)$(DocInstallDir)/doxydoc" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)/doxydoc"; \
$(INSTALL_DATA) @coin_doxy_tagname@ "$(DESTDIR)$(DocInstallDir)/@coin_doxy_tagname@";\
if test -f "doxydoc/latex/refman.pdf"; then \
$(INSTALL_DATA) doxydoc/latex/refman.pdf "$(DESTDIR)$(DocInstallDir)";\
fi;\
if test -d "doxydoc/html"; then \
test -d "$(DESTDIR)$(DocInstallDir)/doxydoc/search/" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)/doxydoc/search/"; \
$(INSTALL_DATA) doxydoc/html/*.* "$(DESTDIR)$(DocInstallDir)/doxydoc";\
$(INSTALL_DATA) doxydoc/html/search/*.* "$(DESTDIR)$(DocInstallDir)/doxydoc/search";\
fi;\
fi;\
fi

uninstall-doxygen-docs:
if test -d "$(DESTDIR)$(DocInstallDir)/doxydoc/"; then \
rm -rf "$(DESTDIR)$(DocInstallDir)/doxydoc/"; \
fi
if test -f "$(DESTDIR)$(DocInstallDir)/refman.pdf"; then \
rm -f "$(DESTDIR)$(DocInstallDir)/refman.pdf"; \
fi

all-doxygen-docs:
for dir in $(subdirs) ; do \
do_project=true;\
for proj in $(COIN_SKIP_DOXYGEN); do\
if test $$dir = $$proj; then\
do_project=false;\
fi;\
done;\
if test -r $$dir/doxydoc & $$do_project = true; then \
(cd $$dir ; $(MAKE) doxygen-docs) \
fi ; \
done ;

clean-all-doxygen-docs:
for dir in $(subdirs) ; do \
if test -r $$dir/doxydoc ; then \
(cd $$dir ; $(MAKE) clean-doxygen-docs) \
fi ; \
done ;

install-all-doxygen-docs: all-doxygen-docs
for dir in $(subdirs) ; do \
do_project=true;\
for proj in $(COIN_SKIP_DOXYGEN); do\
if test $$dir = $$proj; then\
do_project=false;\
fi;\
done;\
if test -r $$dir/doxydoc & $$do_project = true; then \
(cd $$dir ; $(MAKE) install-doxygen-docs) \
fi ; \
done ;

uninstall-all-doxygen-docs:
for dir in $(subdirs) ; do \
if test -r $$dir/doxydoc ; then \
(cd $$dir ; $(MAKE) uninstall-doxygen-docs) \
fi ; \
done ;

install-doc: $(DocFiles)
test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
for file in $(DocFiles); do \
if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
if test -f "$$dir$$file"; then $(INSTALL_DATA) "$$dir$$file" "$(DESTDIR)$(DocInstallDir)/$$file"; fi; \
done
done

uninstall-doc:
for file in $(DocFiles); do \
Expand Down
Loading

0 comments on commit 53f27e2

Please sign in to comment.