Changeset 1563 for trunk

Timestamp:

Jun 13, 2010 1:53:25 PM (11 years ago)

Author:

stefan

Message:

allow build against installed dependencies without presence of base directory: add build system scripts, adjust location of Makemain.inc - thanks to Lou for making this possible

Location:

trunk/Clp

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (3 diffs)
• config.guess (added)
• config.sub (added)
• depcomp (added)
• install-sh (added)
• ltmain.sh (added)
• missing (added)
• src/Makefile.in (modified) (1 diff)
• src/OsiClp/Makefile.in (modified) (1 diff)
• test/Makefile.in (modified) (1 diff)

trunk/Clp/Makefile.am

@@ -119 +119 @@
 DISTCLEANFILES =
 
-include ../BuildTools/Makemain.inc
+include BuildTools/Makemain.inc

trunk/Clp/Makefile.in

@@ -59 +59 @@
 @ALWAYS_FALSE@am__append_1 = test
 DIST_COMMON = README $(am__configure_deps) \
-        $(srcdir)/../BuildTools/Makemain.inc $(srcdir)/../config.guess \
-        $(srcdir)/../config.sub $(srcdir)/../install-sh \
-        $(srcdir)/../ltmain.sh $(srcdir)/../missing \
-        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-        $(srcdir)/clp-uninstalled.pc.in $(srcdir)/clp.pc.in \
-        $(top_srcdir)/configure $(top_srcdir)/examples/Makefile.in \
+        $(srcdir)/BuildTools/Makemain.inc $(srcdir)/Makefile.am \
+        $(srcdir)/Makefile.in $(srcdir)/clp-uninstalled.pc.in \
+        $(srcdir)/clp.pc.in $(top_srcdir)/configure \
+        $(top_srcdir)/examples/Makefile.in \
         $(top_srcdir)/inc/config_clp.h.in \
-        $(top_srcdir)/src/OsiClp/osi-clp-uninstalled.pc.in AUTHORS
+        $(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
@@ -333 +332 @@
 am--refresh:
         @:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../BuildTools/Makemain.inc $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/BuildTools/Makemain.inc $(am__configure_deps)
         @for dep in $?; do \
           case '$(am__configure_deps)' in \
@@ -569 +568 @@
         $(am__remove_distdir)
         mkdir $(distdir)
-        $(mkdir_p) $(distdir)/. $(distdir)/.. $(distdir)/../BuildTools $(distdir)/doc $(distdir)/doc/Howto $(distdir)/examples $(distdir)/inc $(distdir)/src/OsiClp
+        $(mkdir_p) $(distdir)/. $(distdir)/BuildTools $(distdir)/doc $(distdir)/doc/Howto $(distdir)/examples $(distdir)/inc $(distdir)/src/OsiClp
         @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
         topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \

trunk/Clp/src/Makefile.in

@@ -96 +96 @@
 clp_DEPENDENCIES = libClp.la $(am__DEPENDENCIES_1) \
         $(am__DEPENDENCIES_1)
-depcomp = $(SHELL) $(top_srcdir)/../depcomp
+depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \

trunk/Clp/src/OsiClp/Makefile.in

@@ -69 +69 @@
 am_libOsiClp_la_OBJECTS = OsiClpSolverInterface.lo
 libOsiClp_la_OBJECTS = $(am_libOsiClp_la_OBJECTS)
-depcomp = $(SHELL) $(top_srcdir)/../depcomp
+depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \

trunk/Clp/test/Makefile.in

@@ -69 +69 @@
 @COIN_HAS_OSITESTS_TRUE@        ../src/OsiClp/libOsiClp.la
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/inc
-depcomp = $(SHELL) $(top_srcdir)/../depcomp
+depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \