diff options
| author | David Tardon <dtardon@redhat.com> | 2013-04-22 07:26:47 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-04-22 07:26:47 +0200 |
| commit | 02aee3b818e5e22a038043def91dea74ee4d00c6 (patch) | |
| tree | b50954ebdc5bbb3d6d0c3bb64e2fa8fc8ab6f5ad /jurt | |
| parent | 6e205903f044186392a9aca24203148167552159 (diff) | |
update makefiles
Change-Id: Id0d02f11a81f32a1ec446f7a44ec995e1788e7dd
Diffstat (limited to 'jurt')
| -rw-r--r-- | jurt/CustomTarget_jnilib.mk | 9 | ||||
| -rw-r--r-- | jurt/Package_jnilib.mk | 6 |
2 files changed, 6 insertions, 9 deletions
diff --git a/jurt/CustomTarget_jnilib.mk b/jurt/CustomTarget_jnilib.mk index a74cad4bb785..6364fcbb8ba0 100644 --- a/jurt/CustomTarget_jnilib.mk +++ b/jurt/CustomTarget_jnilib.mk @@ -27,12 +27,11 @@ $(eval $(call gb_CustomTarget_CustomTarget,jurt/util)) -$(call gb_CustomTarget_get_target,jurt/util) : \ - $(call gb_CustomTarget_get_workdir,jurt/util)/libjpipe.jnilib +$(eval $(call gb_CustomTarget_register_targets,jurt/util,\ + libjpipe.jnilib \ +)) -$(call gb_CustomTarget_get_workdir,jurt/util)/libjpipe.jnilib : \ - $(call gb_Library_get_target,jpipe) \ - | $(call gb_CustomTarget_get_workdir,jurt/util)/.dir +$(call gb_CustomTarget_get_workdir,jurt/util)/libjpipe.jnilib : $(call gb_Library_get_target,jpipe) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MCB,1) cd $(dir $@) && $(SOLARENV)/bin/macosx-create-bundle $< diff --git a/jurt/Package_jnilib.mk b/jurt/Package_jnilib.mk index bb713d1218fd..2d331059c917 100644 --- a/jurt/Package_jnilib.mk +++ b/jurt/Package_jnilib.mk @@ -25,10 +25,8 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_Package_Package,jurt_jnilib,$(WORKDIR)/CustomTarget/jurt/util)) +$(eval $(call gb_Package_Package,jurt_jnilib,$(call gb_CustomTarget_get_workdir,jurt/util))) -$(eval $(call gb_Package_add_files,jurt_jnilib,lib,\ - $(patsubst %.dylib,%.jnilib,$(call gb_Library_get_filename,jpipe)) \ -)) +$(eval $(call gb_Package_add_files,jurt_jnilib,lib/$(patsubst %.dylib,%.jnilib,$(call gb_Library_get_filename,jpipe)),libjpipe.jnilib)) # vim:set noet sw=4 ts=4: |