urelibs: do not merge purpenvhelper (unless mergelibs=all)

Change-Id: I147d05b91d46f05461f0548000c891f89486bcc7

urelibs: do not merge purpenvhelper (unless mergelibs=all)
Change-Id: I147d05b91d46f05461f0548000c891f89486bcc7
26ae620b · Matúš Kukan · e8520cb0 · 26ae620b
Kaydet (Commit) 26ae620b authored Nis 22, 2013 tarafından Matúš Kukan
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

pre_MergedLibsList.mk solenv/gbuild/extensions/pre_MergedLibsList.mk +4 -2

No files found.
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -187,7 +187,6 @@ gb_URELIBS := \
 	introspection \
 	$(if $(filter TRUE,$(SOLAR_JAVA)),jvmaccess) \
 	$(if $(filter TRUE,$(SOLAR_JAVA)),jvmfwk) \
-	purpenvhelper \
 	reflection \
 	reg \
 	sal \
@@ -195,7 +194,10 @@ gb_URELIBS := \
 	stocservices \
 	store \
 	unoidl \
-	xmlreader
+	xmlreader \
+	$(if $(filter ALL,$(MERGELIBS)), \
+		purpenvhelper \
+	)

 endif