diff options
Diffstat (limited to 'external')
-rw-r--r-- | external/CustomTarget_jawt.mk | 11 | ||||
-rw-r--r-- | external/CustomTarget_wine.mk | 3 |
2 files changed, 7 insertions, 7 deletions
diff --git a/external/CustomTarget_jawt.mk b/external/CustomTarget_jawt.mk index 72b9cc5c4c26..68663f7171ec 100644 --- a/external/CustomTarget_jawt.mk +++ b/external/CustomTarget_jawt.mk @@ -9,16 +9,17 @@ $(eval $(call gb_CustomTarget_CustomTarget,external/jawt)) -$(eval $(call gb_CustomTarget_register_target,external/jawt,libjawt.dll.a)) +$(eval $(call gb_CustomTarget_register_targets,external/jawt,\ + jawt.def \ + libjawt.dll.a \ +)) -$(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def:| \ - $(call gb_CustomTarget_get_workdir,external/jawt)/.dir +$(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def: $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) echo EXPORTS > $@ echo "JAWT_GetAWT@8" >> $@ -$(call gb_CustomTarget_get_target,external/jawt)/libjawt.dll.a: \ - $(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def +$(call gb_CustomTarget_get_target,external/jawt)/libjawt.dll.a: $(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DLT,1) $(DLLTOOL) --input-def=$< --output-lib=$@ --dllname=jawt.dll diff --git a/external/CustomTarget_wine.mk b/external/CustomTarget_wine.mk index 7796e8c8bce5..bd30381df1b6 100644 --- a/external/CustomTarget_wine.mk +++ b/external/CustomTarget_wine.mk @@ -15,8 +15,7 @@ $(eval $(call gb_CustomTarget_register_targets,external/wine,\ liburlmod.dll.a \ )) -$(call gb_CustomTarget_get_target,external/wine)/lib%.dll.a: $(call gb_CustomTarget_get_workdir,external/wine)/%.def | \ - $(call gb_CustomTarget_get_workdir,external/wine)/.dir +$(call gb_CustomTarget_get_target,external/wine)/lib%.dll.a: $(call gb_CustomTarget_get_workdir,external/wine)/%.def $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DLT,1) $(DLLTOOL) --kill-at --input-def=$< --output-lib=$@ --dllname=$*.dll |