Changeset 438 for trunk/Makefile.kmk


Ignore:
Timestamp:
Apr 22, 2010, 11:32:23 AM (12 years ago)
Author:
dmik
Message:

Brushed up r436:437.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile.kmk

    r437 r438  
    1818#
    1919
    20 PATH_OUT                ?= . # be on the safe side (we do rmdir -fR of PATH_PACKING)
    21 PATH_PACKING    = $(PATH_OUT)/packing
     20PATH_OUT        ?= . # be on the safe side (we do rmdir -fR of PATH_PACKING)
     21PATH_PACKING = $(PATH_OUT)/packing
    2222
    23 LUCIDE_WPI       = $(PATH_OUT)/Lucide-$(subst $(SP),_,$(subst .,_,$(VERSION)))_$(BUILD).wpi
    24 LUCIDE_ZIP       = $(PATH_OUT)/Lucide-$(subst $(SP),_,$(subst .,_,$(VERSION)))_$(BUILD).zip
     23FILE_VERSION = $(subst $(SP),_,$(subst .,_,$(VERSION)$(if $(BUILD),_$(BUILD))))
    2524
    26 OTHER_CLEAN     += $(LUCIDE_WPI) $(LUCIDE_ZIP) warpin/lucide_wpi.wis
     25LUCIDE_WPI       = $(PATH_OUT)/Lucide-$(FILE_VERSION).wpi
     26LUCIDE_ZIP       = $(PATH_OUT)/Lucide-$(FILE_VERSION).zip
     27
     28LUCIDE_WIS       = $(PATH_PACKING)/wpi/lucide.wis
     29
     30OTHER_CLEAN     += $(LUCIDE_WPI) $(LUCIDE_ZIP) $(LUCIDE_WIS)
    2731
    2832ifeq ($(IN_PACKING),)
     
    7175Lucide_wpi_4_SOURCES     = $(TARGET_lujpeg)
    7276
    73 $(LUCIDE_WPI): install warpin/lucide_wpi.wis
     77$(LUCIDE_WPI): $(LUCIDE_WIS) install
    7478        $(call MSG_L1,Packing $@)
    7579        -$(QUIET)$(RM) -f $@
     
    7882                $(foreach p,$(patsubst Lucide_wpi_%,%,$(filter Lucide_wpi_%,$(INSTALLS))),\
    7983                        $(p) -c$(abspathex $(Lucide_wpi_$(p)_INST),$(PATH_OUT)) \*) \
    80                 -s warpin/lucide_wpi.wis
     84                -s $(LUCIDE_WIS)
    8185
    82 warpin/lucide_wpi.wis: config.kmk warpin/lucide_wpi.wi_
    83         @echo Writing wis script
    84         $(SED) "s;_WPIVERSION_;$(subst .,\\\,$(VERSION));g" warpin/lucide_wpi.wi_ \
    85                 | $(SED) "s;_WPIBUILD_;$(WPIBUILD);g" \
    86                 > warpin/lucide_wpi.wis
     86$(LUCIDE_WIS): warpin/lucide.wis.tpl Config.kmk | $$(call DIRDEP,$$(@D))
     87        $(call MSG_L1,Generating $@)
     88        $(QUIET)$(SED) \
     89                -e "s;\\\$${WPIVERSION};$(subst .,\\\,$(VERSION));g" \
     90                -e "s;\\\$${WPIBUILD};$(WPIBUILD);g" \
     91                --output $@ $<
     92
     93BLDDIRS += $(dir $(LUCIDE_WIS))
    8794
    8895#
Note: See TracChangeset for help on using the changeset viewer.