diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-09 02:30:30 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-09 15:32:31 +0200 |
| commit | 47832f6b488917d803d1c4e4c53594ae35094e43 (patch) | |
| tree | 79670c974f2bc226d30b7c73a7646cd9ef7be178 | |
| parent | b91f836091c2d1b5c9f6ff8a9fe2bd4da5176191 (diff) | |
Revert "add javavm and jvmfwk to Library_merged"
This reverts commit 77169b9ceccfedeadef272f701425430cf1c719d.
Conflicts:
Library_merged.mk
Change-Id: Id7c42457127a622cf71910bafc97f69db545243f
| -rw-r--r-- | Library_merged.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/Library.mk | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index 5b501d5f4a6c..e633b0df253c 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Library_use_libraries,merged,\ cppu \ cppuhelper \ i18nlangtag \ + jvmfwk \ sal \ salhelper \ tl \ diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 7f6231580264..a6d15a6f42fc 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -123,11 +123,8 @@ $(call gb_ComponentTarget_ComponentTarget,$(2),\ $(call gb_Library_get_runtime_filename,$(gb_Library__get_name))) $(call gb_Library__get_final_target,$(gb_Library__get_name)) : \ $(call gb_ComponentTarget_get_outdir_target,$(2)) -# prevent circular deps: Library_merged -> localedata -> saxparser -> services.rdb -> javavm.component -ifneq ($(gb_Library__get_name),merged) $(call gb_ComponentTarget_get_target,$(2)) :| \ $(call gb_Library_get_target,$(gb_Library__get_name)) -endif $(call gb_Library_get_clean_target,$(gb_Library__get_name)) : \ $(call gb_ComponentTarget_get_clean_target,$(2)) endef |