Changeset 427 for trunk/Makefile.kmk


Ignore:
Timestamp:
Apr 21, 2010, 7:31:04 PM (12 years ago)
Author:
dmik
Message:

Fixed failed WPI and ZIP creation in a clean source tree by introducing more clean INSTALLS targets for them.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile.kmk

    r424 r427  
    3434# (to avoid extra INSTALLS targets during regular non-packing kmk invocations)
    3535#
    36 PACKING         += do_packing
     36PACKING          = do_packing
    3737
    3838do_packing:
     
    4747# Real packing rules
    4848#
    49 INSTALLS        += Lucide_wpi_1 Lucide_wpi_2 Lucide_wpi_3 Lucide_wpi_4 Lucide_zip
    50 PACKING         += $(LUCIDE_WPI) $(LUCIDE_ZIP)
     49INSTALLS         = Lucide_wpi_1 Lucide_wpi_2 Lucide_wpi_3 Lucide_wpi_4 Lucide_zip
     50PACKING          = $(LUCIDE_WPI) $(LUCIDE_ZIP)
     51
     52#
     53# WPI
     54#
    5155
    5256Lucide_wpi_1_INST                = $(notdir $(PATH_PACKING))/wpi/1
    53 Lucide_wpi_1_SOURCES    := \
    54         $(filter-out %/ludjvu.dll \
    55                                  %/lujpeg.dll \
    56                                  %/lupplr.dll,$(wildcard $(PATH_BIN)/*))
     57Lucide_wpi_1_SOURCES     = \
     58        $(TARGET_Lucide) \
     59        $(TARGET_Lucide_dll) \
     60        $(TARGET_ludoc) \
     61        $(abspathex $(Lucide_doc_SOURCES),$(Lucide_doc_PATH)) \
     62        $(abspathex $(Lucide_lng_SOURCES),$(Lucide_lng_PATH))
    5763
    5864Lucide_wpi_2_INST                = $(notdir $(PATH_PACKING))/wpi/2
    59 Lucide_wpi_2_SOURCES    := $(PATH_BIN)/ludjvu.dll
     65Lucide_wpi_2_SOURCES     = $(TARGET_ludjvu)
    6066
    6167Lucide_wpi_3_INST                = $(notdir $(PATH_PACKING))/wpi/3
    62 Lucide_wpi_3_SOURCES    := $(PATH_BIN)/lujpeg.dll
     68Lucide_wpi_3_SOURCES     = $(TARGET_lujpeg)
    6369
    6470Lucide_wpi_4_INST                = $(notdir $(PATH_PACKING))/wpi/4
    65 Lucide_wpi_4_SOURCES    := $(PATH_BIN)/lupplr.dll
     71Lucide_wpi_4_SOURCES     = $(TARGET_lupoppler)
    6672
    67 $(LUCIDE_WPI): all
     73$(LUCIDE_WPI): install
    6874        $(call MSG_L1,Packing $@)
    6975        -$(QUIET)$(RM) -f $@
     
    7480                -s warpin/lucide_wpi.wis
    7581
     82#
     83# ZIP (puts all WPI packages together)
     84#
     85
    7686Lucide_zip_INST          = $(notdir $(PATH_PACKING))/zip
    77 Lucide_zip_SOURCES      := $(filter-out %/lucide.fcf,$(wildcard $(PATH_BIN)/*))
     87Lucide_zip_SOURCES       = \
     88        $(foreach p,$(patsubst Lucide_wpi_%,%,$(filter Lucide_wpi_%,$(INSTALLS))),\
     89                $(Lucide_wpi_$(p)_SOURCES))
    7890
    79 $(LUCIDE_ZIP): all
     91$(LUCIDE_ZIP): install
    8092        $(call MSG_L1,Packing $@)
    8193        -$(QUIET)$(RM) -f $@
    8294        $(QUIET)$(REDIRECT) -C $(PATH_PACKING)/zip -- zip -Sr9 $@ \*
    8395
    84 endif
     96endif # IN_PACKING
    8597
    8698include $(FILE_KBUILD_SUB_FOOTER)
Note: See TracChangeset for help on using the changeset viewer.