Changeset 1577


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

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

Location:
trunk/Clp
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/Makefile.am

    r1563 r1577  
    9696
    9797########################################################################
    98 #                  Installation of the addlibs file                    #
     98#                    Creation of the addlibs file                      #
    9999########################################################################
    100 
    101 if COIN_HAS_PKGCONFIG
    102 addlibsdir = $(datadir)/coin/doc/Clp
    103 addlibs_DATA = clp_addlibs.txt
    104 
    105 clp_addlibs.txt : clp.pc
    106         PKG_CONFIG_PATH=.:@COIN_PKG_CONFIG_PATH@ $(PKG_CONFIG) --libs clp > clp_addlibs.txt
    107 endif
    108100
    109101pkgconfiglibdir = $(libdir)/pkgconfig
    110102pkgconfiglib_DATA = clp.pc
     103
     104if COIN_HAS_PKGCONFIG
     105addlibsdir = $(DESTDIR)$(datadir)/coin/doc/Clp
     106       
     107install-data-hook:
     108        @$(mkdir_p) "$(addlibsdir)"
     109        PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ PKG_CONFIG_DISABLE_UNINSTALLED= \
     110        $(PKG_CONFIG) --libs clp > $(addlibsdir)/clp_addlibs.txt
     111endif
    111112
    112113########################################################################
  • trunk/Clp/Makefile.in

    r1573 r1577  
    9494  esac;
    9595am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    96 am__installdirs = "$(DESTDIR)$(addlibsdir)" \
    97         "$(DESTDIR)$(pkgconfiglibdir)"
    98 addlibsDATA_INSTALL = $(INSTALL_DATA)
     96am__installdirs = "$(DESTDIR)$(pkgconfiglibdir)"
    9997pkgconfiglibDATA_INSTALL = $(INSTALL_DATA)
    100 DATA = $(addlibs_DATA) $(pkgconfiglib_DATA)
     98DATA = $(pkgconfiglib_DATA)
    10199ETAGS = etags
    102100CTAGS = ctags
     
    151149COIN_HAS_SAMPLE_TRUE = @COIN_HAS_SAMPLE_TRUE@
    152150COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
     151COIN_PKG_CONFIG_PATH_UNINSTALLED = @COIN_PKG_CONFIG_PATH_UNINSTALLED@
    153152CPP = @CPP@
    154153CPPFLAGS = @CPPFLAGS@
     
    312311
    313312########################################################################
    314 #                  Installation of the addlibs file                    #
    315 ########################################################################
    316 @COIN_HAS_PKGCONFIG_TRUE@addlibsdir = $(datadir)/coin/doc/Clp
    317 @COIN_HAS_PKGCONFIG_TRUE@addlibs_DATA = clp_addlibs.txt
     313#                    Creation of the addlibs file                      #
     314########################################################################
    318315pkgconfiglibdir = $(libdir)/pkgconfig
    319316pkgconfiglib_DATA = clp.pc
     317@COIN_HAS_PKGCONFIG_TRUE@addlibsdir = $(DESTDIR)$(datadir)/coin/doc/Clp
    320318
    321319########################################################################
     
    399397        -rm -f libtool
    400398uninstall-info-am:
    401 install-addlibsDATA: $(addlibs_DATA)
    402         @$(NORMAL_INSTALL)
    403         test -z "$(addlibsdir)" || $(mkdir_p) "$(DESTDIR)$(addlibsdir)"
    404         @list='$(addlibs_DATA)'; for p in $$list; do \
    405           if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
    406           f=$(am__strip_dir) \
    407           echo " $(addlibsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(addlibsdir)/$$f'"; \
    408           $(addlibsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(addlibsdir)/$$f"; \
    409         done
    410 
    411 uninstall-addlibsDATA:
    412         @$(NORMAL_UNINSTALL)
    413         @list='$(addlibs_DATA)'; for p in $$list; do \
    414           f=$(am__strip_dir) \
    415           echo " rm -f '$(DESTDIR)$(addlibsdir)/$$f'"; \
    416           rm -f "$(DESTDIR)$(addlibsdir)/$$f"; \
    417         done
    418399install-pkgconfiglibDATA: $(pkgconfiglib_DATA)
    419400        @$(NORMAL_INSTALL)
     
    713694installdirs: installdirs-recursive
    714695installdirs-am:
    715         for dir in "$(DESTDIR)$(addlibsdir)" "$(DESTDIR)$(pkgconfiglibdir)"; do \
     696        for dir in "$(DESTDIR)$(pkgconfiglibdir)"; do \
    716697          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    717698        done
     
    742723        @echo "This command is intended for maintainers to use"
    743724        @echo "it deletes files that may require special tools to rebuild."
     725@COIN_HAS_PKGCONFIG_FALSE@install-data-hook:
    744726clean: clean-recursive
    745727
     
    762744info-am:
    763745
    764 install-data-am: install-addlibsDATA install-pkgconfiglibDATA
     746install-data-am: install-pkgconfiglibDATA
     747        @$(NORMAL_INSTALL)
     748        $(MAKE) $(AM_MAKEFLAGS) install-data-hook
    765749
    766750install-exec-am: install-exec-local
     
    790774ps-am:
    791775
    792 uninstall-am: uninstall-addlibsDATA uninstall-info-am uninstall-local \
     776uninstall-am: uninstall-info-am uninstall-local \
    793777        uninstall-pkgconfiglibDATA
    794778
     
    802786        distclean-local distclean-recursive distclean-tags \
    803787        distcleancheck distdir distuninstallcheck dvi dvi-am html \
    804         html-am info info-am install install-addlibsDATA install-am \
    805         install-data install-data-am install-exec install-exec-am \
     788        html-am info info-am install install-am install-data \
     789        install-data-am install-data-hook install-exec install-exec-am \
    806790        install-exec-local install-info install-info-am install-man \
    807791        install-pkgconfiglibDATA install-strip installcheck \
     
    810794        mostlyclean mostlyclean-generic mostlyclean-libtool \
    811795        mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
    812         uninstall uninstall-addlibsDATA uninstall-am uninstall-info-am \
    813         uninstall-local uninstall-pkgconfiglibDATA
     796        uninstall uninstall-am uninstall-info-am uninstall-local \
     797        uninstall-pkgconfiglibDATA
    814798
    815799
     
    835819.PHONY: test unitTest
    836820
    837 @COIN_HAS_PKGCONFIG_TRUE@clp_addlibs.txt : clp.pc
    838 @COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=.:@COIN_PKG_CONFIG_PATH@ $(PKG_CONFIG) --libs clp > clp_addlibs.txt
     821@COIN_HAS_PKGCONFIG_TRUE@install-data-hook:
     822@COIN_HAS_PKGCONFIG_TRUE@       @$(mkdir_p) "$(addlibsdir)"
     823@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ PKG_CONFIG_DISABLE_UNINSTALLED= \
     824@COIN_HAS_PKGCONFIG_TRUE@       $(PKG_CONFIG) --libs clp > $(addlibsdir)/clp_addlibs.txt
    839825
    840826install-doc: $(DocFiles)
  • trunk/Clp/configure

    r1576 r1577  
    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 build build_cpu build_vendor build_os ADDLIBS PCADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion CLP_SVN_REV CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX MPICXX EGREP 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 CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_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 CPP CXXCPP F77 FFLAGS ac_ct_F77 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 COINUTILS_LIBS COINUTILS_CFLAGS COINUTILS_DATA REQUIREDPACKAGES COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE OSI_LIBS OSI_CFLAGS OSI_DATA COIN_HAS_OSI_TRUE COIN_HAS_OSI_FALSE OSITESTS_LIBS OSITESTS_CFLAGS OSITESTS_DATA COIN_HAS_OSITESTS_TRUE COIN_HAS_OSITESTS_FALSE SAMPLE_LIBS SAMPLE_CFLAGS SAMPLE_DATA COIN_HAS_SAMPLE_TRUE COIN_HAS_SAMPLE_FALSE NETLIB_LIBS NETLIB_CFLAGS NETLIB_DATA COIN_HAS_NETLIB_TRUE COIN_HAS_NETLIB_FALSE 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 build build_cpu build_vendor build_os ADDLIBS PCADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion CLP_SVN_REV CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX MPICXX EGREP 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 CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_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 CPP CXXCPP F77 FFLAGS ac_ct_F77 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 COINUTILS_LIBS COINUTILS_CFLAGS COINUTILS_DATA REQUIREDPACKAGES COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE OSI_LIBS OSI_CFLAGS OSI_DATA COIN_HAS_OSI_TRUE COIN_HAS_OSI_FALSE OSITESTS_LIBS OSITESTS_CFLAGS OSITESTS_DATA COIN_HAS_OSITESTS_TRUE COIN_HAS_OSITESTS_FALSE SAMPLE_LIBS SAMPLE_CFLAGS SAMPLE_DATA COIN_HAS_SAMPLE_TRUE COIN_HAS_SAMPLE_FALSE NETLIB_LIBS NETLIB_CFLAGS NETLIB_DATA COIN_HAS_NETLIB_TRUE COIN_HAS_NETLIB_FALSE LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    2063520635
    2063620636
    20637 # assemble search path for pkg-config
     20637# assemble pkg-config search path for installed projects
    2063820638COIN_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    2063920639
     
    2065820658fi;
    2065920659
     20660
     20661
     20662# assemble additional pkg-config search paths for uninstalled projects
    2066020663if test x$coin_projectdir = xyes ; then
    2066120664  # if we are in a project setup, then in a classic setup, we want to find uninstalled projects
     
    2066320666  # unfortunately, if the user set prefix, then we do not know where the project base directory is located
    2066420667  # 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)
     20668  COIN_PKG_CONFIG_PATH_UNINSTALLED=
    2066520669  if test -e ../coin_subdirs.txt ; then
    2066620670    for i in `cat ../coin_subdirs.txt` ; do
    2066720671      if test -d ../$i ; then
    20668         COIN_PKG_CONFIG_PATH="`cd ../$i; pwd`:${COIN_PKG_CONFIG_PATH}"
     20672        COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../$i; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
    2066920673      fi
    2067020674    done
     
    2067420678    for i in `cat ../../coin_subdirs.txt` ; do
    2067520679      if test -d ../../$i ; then
    20676         COIN_PKG_CONFIG_PATH="`cd ../../$i; pwd`:${COIN_PKG_CONFIG_PATH}"
     20680        COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../../$i; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
    2067720681      fi
    2067820682    done
    2067920683  fi
    2068020684
    20681 fi
    20682 
     20685
     20686fi
    2068320687
    2068420688
     
    2074120745    # need to export variable to be sure that the following pkg-config gets these values
    2074220746    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    20743     PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH"
     20747    PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH:$COIN_PKG_CONFIG_PATH_UNINSTALLED"
    2074420748    export PKG_CONFIG_PATH
    2074520749
     
    2078620790    # reset PKG_CONFIG_PATH variable
    2078720791    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
     20792    export PKG_CONFIG_PATH
    2078820793  else
    2078920794    #if 4th argument is given, try fallback - whereby we take the first word from coinutils = trunk as basename for the .pc file
     
    2111021115    # need to export variable to be sure that the following pkg-config gets these values
    2111121116    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    21112     PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH"
     21117    PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH:$COIN_PKG_CONFIG_PATH_UNINSTALLED"
    2111321118    export PKG_CONFIG_PATH
    2111421119
     
    2115521160    # reset PKG_CONFIG_PATH variable
    2115621161    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
     21162    export PKG_CONFIG_PATH
    2115721163  else
    2115821164    #if 4th argument is given, try fallback - whereby we take the first word from osi as basename for the .pc file
     
    2133721343    # need to export variable to be sure that the following pkg-config gets these values
    2133821344    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    21339     PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH"
     21345    PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH:$COIN_PKG_CONFIG_PATH_UNINSTALLED"
    2134021346    export PKG_CONFIG_PATH
    2134121347
     
    2138221388    # reset PKG_CONFIG_PATH variable
    2138321389    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
     21390    export PKG_CONFIG_PATH
    2138421391  else
    2138521392    #if 4th argument is given, try fallback - whereby we take the first word from osi-unittests as basename for the .pc file
     
    2156421571    # need to export variable to be sure that the following pkg-config gets these values
    2156521572    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    21566     PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH"
     21573    PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH:$COIN_PKG_CONFIG_PATH_UNINSTALLED"
    2156721574    export PKG_CONFIG_PATH
    2156821575
     
    2160921616    # reset PKG_CONFIG_PATH variable
    2161021617    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
     21618    export PKG_CONFIG_PATH
    2161121619  else
    2161221620    #if 4th argument is given, try fallback - whereby we take the first word from coindatasample as basename for the .pc file
     
    2179121799    # need to export variable to be sure that the following pkg-config gets these values
    2179221800    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    21793     PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH"
     21801    PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH:$COIN_PKG_CONFIG_PATH_UNINSTALLED"
    2179421802    export PKG_CONFIG_PATH
    2179521803
     
    2183621844    # reset PKG_CONFIG_PATH variable
    2183721845    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
     21846    export PKG_CONFIG_PATH
    2183821847  else
    2183921848    #if 4th argument is given, try fallback - whereby we take the first word from coindatanetlib as basename for the .pc file
     
    2338023389s,@COIN_HAS_PKGCONFIG_FALSE@,$COIN_HAS_PKGCONFIG_FALSE,;t t
    2338123390s,@COIN_PKG_CONFIG_PATH@,$COIN_PKG_CONFIG_PATH,;t t
     23391s,@COIN_PKG_CONFIG_PATH_UNINSTALLED@,$COIN_PKG_CONFIG_PATH_UNINSTALLED,;t t
    2338223392s,@COINUTILS_LIBS@,$COINUTILS_LIBS,;t t
    2338323393s,@COINUTILS_CFLAGS@,$COINUTILS_CFLAGS,;t t
  • trunk/Clp/src/Makefile.in

    r1574 r1577  
    166166COIN_HAS_SAMPLE_TRUE = @COIN_HAS_SAMPLE_TRUE@
    167167COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
     168COIN_PKG_CONFIG_PATH_UNINSTALLED = @COIN_PKG_CONFIG_PATH_UNINSTALLED@
    168169CPP = @CPP@
    169170CPPFLAGS = @CPPFLAGS@
  • trunk/Clp/src/OsiClp/Makefile.in

    r1573 r1577  
    134134COIN_HAS_SAMPLE_TRUE = @COIN_HAS_SAMPLE_TRUE@
    135135COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
     136COIN_PKG_CONFIG_PATH_UNINSTALLED = @COIN_PKG_CONFIG_PATH_UNINSTALLED@
    136137CPP = @CPP@
    137138CPPFLAGS = @CPPFLAGS@
  • trunk/Clp/test/Makefile.in

    r1575 r1577  
    122122COIN_HAS_SAMPLE_TRUE = @COIN_HAS_SAMPLE_TRUE@
    123123COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
     124COIN_PKG_CONFIG_PATH_UNINSTALLED = @COIN_PKG_CONFIG_PATH_UNINSTALLED@
    124125CPP = @CPP@
    125126CPPFLAGS = @CPPFLAGS@
Note: See TracChangeset for help on using the changeset viewer.