Changeset 1632 for ThirdParty/ASL/trunk


Ignore:
Timestamp:
Jul 22, 2010 6:01:02 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/ASL/trunk
Files:
3 edited

Legend:

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

    r1565 r1632  
    4040thirdpartylib_DATA = $(libampl)
    4141
    42 if COIN_HAS_PKGCONFIG
    43 addlibsdir = $(datadir)/coin/doc/ThirdParty/ASL
    44 addlibs_DATA = asl_addlibs.txt
    45 
    46 asl_addlibs.txt : coinasl.pc
    47         PKG_CONFIG_PATH=.:@COIN_PKG_CONFIG_PATH@ $(PKG_CONFIG) --libs coinasl > asl_addlibs.txt
    48 endif
    49 
    5042pkgconfiglibdir = $(libdir)/pkgconfig
    5143pkgconfiglib_DATA = coinasl.pc
     44
     45if COIN_HAS_PKGCONFIG
     46addlibsdir = $(DESTDIR)$(datadir)/coin/doc/ThirdParty/ASL
     47       
     48install-data-hook:
     49        @$(mkdir_p) "$(addlibsdir)"
     50        PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ PKG_CONFIG_DISABLE_UNINSTALLED= \
     51        $(PKG_CONFIG) --libs coinasl > $(addlibsdir)/asl_addlibs.txt
     52endif
    5253
    5354CLEANFILES = $(libampl) stdio1.h arith.h funcadd0.$(OBJEXT) asl_addlibs.txt
  • ThirdParty/ASL/trunk/Makefile.in

    r1615 r1632  
    7979  esac;
    8080am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    81 am__installdirs = "$(DESTDIR)$(addlibsdir)" \
    82         "$(DESTDIR)$(pkgconfiglibdir)" "$(DESTDIR)$(thirdpartylibdir)" \
     81am__installdirs = "$(DESTDIR)$(pkgconfiglibdir)" \
     82        "$(DESTDIR)$(thirdpartylibdir)" \
    8383        "$(DESTDIR)$(thirdpartyincludedir)"
    84 addlibsDATA_INSTALL = $(INSTALL_DATA)
    8584pkgconfiglibDATA_INSTALL = $(INSTALL_DATA)
    8685thirdpartylibDATA_INSTALL = $(INSTALL_DATA)
    87 DATA = $(addlibs_DATA) $(pkgconfiglib_DATA) $(thirdpartylib_DATA)
     86DATA = $(pkgconfiglib_DATA) $(thirdpartylib_DATA)
    8887thirdpartyincludeHEADERS_INSTALL = $(INSTALL_HEADER)
    8988HEADERS = $(thirdpartyinclude_HEADERS)
     
    129128COIN_HAS_PKGCONFIG_TRUE = @COIN_HAS_PKGCONFIG_TRUE@
    130129COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
     130COIN_PKG_CONFIG_PATH_UNINSTALLED = @COIN_PKG_CONFIG_PATH_UNINSTALLED@
    131131CPP = @CPP@
    132132CPPFLAGS = @CPPFLAGS@
     
    260260thirdpartylibdir = $(libdir)/coin/ThirdParty
    261261thirdpartylib_DATA = $(libampl)
    262 @COIN_HAS_PKGCONFIG_TRUE@addlibsdir = $(datadir)/coin/doc/ThirdParty/ASL
    263 @COIN_HAS_PKGCONFIG_TRUE@addlibs_DATA = asl_addlibs.txt
    264262pkgconfiglibdir = $(libdir)/pkgconfig
    265263pkgconfiglib_DATA = coinasl.pc
     264@COIN_HAS_PKGCONFIG_TRUE@addlibsdir = $(DESTDIR)$(datadir)/coin/doc/ThirdParty/ASL
    266265CLEANFILES = $(libampl) stdio1.h arith.h funcadd0.$(OBJEXT) asl_addlibs.txt
    267266
     
    328327        -rm -f libtool
    329328uninstall-info-am:
    330 install-addlibsDATA: $(addlibs_DATA)
    331         @$(NORMAL_INSTALL)
    332         test -z "$(addlibsdir)" || $(mkdir_p) "$(DESTDIR)$(addlibsdir)"
    333         @list='$(addlibs_DATA)'; for p in $$list; do \
    334           if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
    335           f=$(am__strip_dir) \
    336           echo " $(addlibsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(addlibsdir)/$$f'"; \
    337           $(addlibsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(addlibsdir)/$$f"; \
    338         done
    339 
    340 uninstall-addlibsDATA:
    341         @$(NORMAL_UNINSTALL)
    342         @list='$(addlibs_DATA)'; for p in $$list; do \
    343           f=$(am__strip_dir) \
    344           echo " rm -f '$(DESTDIR)$(addlibsdir)/$$f'"; \
    345           rm -f "$(DESTDIR)$(addlibsdir)/$$f"; \
    346         done
    347329install-pkgconfiglibDATA: $(pkgconfiglib_DATA)
    348330        @$(NORMAL_INSTALL)
     
    576558all-am: Makefile $(DATA) $(HEADERS) all-local
    577559installdirs:
    578         for dir in "$(DESTDIR)$(addlibsdir)" "$(DESTDIR)$(pkgconfiglibdir)" "$(DESTDIR)$(thirdpartylibdir)" "$(DESTDIR)$(thirdpartyincludedir)"; do \
     560        for dir in "$(DESTDIR)$(pkgconfiglibdir)" "$(DESTDIR)$(thirdpartylibdir)" "$(DESTDIR)$(thirdpartyincludedir)"; do \
    579561          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    580562        done
     
    605587        @echo "This command is intended for maintainers to use"
    606588        @echo "it deletes files that may require special tools to rebuild."
     589@COIN_HAS_PKGCONFIG_FALSE@install-data-hook:
    607590clean: clean-am
    608591
     
    625608info-am:
    626609
    627 install-data-am: install-addlibsDATA install-pkgconfiglibDATA \
     610install-data-am: install-pkgconfiglibDATA \
    628611        install-thirdpartyincludeHEADERS install-thirdpartylibDATA
     612        @$(NORMAL_INSTALL)
     613        $(MAKE) $(AM_MAKEFLAGS) install-data-hook
    629614
    630615install-exec-am:
     
    654639ps-am:
    655640
    656 uninstall-am: uninstall-addlibsDATA uninstall-info-am \
    657         uninstall-pkgconfiglibDATA uninstall-thirdpartyincludeHEADERS \
    658         uninstall-thirdpartylibDATA
     641uninstall-am: uninstall-info-am uninstall-pkgconfiglibDATA \
     642        uninstall-thirdpartyincludeHEADERS uninstall-thirdpartylibDATA
    659643
    660644.PHONY: CTAGS GTAGS all all-am all-local am--refresh check check-am \
     
    663647        distclean distclean-generic distclean-libtool distclean-tags \
    664648        distcleancheck distdir distuninstallcheck dvi dvi-am html \
    665         html-am info info-am install install-addlibsDATA install-am \
    666         install-data install-data-am install-exec install-exec-am \
     649        html-am info info-am install install-am install-data \
     650        install-data-am install-data-hook install-exec install-exec-am \
    667651        install-info install-info-am install-man \
    668652        install-pkgconfiglibDATA install-strip \
     
    671655        maintainer-clean-generic mostlyclean mostlyclean-generic \
    672656        mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
    673         uninstall-addlibsDATA uninstall-am uninstall-info-am \
    674         uninstall-pkgconfiglibDATA uninstall-thirdpartyincludeHEADERS \
    675         uninstall-thirdpartylibDATA
     657        uninstall-am uninstall-info-am uninstall-pkgconfiglibDATA \
     658        uninstall-thirdpartyincludeHEADERS uninstall-thirdpartylibDATA
    676659
    677660
     
    685668stdio1.h arith.h funcadd0.$(OBJEXT): $(libampl)
    686669
    687 @COIN_HAS_PKGCONFIG_TRUE@asl_addlibs.txt : coinasl.pc
    688 @COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=.:@COIN_PKG_CONFIG_PATH@ $(PKG_CONFIG) --libs coinasl > asl_addlibs.txt
     670@COIN_HAS_PKGCONFIG_TRUE@install-data-hook:
     671@COIN_HAS_PKGCONFIG_TRUE@       @$(mkdir_p) "$(addlibsdir)"
     672@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ PKG_CONFIG_DISABLE_UNINSTALLED= \
     673@COIN_HAS_PKGCONFIG_TRUE@       $(PKG_CONFIG) --libs coinasl > $(addlibsdir)/asl_addlibs.txt
    689674
    690675install-doc: $(DocFiles)
  • ThirdParty/ASL/trunk/configure

    r1624 r1632  
    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 ASL_SVN_REV EGREP LN_S CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC 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 ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE 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 AMPLSOLVER_A ABSPATH_AMPLSOLVER_INSTALLED ABSPATH_AMPLSOLVER_UNINSTALLED ASLMAKEFLAGS MSVC_COMPILE_TRUE MSVC_COMPILE_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 ASL_SVN_REV EGREP LN_S CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC 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 ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE 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 AMPLSOLVER_A ABSPATH_AMPLSOLVER_INSTALLED ABSPATH_AMPLSOLVER_UNINSTALLED ASLMAKEFLAGS MSVC_COMPILE_TRUE MSVC_COMPILE_FALSE LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    2002920029
    2003020030
    20031 # assemble search path for pkg-config
     20031# assemble pkg-config search path for installed projects
    2003220032COIN_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    2003320033
     
    2005220052fi;
    2005320053
     20054
     20055
     20056# assemble additional pkg-config search paths for uninstalled projects
    2005420057if test x$coin_projectdir = xyes ; then
    2005520058  # if we are in a project setup, then in a classic setup, we want to find uninstalled projects
     
    2005720060  # unfortunately, if the user set prefix, then we do not know where the project base directory is located
    2005820061  # 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)
     20062  COIN_PKG_CONFIG_PATH_UNINSTALLED=
    2005920063  if test -e ../coin_subdirs.txt ; then
    2006020064    for i in `cat ../coin_subdirs.txt` ; do
    2006120065      if test -d ../$i ; then
    20062         COIN_PKG_CONFIG_PATH="`cd ../$i; pwd`:${COIN_PKG_CONFIG_PATH}"
     20066        COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../$i; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
    2006320067      fi
    2006420068    done
     
    2006820072    for i in `cat ../../coin_subdirs.txt` ; do
    2006920073      if test -d ../../$i ; then
    20070         COIN_PKG_CONFIG_PATH="`cd ../../$i; pwd`:${COIN_PKG_CONFIG_PATH}"
     20074        COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../../$i; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
    2007120075      fi
    2007220076    done
    2007320077  fi
    2007420078
    20075 fi
    20076 
     20079
     20080fi
    2007720081
    2007820082
     
    2121321217s,@COIN_HAS_PKGCONFIG_FALSE@,$COIN_HAS_PKGCONFIG_FALSE,;t t
    2121421218s,@COIN_PKG_CONFIG_PATH@,$COIN_PKG_CONFIG_PATH,;t t
     21219s,@COIN_PKG_CONFIG_PATH_UNINSTALLED@,$COIN_PKG_CONFIG_PATH_UNINSTALLED,;t t
    2121521220s,@AMPLSOLVER_A@,$AMPLSOLVER_A,;t t
    2121621221s,@ABSPATH_AMPLSOLVER_INSTALLED@,$ABSPATH_AMPLSOLVER_INSTALLED,;t t
Note: See TracChangeset for help on using the changeset viewer.