Changeset 1637


Ignore:
Timestamp:
Jul 22, 2010 6:02:04 AM (9 years ago)
Author:
stefan
Message:

create xxx_addlibs.txt after installation by using only .pc files of installed projects; rerun autotools

Location:
ThirdParty/Mumps/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Mumps/trunk/Makefile.am

    r1572 r1637  
    9797  $(MUMPSDIR)/libseq/mpi.h
    9898
    99 if COIN_HAS_PKGCONFIG
    100 addlibsdir = $(datadir)/coin/doc/ThirdParty/Mumps
    101 addlibs_DATA = mumps_addlibs.txt
    102 
    103 mumps_addlibs.txt : coinmumps.pc
    104         PKG_CONFIG_PATH=.:@COIN_PKG_CONFIG_PATH@ $(PKG_CONFIG) --libs coinmumps > mumps_addlibs.txt
    105 endif
    106 
    10799pkgconfiglibdir = $(libdir)/pkgconfig
    108100pkgconfiglib_DATA = coinmumps.pc
     101
     102if COIN_HAS_PKGCONFIG
     103addlibsdir = $(DESTDIR)$(datadir)/coin/doc/ThirdParty/Mumps
     104       
     105install-data-hook:
     106        @$(mkdir_p) "$(addlibsdir)"
     107        PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ PKG_CONFIG_DISABLE_UNINSTALLED= \
     108        $(PKG_CONFIG) --libs coinmumps > $(addlibsdir)/mumps_addlibs.txt
     109endif
    109110
    110111########################################################################
  • ThirdParty/Mumps/trunk/Makefile.in

    r1620 r1637  
    7878am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    7979am__installdirs = "$(DESTDIR)$(thirdpartylibdir)" \
    80         "$(DESTDIR)$(addlibsdir)" "$(DESTDIR)$(pkgconfiglibdir)" \
     80        "$(DESTDIR)$(pkgconfiglibdir)" \
    8181        "$(DESTDIR)$(thirdpartyincludedir)"
    8282thirdpartylibLTLIBRARIES_INSTALL = $(INSTALL)
     
    116116SOURCES = $(nodist_libcoinmumps_la_SOURCES)
    117117DIST_SOURCES =
    118 addlibsDATA_INSTALL = $(INSTALL_DATA)
    119118pkgconfiglibDATA_INSTALL = $(INSTALL_DATA)
    120 DATA = $(addlibs_DATA) $(pkgconfiglib_DATA)
     119DATA = $(pkgconfiglib_DATA)
    121120thirdpartyincludeHEADERS_INSTALL = $(INSTALL_HEADER)
    122121HEADERS = $(thirdpartyinclude_HEADERS)
     
    165164COIN_HAS_PKGCONFIG_TRUE = @COIN_HAS_PKGCONFIG_TRUE@
    166165COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
     166COIN_PKG_CONFIG_PATH_UNINSTALLED = @COIN_PKG_CONFIG_PATH_UNINSTALLED@
    167167CPP = @CPP@
    168168CPPFLAGS = @CPPFLAGS@
     
    345345  $(MUMPSDIR)/libseq/mpi.h
    346346
    347 @COIN_HAS_PKGCONFIG_TRUE@addlibsdir = $(datadir)/coin/doc/ThirdParty/Mumps
    348 @COIN_HAS_PKGCONFIG_TRUE@addlibs_DATA = mumps_addlibs.txt
    349347pkgconfiglibdir = $(libdir)/pkgconfig
    350348pkgconfiglib_DATA = coinmumps.pc
     349@COIN_HAS_PKGCONFIG_TRUE@addlibsdir = $(DESTDIR)$(datadir)/coin/doc/ThirdParty/Mumps
    351350
    352351########################################################################
     
    620619        -rm -f libtool
    621620uninstall-info-am:
    622 install-addlibsDATA: $(addlibs_DATA)
    623         @$(NORMAL_INSTALL)
    624         test -z "$(addlibsdir)" || $(mkdir_p) "$(DESTDIR)$(addlibsdir)"
    625         @list='$(addlibs_DATA)'; for p in $$list; do \
    626           if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
    627           f=$(am__strip_dir) \
    628           echo " $(addlibsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(addlibsdir)/$$f'"; \
    629           $(addlibsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(addlibsdir)/$$f"; \
    630         done
    631 
    632 uninstall-addlibsDATA:
    633         @$(NORMAL_UNINSTALL)
    634         @list='$(addlibs_DATA)'; for p in $$list; do \
    635           f=$(am__strip_dir) \
    636           echo " rm -f '$(DESTDIR)$(addlibsdir)/$$f'"; \
    637           rm -f "$(DESTDIR)$(addlibsdir)/$$f"; \
    638         done
    639621install-pkgconfiglibDATA: $(pkgconfiglib_DATA)
    640622        @$(NORMAL_INSTALL)
     
    851833all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
    852834installdirs:
    853         for dir in "$(DESTDIR)$(thirdpartylibdir)" "$(DESTDIR)$(addlibsdir)" "$(DESTDIR)$(pkgconfiglibdir)" "$(DESTDIR)$(thirdpartyincludedir)"; do \
     835        for dir in "$(DESTDIR)$(thirdpartylibdir)" "$(DESTDIR)$(pkgconfiglibdir)" "$(DESTDIR)$(thirdpartyincludedir)"; do \
    854836          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    855837        done
     
    880862        @echo "This command is intended for maintainers to use"
    881863        @echo "it deletes files that may require special tools to rebuild."
     864@COIN_HAS_PKGCONFIG_FALSE@install-data-hook:
    882865clean: clean-am
    883866
     
    902885info-am:
    903886
    904 install-data-am: install-addlibsDATA install-pkgconfiglibDATA \
     887install-data-am: install-pkgconfiglibDATA \
    905888        install-thirdpartyincludeHEADERS \
    906889        install-thirdpartylibLTLIBRARIES
     890        @$(NORMAL_INSTALL)
     891        $(MAKE) $(AM_MAKEFLAGS) install-data-hook
    907892
    908893install-exec-am:
     
    934919ps-am:
    935920
    936 uninstall-am: uninstall-addlibsDATA uninstall-info-am \
    937         uninstall-pkgconfiglibDATA uninstall-thirdpartyincludeHEADERS \
     921uninstall-am: uninstall-info-am uninstall-pkgconfiglibDATA \
     922        uninstall-thirdpartyincludeHEADERS \
    938923        uninstall-thirdpartylibLTLIBRARIES
    939924
     
    944929        distclean-generic distclean-libtool distclean-tags \
    945930        distcleancheck distdir distuninstallcheck dvi dvi-am html \
    946         html-am info info-am install install-addlibsDATA install-am \
    947         install-data install-data-am install-exec install-exec-am \
     931        html-am info info-am install install-am install-data \
     932        install-data-am install-data-hook install-exec install-exec-am \
    948933        install-info install-info-am install-man \
    949934        install-pkgconfiglibDATA install-strip \
     
    953938        mostlyclean mostlyclean-compile mostlyclean-generic \
    954939        mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
    955         uninstall-addlibsDATA uninstall-am uninstall-info-am \
    956         uninstall-pkgconfiglibDATA uninstall-thirdpartyincludeHEADERS \
     940        uninstall-am uninstall-info-am uninstall-pkgconfiglibDATA \
     941        uninstall-thirdpartyincludeHEADERS \
    957942        uninstall-thirdpartylibLTLIBRARIES
    958943
     
    984969dmumps_part2.lo dmumps_part5.lo dmumps_part8.lo: tools_common_mod.lo
    985970
    986 @COIN_HAS_PKGCONFIG_TRUE@mumps_addlibs.txt : coinmumps.pc
    987 @COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=.:@COIN_PKG_CONFIG_PATH@ $(PKG_CONFIG) --libs coinmumps > mumps_addlibs.txt
     971@COIN_HAS_PKGCONFIG_TRUE@install-data-hook:
     972@COIN_HAS_PKGCONFIG_TRUE@       @$(mkdir_p) "$(addlibsdir)"
     973@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ PKG_CONFIG_DISABLE_UNINSTALLED= \
     974@COIN_HAS_PKGCONFIG_TRUE@       $(PKG_CONFIG) --libs coinmumps > $(addlibsdir)/mumps_addlibs.txt
    988975
    989976install-doc: $(DocFiles)
  • ThirdParty/Mumps/trunk/configure

    r1629 r1637  
    473473#endif"
    474474
    475 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ADDLIBS PCADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion MUMPS_SVN_REV build build_cpu build_vendor build_os CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC ADD_FFLAGS DBG_FFLAGS OPT_FFLAGS F77 FFLAGS ac_ct_F77 MPIF77 FLIBS CPP EGREP MY_DEFS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH BLAS_LIBS BLAS_CFLAGS BLAS_DATA REQUIREDPACKAGES COIN_HAS_BLAS_TRUE COIN_HAS_BLAS_FALSE METIS_LIBS METIS_CFLAGS METIS_DATA COIN_HAS_METIS_TRUE COIN_HAS_METIS_FALSE MUMPSDIR MUMPSOBJDIR MUMPSSRCDIR MY_FDEFS LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
     475ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ADDLIBS PCADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion MUMPS_SVN_REV build build_cpu build_vendor build_os CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC ADD_FFLAGS DBG_FFLAGS OPT_FFLAGS F77 FFLAGS ac_ct_F77 MPIF77 FLIBS CPP EGREP MY_DEFS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED BLAS_LIBS BLAS_CFLAGS BLAS_DATA REQUIREDPACKAGES COIN_HAS_BLAS_TRUE COIN_HAS_BLAS_FALSE METIS_LIBS METIS_CFLAGS METIS_DATA COIN_HAS_METIS_TRUE COIN_HAS_METIS_FALSE MUMPSDIR MUMPSOBJDIR MUMPSSRCDIR MY_FDEFS LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    2173421734
    2173521735
    21736 # assemble search path for pkg-config
     21736# assemble pkg-config search path for installed projects
    2173721737COIN_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    2173821738
     
    2175721757fi;
    2175821758
     21759
     21760
     21761# assemble additional pkg-config search paths for uninstalled projects
    2175921762if test x$coin_projectdir = xyes ; then
    2176021763  # if we are in a project setup, then in a classic setup, we want to find uninstalled projects
     
    2176221765  # unfortunately, if the user set prefix, then we do not know where the project base directory is located
    2176321766  # but it is likely to be either .. (if we are a usual coin project) or ../.. (if we are a unusual coin project like ThirdParty or Data)
     21767  COIN_PKG_CONFIG_PATH_UNINSTALLED=
    2176421768  if test -e ../coin_subdirs.txt ; then
    2176521769    for i in `cat ../coin_subdirs.txt` ; do
    2176621770      if test -d ../$i ; then
    21767         COIN_PKG_CONFIG_PATH="`cd ../$i; pwd`:${COIN_PKG_CONFIG_PATH}"
     21771        COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../$i; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
    2176821772      fi
    2176921773    done
     
    2177321777    for i in `cat ../../coin_subdirs.txt` ; do
    2177421778      if test -d ../../$i ; then
    21775         COIN_PKG_CONFIG_PATH="`cd ../../$i; pwd`:${COIN_PKG_CONFIG_PATH}"
     21779        COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../../$i; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
    2177621780      fi
    2177721781    done
    2177821782  fi
    2177921783
    21780 fi
    21781 
     21784
     21785fi
    2178221786
    2178321787
     
    2379623800    # need to export variable to be sure that the following pkg-config gets these values
    2379723801    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    23798     PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH"
     23802    PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH:$COIN_PKG_CONFIG_PATH_UNINSTALLED"
    2379923803    export PKG_CONFIG_PATH
    2380023804
     
    2384123845    # reset PKG_CONFIG_PATH variable
    2384223846    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
     23847    export PKG_CONFIG_PATH
    2384323848  else
    2384423849    #if 4th argument is given, try fallback - whereby we take the first word from coinblas as basename for the .pc file
     
    2406524070    # need to export variable to be sure that the following pkg-config gets these values
    2406624071    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    24067     PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH"
     24072    PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH:$COIN_PKG_CONFIG_PATH_UNINSTALLED"
    2406824073    export PKG_CONFIG_PATH
    2406924074
     
    2411024115    # reset PKG_CONFIG_PATH variable
    2411124116    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
     24117    export PKG_CONFIG_PATH
    2411224118  else
    2411324119    #if 4th argument is given, try fallback - whereby we take the first word from coinmetis >= 4.0 as basename for the .pc file
     
    2532425330s,@COIN_HAS_PKGCONFIG_FALSE@,$COIN_HAS_PKGCONFIG_FALSE,;t t
    2532525331s,@COIN_PKG_CONFIG_PATH@,$COIN_PKG_CONFIG_PATH,;t t
     25332s,@COIN_PKG_CONFIG_PATH_UNINSTALLED@,$COIN_PKG_CONFIG_PATH_UNINSTALLED,;t t
    2532625333s,@BLAS_LIBS@,$BLAS_LIBS,;t t
    2532725334s,@BLAS_CFLAGS@,$BLAS_CFLAGS,;t t
Note: See TracChangeset for help on using the changeset viewer.