From 7ac042aaa117dd702c682cf9ef3b90374b384f37 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 22 Apr 2010 12:51:13 +0200 Subject: Update boost import stub --- build/import/libboost/serialization/rules.make | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'build/import/libboost/serialization/rules.make') diff --git a/build/import/libboost/serialization/rules.make b/build/import/libboost/serialization/rules.make index 8d6f879..eab97ff 100644 --- a/build/import/libboost/serialization/rules.make +++ b/build/import/libboost/serialization/rules.make @@ -1,6 +1,6 @@ # file : build/import/libboost/serialization/rules.make # author : Boris Kolpackov -# copyright : Copyright (c) 2005-2008 Boris Kolpackov +# copyright : Copyright (c) 2005-2010 Boris Kolpackov # license : GNU GPL v2; see accompanying LICENSE file $(dcf_root)/import/libboost/%: root := $(libboost_root) @@ -10,15 +10,27 @@ $(dcf_root)/import/libboost/serialization/serialization.l: \ ifeq ($(libboost_type),archive) +ifeq ($(libboost_system),y) +$(dcf_root)/import/libboost/serialization/serialization.l: \ + $(libboost_root)/stage/lib/libboost_serialization$(libboost_suffix).a \ + $(libboost_root)/stage/lib/libboost_system$(libboost_suffix).a +else $(dcf_root)/import/libboost/serialization/serialization.l: \ $(libboost_root)/stage/lib/libboost_serialization$(libboost_suffix).a - @echo $< >$@ +endif + @echo $^ >$@ else +ifeq ($(libboost_system),y) +$(dcf_root)/import/libboost/serialization/serialization.l: \ + $(libboost_root)/stage/lib/libboost_serialization$(libboost_suffix).so \ + $(libboost_root)/stage/lib/libboost_system$(libboost_suffix).so +else $(dcf_root)/import/libboost/serialization/serialization.l: \ $(libboost_root)/stage/lib/libboost_serialization$(libboost_suffix).so - @echo $< >$@ +endif + @echo $^ >$@ @echo rpath:$(root)/stage/lib >>$@ endif -- cgit v1.1