From 9132003e48d4d0be818e368aa03533ce84547ae3 Mon Sep 17 00:00:00 2001 From: pmichaud Date: Fri, 27 Jul 2012 11:37:59 -0500 Subject: Break out separate 'wxs' and 'msi' Makefile targets. --- skel/tools/build/Makefile.in | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'skel') diff --git a/skel/tools/build/Makefile.in b/skel/tools/build/Makefile.in index 4af184f..84d7499 100644 --- a/skel/tools/build/Makefile.in +++ b/skel/tools/build/Makefile.in @@ -49,6 +49,7 @@ LINKARGS = $(LDFLAGS) $(LD_LOAD_FLAGS) $(LIBPARROT) @libs@ @icu_shared@ PERL6_EXE = perl6$(EXE) PERL6_LANG_DIR = $(PARROT_LIB_DIR)/languages/perl6 +STAR_WXS = $(STAR).wxs # This list must be kept in order, modules always coming after their # dependencies @@ -156,10 +157,14 @@ CRITIC_FILES=Configure.pl tools/build/ perlcritic: perlcritic -1 --profile tools/util/perlcritic.conf $(CRITIC_FILES) -msi: +$(STAR_WXS): $(PARROT_BIN_DIR) $(PREFIX_DIR) -$(CP) c:/strawberry/c/bin/libgcc_s_sjlj-1.dll $(PARROT_BIN_DIR) - cmd /c heat dir $(PREFIX_DIR) -gg -sfrag -template product -cg RakudoStar -out $(STAR).wxs - $(PERL) -ibak tools/build/wxs-patch.pl $(STAR).wxs - cmd /c candle $(STAR).wxs + cmd /c heat dir $(PREFIX_DIR) -gg -sfrag -template product -cg RakudoStar -out $(STAR_WXS) + $(PERL) -ibak tools/build/wxs-patch.pl $(STAR_WXS) + +wxs: $(STAR_WXS) + +msi: $(STAR_WXS) + cmd /c candle $(STAR_WXS) cmd /c light -b $(PREFIX_DIR) $(STAR).wixobj -- cgit v1.1