From e1f742a601c1c1c0535d796e7a7705990a9da891 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Mon, 12 Nov 2012 18:37:10 -0500 Subject: fix system boost Change-Id: Id80557cb47ab471a0f3a643a1c11a59e89c14c54 --- codemaker/Executable_cppumaker.mk | 2 +- codemaker/Executable_javamaker.mk | 2 +- codemaker/StaticLibrary_codemaker.mk | 2 +- codemaker/StaticLibrary_codemaker_cpp.mk | 6 +++--- codemaker/StaticLibrary_codemaker_java.mk | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) (limited to 'codemaker') diff --git a/codemaker/Executable_cppumaker.mk b/codemaker/Executable_cppumaker.mk index 074c539dad90..a508fd203371 100644 --- a/codemaker/Executable_cppumaker.mk +++ b/codemaker/Executable_cppumaker.mk @@ -26,7 +26,7 @@ $(eval $(call gb_Executable_Executable,cppumaker)) -$(eval $(call gb_Executable_use_unpacked,cppumaker,boost)) +$(eval $(call gb_Executable_use_external,cppumaker,boost_headers)) $(eval $(call gb_Executable_use_libraries,cppumaker,\ reg \ diff --git a/codemaker/Executable_javamaker.mk b/codemaker/Executable_javamaker.mk index 22d89fd18097..a79a76e43509 100644 --- a/codemaker/Executable_javamaker.mk +++ b/codemaker/Executable_javamaker.mk @@ -26,7 +26,7 @@ $(eval $(call gb_Executable_Executable,javamaker)) -$(eval $(call gb_Executable_use_unpacked,javamaker,boost)) +$(eval $(call gb_Executable_use_external,javamaker,boost_headers)) $(eval $(call gb_Executable_use_libraries,javamaker,\ reg \ diff --git a/codemaker/StaticLibrary_codemaker.mk b/codemaker/StaticLibrary_codemaker.mk index a3005185e943..510b2c569b41 100644 --- a/codemaker/StaticLibrary_codemaker.mk +++ b/codemaker/StaticLibrary_codemaker.mk @@ -27,7 +27,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,codemaker)) -$(eval $(call gb_StaticLibrary_use_unpacked,codemaker,boost)) +$(eval $(call gb_StaticLibrary_use_external,codemaker,boost_headers)) $(eval $(call gb_StaticLibrary_use_packages,codemaker,\ codemaker_inc \ diff --git a/codemaker/StaticLibrary_codemaker_cpp.mk b/codemaker/StaticLibrary_codemaker_cpp.mk index 627f731b9868..2ee9c4ecb4bd 100644 --- a/codemaker/StaticLibrary_codemaker_cpp.mk +++ b/codemaker/StaticLibrary_codemaker_cpp.mk @@ -27,11 +27,11 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,codemaker_cpp)) -$(eval $(call gb_StaticLibrary_use_unpacked,codemaker_cpp,boost)) +$(eval $(call gb_StaticLibrary_use_external,codemaker_cpp,boost_headers)) $(eval $(call gb_StaticLibrary_use_packages,codemaker_cpp,\ - codemaker_inc \ - registry_inc \ + codemaker_inc \ + registry_inc \ sal_generated \ sal_inc \ )) diff --git a/codemaker/StaticLibrary_codemaker_java.mk b/codemaker/StaticLibrary_codemaker_java.mk index b6eb705c9650..1bcdb2552a89 100644 --- a/codemaker/StaticLibrary_codemaker_java.mk +++ b/codemaker/StaticLibrary_codemaker_java.mk @@ -27,10 +27,10 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,codemaker_java)) -$(eval $(call gb_StaticLibrary_use_unpacked,codemaker_java,boost)) +$(eval $(call gb_StaticLibrary_use_external,codemaker_java,boost_headers)) $(eval $(call gb_StaticLibrary_use_packages,codemaker_java,\ - codemaker_inc \ + codemaker_inc \ registry_inc \ sal_generated \ sal_inc \ -- cgit v1.2.3