Changeset 4012


Ignore:
Timestamp:
Sep 12, 2019 11:36:53 AM (4 weeks ago)
Author:
stefan
Message:

install generated strings.h, if generated

Location:
ThirdParty/Metis/branches/autotools-update
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Metis/branches/autotools-update/Makefile.am

    r3954 r4012  
    7878  $(METISDIR)/Lib/struct.h
    7979
     80# if we generated strings.h, then also install it for users of metis.h (like Mumps5)
     81if INSTALL_STRINGS_H
     82  thirdpartyinclude_HEADERS += strings.h
     83endif
     84
    8085pkgconfiglibdir = $(libdir)/pkgconfig
    8186pkgconfiglib_DATA = coinmetis.pc
    82 
    83 test:
    84         @echo "No test available for Metis."
    8587
    8688# Suppress default defines from autoheader
  • ThirdParty/Metis/branches/autotools-update/Makefile.in

    r4000 r4012  
    108108build_triplet = @build@
    109109host_triplet = @host@
     110
     111# if we generated strings.h, then also install it for users of metis.h (like Mumps5)
     112@INSTALL_STRINGS_H_TRUE@am__append_1 = strings.h
    110113subdir = .
    111114ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    114117        $(ACLOCAL_M4)
    115118DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
    116         $(am__configure_deps) $(thirdpartyinclude_HEADERS)
     119        $(am__configure_deps) $(am__thirdpartyinclude_HEADERS_DIST)
    117120am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
    118121 configure.lineno config.status.lineno
     
    281284  esac
    282285DATA = $(pkgconfiglib_DATA)
     286am__thirdpartyinclude_HEADERS_DIST = $(METISDIR)/Lib/defs.h \
     287        $(METISDIR)/Lib/macros.h $(METISDIR)/Lib/metis.h \
     288        $(METISDIR)/Lib/proto.h $(METISDIR)/Lib/rename.h \
     289        $(METISDIR)/Lib/struct.h strings.h
    283290HEADERS = $(thirdpartyinclude_HEADERS)
    284291am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
     
    488495libcoinmetis_la_LDFLAGS = $(LT_LDFLAGS)
    489496thirdpartyincludedir = $(includedir)/coin-or/metis
    490 thirdpartyinclude_HEADERS = \
    491   $(METISDIR)/Lib/defs.h \
    492   $(METISDIR)/Lib/macros.h \
    493   $(METISDIR)/Lib/metis.h \
    494   $(METISDIR)/Lib/proto.h \
    495   $(METISDIR)/Lib/rename.h \
    496   $(METISDIR)/Lib/struct.h
    497 
     497thirdpartyinclude_HEADERS = $(METISDIR)/Lib/defs.h \
     498        $(METISDIR)/Lib/macros.h $(METISDIR)/Lib/metis.h \
     499        $(METISDIR)/Lib/proto.h $(METISDIR)/Lib/rename.h \
     500        $(METISDIR)/Lib/struct.h $(am__append_1)
    498501pkgconfiglibdir = $(libdir)/pkgconfig
    499502pkgconfiglib_DATA = coinmetis.pc
     
    11561159
    11571160
    1158 test:
    1159         @echo "No test available for Metis."
    1160 
    11611161doxygen-docs:
    11621162        if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
  • ThirdParty/Metis/branches/autotools-update/configure

    r4000 r4012  
    647647METIS_LFLAGS_NOPC
    648648METISDIR
     649INSTALL_STRINGS_H_FALSE
     650INSTALL_STRINGS_H_TRUE
    649651METIS_LFLAGS
    650652LT_LDFLAGS
     
    1222012222
    1222112223
     12224 if test -f strings.h; then
     12225  INSTALL_STRINGS_H_TRUE=
     12226  INSTALL_STRINGS_H_FALSE='#'
     12227else
     12228  INSTALL_STRINGS_H_TRUE='#'
     12229  INSTALL_STRINGS_H_FALSE=
     12230fi
     12231
    1222212232
    1222312233# On some systems, there are no drand48 and srand48.
     
    1246412474if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
    1246512475  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
     12476Usually this means the macro was only invoked conditionally." "$LINENO" 5
     12477fi
     12478if test -z "${INSTALL_STRINGS_H_TRUE}" && test -z "${INSTALL_STRINGS_H_FALSE}"; then
     12479  as_fn_error $? "conditional \"INSTALL_STRINGS_H\" was never defined.
    1246612480Usually this means the macro was only invoked conditionally." "$LINENO" 5
    1246712481fi
  • ThirdParty/Metis/branches/autotools-update/configure.ac

    r3960 r4012  
    4040# We may need to create a dummy header file for Windows
    4141AC_CHECK_HEADER([strings.h], [], [touch strings.h])
     42AM_CONDITIONAL(INSTALL_STRINGS_H, test -f strings.h)
    4243
    4344# On some systems, there are no drand48 and srand48.
Note: See TracChangeset for help on using the changeset viewer.