diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2012-04-07 08:40:35 +0200 |
---|---|---|
committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-04-09 21:04:39 +0200 |
commit | 0a45deba2be4a77db7540bd050b25bd6c26d7513 (patch) | |
tree | 828e305e131e24bddfe0d9c8a41c7a02a8a300b2 /jurt | |
parent | 7b743c9628d9479ee3fe2650a43eee5a9a02b8a4 (diff) |
enforce only one possible use of gb_CustomTarget
This brings two changes:
- no more recursive calling of make
- gbuild_simple is now not used => removed
Diffstat (limited to 'jurt')
-rw-r--r-- | jurt/CustomTarget_jnilib.mk | 2 | ||||
-rw-r--r-- | jurt/CustomTarget_test_urp.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/jurt/CustomTarget_jnilib.mk b/jurt/CustomTarget_jnilib.mk index 71d90f67b987..5badfc286dc0 100644 --- a/jurt/CustomTarget_jnilib.mk +++ b/jurt/CustomTarget_jnilib.mk @@ -25,7 +25,7 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_CustomTarget_CustomTarget,jurt/util,new_style)) +$(eval $(call gb_CustomTarget_CustomTarget,jurt/util)) JUJL := $(call gb_CustomTarget_get_workdir,jurt/util) diff --git a/jurt/CustomTarget_test_urp.mk b/jurt/CustomTarget_test_urp.mk index 73f6faddeeec..f5c2f6b977fb 100644 --- a/jurt/CustomTarget_test_urp.mk +++ b/jurt/CustomTarget_test_urp.mk @@ -25,7 +25,7 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_CustomTarget_CustomTarget,jurt/test/com/sun/star/lib/uno/protocols/urp,new_style)) +$(eval $(call gb_CustomTarget_CustomTarget,jurt/test/com/sun/star/lib/uno/protocols/urp)) JUTU := $(call gb_CustomTarget_get_workdir,jurt/test/com/sun/star/lib/uno/protocols/urp) |