mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "fdo#51115: gb_Extension_add_file: fix Windows build:"

Browse Source 
This actually should no longer be necessary since AUXTARGETS were fixed
in 85b6a93cf41fb05e726027e34fcd805330e20414.

This reverts commit e818f8fa1f79c2eb2d647678333b8d12599dda69.
This commit is contained in:
Michael Stahl 2013-09-18 15:53:04 +02:00
parent b4e37acb2b
commit 30fe6781ea
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
solenv/gbuild/Extension.mk
View File

@ -137,16 +137,13 @@ endef
# adding a file creates a dependency to it
# file is copied to $(WORKDIR)
# $(3) is the target of the copied file, and $(4) can be used to override that
# with a different actual file, which is needed in gb_Extension_add_library
# to make it work on Windows where the DLL doesn't have a gbuild target...
define gb_Extension_add_file
$(call gb_Extension_get_target,$(1)) : FILES += $(2)
$(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_rootdir,$(1))/$(2)
$(3) :| $(call gb_Extension__get_preparation_target,$(1))
$(call gb_Extension_get_rootdir,$(1))/$(2) : $(3)
mkdir -p $$(dir $$@) && \
cp -f $(if $(4),$(4),$(3)) $$@
cp -f $(3) $$@
endef
@ -164,7 +161,6 @@ endef
# add a library from the solver; DO NOT use gb_Library_get_target
define gb_Extension_add_library
$(call gb_Extension_add_file,$(1),$(call gb_Library_get_runtime_filename,$(2)),\
$(call gb_Library_get_target,$(2)),\
$(gb_Helper_OUTDIRLIBDIR)/$(call gb_Library_get_runtime_filename,$(2)))
endef
@ -177,7 +173,6 @@ endef
# add an executable from the solver
define gb_Extension_add_executable
$(call gb_Extension_add_file,$(1),$(notdir $(call gb_Executable_get_target,$(2))),\
$(call gb_Executable_get_target,$(2)),\
$(call gb_Executable_get_target,$(2)))
endef