Changeset 1636 for trunk/Clp/Makefile.in

Timestamp:

Nov 28, 2010 9:48:00 AM (9 years ago)

Author:

stefan

Message:

install also osi-clp.pc file in main directory (will be needed soon); rerun autotools

File:

• trunk/Clp/Makefile.in (modified) (7 diffs)

trunk/Clp/Makefile.in

@@ -58 +58 @@
 # included in the tarball
 @ALWAYS_FALSE@am__append_1 = test
+@COIN_HAS_OSI_TRUE@am__append_2 = osi-clp.pc
 DIST_COMMON = README $(am__configure_deps) \
         $(srcdir)/BuildTools/Makemain.inc $(srcdir)/Makefile.am \
@@ -65 +66 @@
         $(top_srcdir)/examples/Makefile.in \
         $(top_srcdir)/inc/config_clp.h.in \
-        $(top_srcdir)/src/OsiClp/osi-clp-uninstalled.pc.in AUTHORS \
-        config.guess config.sub depcomp install-sh ltmain.sh missing
-@HAVE_EXTERNALS_TRUE@am__append_2 = Externals
-@HAVE_EXTERNALS_TRUE@am__append_3 = .Externals-stamp
+        $(top_srcdir)/src/OsiClp/osi-clp-uninstalled.pc.in \
+        $(top_srcdir)/src/OsiClp/osi-clp.pc.in AUTHORS config.guess \
+        config.sub depcomp install-sh ltmain.sh missing
+@HAVE_EXTERNALS_TRUE@am__append_3 = Externals
+@HAVE_EXTERNALS_TRUE@am__append_4 = .Externals-stamp
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -80 +82 @@
 CONFIG_HEADER = $(top_builddir)/inc/config_clp.h
 CONFIG_CLEAN_FILES = examples/Makefile clp.pc clp-uninstalled.pc \
-        osi-clp-uninstalled.pc doxydoc/doxygen.conf
+        osi-clp.pc osi-clp-uninstalled.pc doxydoc/doxygen.conf
 SOURCES =
 DIST_SOURCES =
@@ -322 +324 @@
         examples/testBasis.cpp examples/testGub2.cpp \
         examples/testGub.cpp examples/testQP.cpp \
-        examples/useVolume.cpp $(am__append_2)
+        examples/useVolume.cpp $(am__append_3)
 
 ########################################################################
@@ -328 +330 @@
 ########################################################################
 pkgconfiglibdir = $(libdir)/pkgconfig
-pkgconfiglib_DATA = clp.pc
+pkgconfiglib_DATA = clp.pc $(am__append_2)
 @COIN_HAS_PKGCONFIG_TRUE@addlibsdir = $(DESTDIR)$(datadir)/coin/doc/Clp
 
@@ -337 +339 @@
 
 # Files that are generated and should be cleaned with make distclean
-DISTCLEANFILES = $(am__append_3) $(VPATH_DISTCLEANFILES)
+DISTCLEANFILES = $(am__append_4) $(VPATH_DISTCLEANFILES)
 DocFiles = README AUTHORS LICENSE
 DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME)
@@ -398 +400 @@
         cd $(top_builddir) && $(SHELL) ./config.status $@
 clp-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/clp-uninstalled.pc.in
+        cd $(top_builddir) && $(SHELL) ./config.status $@
+osi-clp.pc: $(top_builddir)/config.status $(top_srcdir)/src/OsiClp/osi-clp.pc.in
         cd $(top_builddir) && $(SHELL) ./config.status $@
 osi-clp-uninstalled.pc: $(top_builddir)/config.status $(top_srcdir)/src/OsiClp/osi-clp-uninstalled.pc.in