diff options
| author | Morgan Deters <mdeters@gmail.com> | 2010-04-08 20:49:11 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2010-04-08 20:49:11 +0000 |
| commit | c3a6ff8c6e4a0c743cd33eb29931f837eeb2959e (patch) | |
| tree | df8d8a97baebea55aaf94cc816974a86475c3a4b /Makefile.builds.in | |
| parent | de2b6c4ee9c2ecad88bddd0a60f10e94d6f8c71f (diff) | |
A handful of build system fixes:
* (test/unit/Makefile.am) libtool was being passed relative paths of
sources in .cpp, confusing lcov if -b wasn't given. Fixed.
Closes bug #102.
* (configure.ac) --enable-coverage now implies --enable-static
--enable-static-binary --disable-shared.
* (configure.ac) Create top-level config.status for informational and
re-configuration purposes.
* (configure.ac) Remove -fvisibility=hidden for debug builds.
Closes bug #104.
* (test/unit/Makefile.am) Build unit tests with -Wall.
* (various unit tests) Fixed trivially-fixable warnings in building
unit tests. (Signedness in comparison, unused variables, etc.)
* (Makefile.builds.in) Copy the binary correctly if it is static.
(It was failing, but only with --enable-static --enable-shared
--enable-static-binary.) Closes bug #103.
* (src/parser/Makefile.am) libcvc4parser.so now links with libcvc4.so.
* Other minor cleanups to the build system.
Diffstat (limited to 'Makefile.builds.in')
| -rw-r--r-- | Makefile.builds.in | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Makefile.builds.in b/Makefile.builds.in index 1cf9c1a52..9dd9a314a 100644 --- a/Makefile.builds.in +++ b/Makefile.builds.in @@ -30,10 +30,11 @@ bindir = @bindir@ libdir = @libdir@ abs_builddir = @abs_builddir@ -# Are we building static/dynamic libraries? One or the other can be +# Are we building static/dynamic libraries/binaries? One or the other can be # on, or both. BUILDING_STATIC = @BUILDING_STATIC@ BUILDING_SHARED = @BUILDING_SHARED@ +STATIC_BINARY = @STATIC_BINARY@ .PHONY: _default_build_ all _default_build_: all @@ -51,8 +52,8 @@ all: $(CURRENT_BUILD)/libtool --mode=install install -v \ $(CURRENT_BUILD)/src/parser/libcvc4parser.la \ "$(abs_builddir)$(libdir)" -ifeq ($(BUILDING_SHARED),1) -# if we're building shared libs, relink +ifeq ($(BUILDING_SHARED)$(STATIC_BINARY),10) +# if we're building shared libs and the binary is not static, relink thelibdir="$(abs_builddir)$(libdir)"; \ progdir="$(abs_builddir)$(bindir)"; file=cvc4; \ eval `grep '^relink_command=' $(CURRENT_BUILD)/src/main/cvc4 | sed 's:-Wl,-rpath:-Wl,-rpath -Wl,\\\\$$thelibdir -Wl,-rpath:'`; \ @@ -72,8 +73,8 @@ endif $(CURRENT_BUILD)/libtool --mode=install install -v $(CURRENT_BUILD)/src/libcvc4.la "`pwd`$(libdir)" # install libcvc4parser $(CURRENT_BUILD)/libtool --mode=install install -v $(CURRENT_BUILD)/src/parser/libcvc4parser.la "`pwd`$(libdir)" -ifeq ($(BUILDING_SHARED),1) -# if we're building shared libs, relink +ifeq ($(BUILDING_SHARED)$(STATIC_BINARY),10) +# if we're building shared libs and the binary is not static, relink thelibdir="`pwd`$(libdir)"; progdir="`pwd`$(bindir)"; file=cvc4; \ eval `grep '^relink_command=' $(CURRENT_BUILD)/src/main/cvc4 | sed 's:-Wl,-rpath:-Wl,-rpath -Wl,\\\\$$thelibdir -Wl,-rpath:'`; \ eval "(cd $(CURRENT_BUILD)/src/main && $$relink_command)" |