[Libreoffice-commits] core.git: shell/CustomTarget_shlxthdl_res.mk

David Tardon dtardon at redhat.com
Wed Feb 13 02:06:59 PST 2013


 shell/CustomTarget_shlxthdl_res.mk |   16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

New commits:
commit 3696f90a559293c94d42e07c8084c728b5f296e6
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Feb 13 11:06:36 2013 +0100

    simplify makefile
    
    Change-Id: Id40bdd821308b18a49630c15b1e28c004d7311ed

diff --git a/shell/CustomTarget_shlxthdl_res.mk b/shell/CustomTarget_shlxthdl_res.mk
index 2885176..1e0e12b 100644
--- a/shell/CustomTarget_shlxthdl_res.mk
+++ b/shell/CustomTarget_shlxthdl_res.mk
@@ -32,18 +32,12 @@ $(eval $(call gb_CustomTarget_register_targets,shell/source/win32/shlxthandler/r
 	shlxthdl_impl.rc \
 ))
 
-$(call gb_CustomTarget_get_target,shell/source/win32/shlxthandler/res) : \
-	$(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc
-
 $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc : \
-	$(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl.ulf \
-	$(SRCDIR)/shell/source/win32/shlxthandler/res/rcfooter.txt \
-	$(SRCDIR)/shell/source/win32/shlxthandler/res/rcheader.txt \
-	$(SRCDIR)/shell/source/win32/shlxthandler/res/rctmpl.txt \
-	$(call gb_Executable_get_runtime_dependencies,lngconvex) \
-	| $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/.dir
-
-$(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc :
+		$(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl.ulf \
+		$(SRCDIR)/shell/source/win32/shlxthandler/res/rcfooter.txt \
+		$(SRCDIR)/shell/source/win32/shlxthandler/res/rcheader.txt \
+		$(SRCDIR)/shell/source/win32/shlxthandler/res/rctmpl.txt \
+		$(call gb_Executable_get_runtime_dependencies,lngconvex)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),LCX,1)
 	$(call gb_Helper_abbreviate_dirs,\
 		cd $(SRCDIR)/shell/source/win32/shlxthandler/res && \


More information about the Libreoffice-commits mailing list