Ignore:
Timestamp:
Aug 22, 2002, 5:25:48 AM (23 years ago)
Author:
bird
Message:

-Implemented a 'needed' pass to make required tools like code generators etc.
-Made SUBDIRS and PRE/POSTMAKEFILES more customizable by adding _<rule>
overrides. This is good when you wanna skip a tree for a rule (=pass) or/and
just run do that rule (=pass) in a tree.
-Added check for TARGET_PRIVATE macro before installing anything.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/make/process.mak

    r9065 r9090  
    1 # $Id: process.mak,v 1.20 2002-08-20 21:17:45 bird Exp $
     1# $Id: process.mak,v 1.21 2002-08-22 03:25:48 bird Exp $
    22
    33#
    … …  
    198198# Default import library file. (output)
    199199!ifndef TARGET_ILIB
    200 ! if "$(TARGET_MODE)" == "DLL"
     200! if "$(TARGET_MODE)" == "DLL" || "$(TARGET_ILIB_YES)" != ""
    201201TARGET_ILIB =$(PATH_LIB)\$(TARGET_NAME).$(EXT_ILIB)
    202202! endif
    … …  
    515515# The build rule - This runs all passes:
    516516#   1. Make Dependencies
    517 #   2. Make Libraries (all kinds)
    518 #   3. Make Executables
    519 #   4. Make Miscellaneous Targets
    520 #   5. Make Install
     517#   2. Make Needed Tools (stuff required in the next steps)
     518#   3. Make Libraries (all kinds)
     519#   4. Make Executables
     520#   5. Make Miscellaneous Targets
     521#   6. Make Install
    521522# Note: In order to load dependencies we'll do a forwarding after making them.
    522523# -----------------------------------------------------------------------------
    … …  
    541542# internal rule used to reload dependencies.
    542543_build_new_dependencies_: \
     544        _build_banner_needed        needed \
    543545        _build_banner_lib           lib \
    544546        _build_banner_executable    executable \
    … …  
    553555    @$(ECHO)$(CLRMAK)[Start Pass 1 - Make Dependencies] $(CLRRST)
    554556    @SET _BUILD_PASS=1
     557_build_banner_needed:
     558    @$(ECHO)$(CLRMAK)[Start Pass 2 - Make Needed Tools] $(CLRRST)
     559    @SET _BUILD_PASS=2
    555560_build_banner_lib:
    556     @$(ECHO)$(CLRMAK)[Start Pass 2 - Make Libraries] $(CLRRST)
    557     @SET _BUILD_PASS=2
     561    @$(ECHO)$(CLRMAK)[Start Pass 3 - Make Libraries] $(CLRRST)
     562    @SET _BUILD_PASS=3
    558563_build_banner_executable:
    559     @$(ECHO)$(CLRMAK)[Start Pass 3 - Make Executables] $(CLRRST)
    560     @SET _BUILD_PASS=3
     564    @$(ECHO)$(CLRMAK)[Start Pass 4 - Make Executables] $(CLRRST)
     565    @SET _BUILD_PASS=4
    561566_build_banner_miscellaneous:
    562     @$(ECHO)$(CLRMAK)[Start Pass 4 - Make Miscellaneous Targets] $(CLRRST)
    563     @SET _BUILD_PASS=4
     567    @$(ECHO)$(CLRMAK)[Start Pass 5 - Make Miscellaneous Targets] $(CLRRST)
     568    @SET _BUILD_PASS=5
    564569_build_banner_install:
    565     @$(ECHO)$(CLRMAK)[Start Pass 5 - Make Install] $(CLRRST)
    566     @SET _BUILD_PASS=5
     570    @$(ECHO)$(CLRMAK)[Start Pass 6 - Make Install] $(CLRRST)
     571    @SET _BUILD_PASS=6
    567572
    568573
    … …  
    629634        .\.depend
    630635!endif
    631 !ifdef SUBDIRS
    632     @$(TOOL_DODIRS) "$(SUBDIRS)" $(TOOL_MAKE) -f $(BUILD_MAKEFILE) NODEP=1 $@
    633 !endif
    634 !ifdef PREMAKEFILES
    635     @$(TOOL_DOMAKES) "$(PREMAKEFILES)" $(TOOL_MAKE) NODEP=1 $@
    636 !endif
    637 !ifdef POSTMAKEFILES
    638     @$(TOOL_DOMAKES) "$(POSTMAKEFILES)" $(TOOL_MAKE) NODEP=1 $@
    639 !endif
     636!ifdef SUBDIRS_CLEAN
     637    @$(TOOL_DODIRS) "$(SUBDIRS_CLEAN)" $(TOOL_MAKE) -f $(BUILD_MAKEFILE) NODEP=1 $@
     638!else
     639! ifdef SUBDIRS
     640    @$(TOOL_DODIRS) "$(SUBDIRS) $(SUBDIRS_NEEDED) $(SUBDIRS_LIB) $(SUBDIRS_EXECUTABLES) $(SUBDIRS_MISC)" $(TOOL_MAKE) -f $(BUILD_MAKEFILE) NODEP=1 $@
     641! endif
     642!endif
     643!ifdef PREMAKEFILES_CLEAN
     644    @$(TOOL_DOMAKES) "$(PREMAKEFILES_CLEAN)" $(TOOL_MAKE) NODEP=1 $@
     645!else
     646! ifdef PREMAKEFILES
     647    @$(TOOL_DOMAKES) "$(PREMAKEFILES) $(PREMAKEFILES_NEEDED) $(PREMAKEFILES_LIB) $(PREMAKEFILES_EXECUTABLES) $(PREMAKEFILES_MISC)" $(TOOL_MAKE) NODEP=1 $@
     648! endif
     649!endif
     650!ifdef POSTMAKEFILES_CLEAN
     651    @$(TOOL_DOMAKES) "$(POSTMAKEFILES_CLEAN)" $(TOOL_MAKE) NODEP=1 $@
     652!else
     653! ifdef POSTMAKEFILES
     654    @$(TOOL_DOMAKES) "$(POSTMAKEFILES) $(POSTMAKEFILES_NEEDED) $(POSTMAKEFILES_LIB) $(POSTMAKEFILES_EXECUTABLES) $(POSTMAKEFILES_MISC)" $(TOOL_MAKE) NODEP=1 $@
     655! endif
     656!endif
     657
    640658!endif #!TESTCASE
    641659
    … …  
    658676        $(TOOL_DEP_FILES)
    659677!endif
    660 !ifdef SUBDIRS
    661     @$(TOOL_DODIRS) "$(SUBDIRS)" $(TOOL_MAKE) -f $(BUILD_MAKEFILE) NODEP=1 $@
    662 !endif
    663 !ifdef PREMAKEFILES
    664     @$(TOOL_DOMAKES) "$(PREMAKEFILES)" $(TOOL_MAKE) NODEP=1 $@
    665 !endif
    666 !ifdef POSTMAKEFILES
    667     @$(TOOL_DOMAKES) "$(POSTMAKEFILES)" $(TOOL_MAKE) NODEP=1 $@
    668 !endif
    669 
    670 
    671 
    672 # -----------------------------------------------------------------------------
    673 # Pass 2 - The lib rule - Make libraries.
    674 # -----------------------------------------------------------------------------
    675 !ifdef SUBDIRS
    676 SUBDIRS_LIB = _subdir_lib
    677 $(SUBDIRS_LIB):
     678!ifdef SUBDIRS_DEP
     679    @$(TOOL_DODIRS) "$(SUBDIRS_DEP)" $(TOOL_MAKE) -f $(BUILD_MAKEFILE) NODEP=1 $@
     680!else
     681! ifdef SUBDIRS
     682    @$(TOOL_DODIRS) "$(SUBDIRS) $(SUBDIRS_NEEDED) $(SUBDIRS_LIB) $(SUBDIRS_EXECUTABLES) $(SUBDIRS_MISC)" $(TOOL_MAKE) -f $(BUILD_MAKEFILE) NODEP=1 $@
     683! endif
     684!endif
     685!ifdef PREMAKEFILES_DEP
     686    @$(TOOL_DOMAKES) "$(PREMAKEFILES_DEP)" $(TOOL_MAKE) NODEP=1 $@
     687!else
     688! ifdef PREMAKEFILES
     689    @$(TOOL_DOMAKES) "$(PREMAKEFILES) $(PREMAKEFILES_NEEDED) $(PREMAKEFILES_LIB) $(PREMAKEFILES_EXECUTABLES) $(PREMAKEFILES_MISC)" $(TOOL_MAKE) NODEP=1 $@
     690! endif
     691!endif
     692!ifdef POSTMAKEFILES_DEP
     693    @$(TOOL_DOMAKES) "$(POSTMAKEFILES_DEP)" $(TOOL_MAKE) NODEP=1 $@
     694!else
     695! ifdef POSTMAKEFILES
     696    @$(TOOL_DOMAKES) "$(POSTMAKEFILES) $(POSTMAKEFILES_NEEDED) $(POSTMAKEFILES_LIB) $(POSTMAKEFILES_EXECUTABLES) $(POSTMAKEFILES_MISC)" $(TOOL_MAKE) NODEP=1 $@
     697! endif
     698!endif
     699
     700
     701
     702# -----------------------------------------------------------------------------
     703# Pass 2 - The needed rule - Make need tools.
     704#   That is tools and stuff that is required for the next passes.
     705#   WARNING! These tools and stuff shouldn't rely on libraries and other
     706#            results of later passes.
     707# -----------------------------------------------------------------------------
     708!ifdef SUBDIRS_NEEDED
     709_SUBDIRS_NEEDED = _subdir_needed
     710$(_SUBDIRS_NEEDED):
     711    @$(TOOL_DODIRS) "$(SUBDIRS_NEEDED)" $(TOOL_MAKE) -f $(BUILD_MAKEFILE) needed
     712!else
     713! ifdef SUBDIRS
     714_SUBDIRS_NEEDED = _subdir_needed
     715$(_SUBDIRS_NEEDED):
     716    @$(TOOL_DODIRS) "$(SUBDIRS)" $(TOOL_MAKE) -f $(BUILD_MAKEFILE) needed
     717! endif
     718!endif
     719
     720!ifdef PREMAKEFILES_NEEDED
     721_PREMAKEFILES_NEEDED = _premakefiles_needed
     722$(_PREMAKEFILES_NEEDED):
     723    @$(TOOL_DOMAKES) "$(PREMAKEFILES_NEEDED)" $(TOOL_MAKE) needed
     724!else
     725! ifdef PREMAKEFILES
     726_PREMAKEFILES_NEEDED = _premakefiles_needed
     727$(_PREMAKEFILES_NEEDED):
     728    @$(TOOL_DOMAKES) "$(PREMAKEFILES)" $(TOOL_MAKE) needed
     729! endif
     730!endif
     731
     732!if "$(TARGET_NEEDED)" != ""
     733needed:    $(_SUBDIRS_NEEDED) $(_PREMAKEFILES_NEEDED) target
     734!else
     735needed:    $(_SUBDIRS_NEEDED) $(_PREMAKEFILES_NEEDED)
     736!endif
     737!ifdef POSTMAKEFILES_NEEDED
     738    @$(TOOL_DOMAKES) "$(POSTMAKEFILES_NEEDED)" $(TOOL_MAKE) $@
     739!else
     740! ifdef POSTMAKEFILES
     741    @$(TOOL_DOMAKES) "$(POSTMAKEFILES)" $(TOOL_MAKE) $@
     742! endif
     743!endif
     744
     745
     746
     747# -----------------------------------------------------------------------------
     748# Pass 3 - The lib rule - Make libraries.
     749# -----------------------------------------------------------------------------
     750!ifdef SUBDIRS_LIB
     751_SUBDIRS_LIB = _subdir_lib
     752$(_SUBDIRS_LIB):
     753    @$(TOOL_DODIRS) "$(SUBDIRS_LIB)" $(TOOL_MAKE) -f $(BUILD_MAKEFILE) lib
     754!else
     755! ifdef SUBDIRS
     756_SUBDIRS_LIB = _subdir_lib
     757$(_SUBDIRS_LIB):
    678758    @$(TOOL_DODIRS) "$(SUBDIRS)" $(TOOL_MAKE) -f $(BUILD_MAKEFILE) lib
    679 !endif
    680 
    681 !ifdef PREMAKEFILES
    682 PREMAKEFILES_LIB = _premakefiles_lib
    683 $(PREMAKEFILES_LIB):
     759! endif
     760!endif
     761
     762!ifdef PREMAKEFILES_LIB
     763_PREMAKEFILES_LIB = _premakefiles_lib
     764$(_PREMAKEFILES_LIB):
     765    @$(TOOL_DOMAKES) "$(PREMAKEFILES_LIB)" $(TOOL_MAKE) lib
     766!else
     767! ifdef PREMAKEFILES
     768_PREMAKEFILES_LIB = _premakefiles_lib
     769$(_PREMAKEFILES_LIB):
    684770    @$(TOOL_DOMAKES) "$(PREMAKEFILES)" $(TOOL_MAKE) lib
    685 !endif
    686 
    687 lib:    $(SUBDIRS_LIB) $(PREMAKEFILES_LIB) \
     771! endif
     772!endif
     773
     774lib:    $(_SUBDIRS_LIB) $(_PREMAKEFILES_LIB) \
    688775!if "$(TARGET_MODE)" == "LIB" || "$(TARGET_MODE)" == "SYSLIB" || "$(TARGET_MODE)" == "IFSLIB"
    689776        $(TARGET) $(TARGET_PUBNAME) \
    690777!endif
    691778        $(TARGET_ILIB)
    692 !ifdef POSTMAKEFILES
     779!ifdef POSTMAKEFILES_LIB
     780    @$(TOOL_DOMAKES) "$(POSTMAKEFILES_LIB)" $(TOOL_MAKE) $@
     781!else
     782! ifdef POSTMAKEFILES
    693783    @$(TOOL_DOMAKES) "$(POSTMAKEFILES)" $(TOOL_MAKE) $@
    694 !endif
    695 
    696 
    697 
    698 # -----------------------------------------------------------------------------
    699 # Pass 3 - The executable rule - Build the executables.
    700 # -----------------------------------------------------------------------------
    701 !ifdef SUBDIRS
    702 SUBDIRS_EXECUTABLE = _subdir_executable
    703 $(SUBDIRS_EXECUTABLE):
     784! endif
     785!endif
     786
     787
     788
     789# -----------------------------------------------------------------------------
     790# Pass 4 - The executable rule - Build the executables.
     791# -----------------------------------------------------------------------------
     792!ifdef SUBDIRS_EXECUTABLE
     793_SUBDIRS_EXECUTABLE = _subdir_executable
     794$(_SUBDIRS_EXECUTABLE):
     795    @$(TOOL_DODIRS) "$(SUBDIRS_EXECUTABLE)" $(TOOL_MAKE) -f $(BUILD_MAKEFILE) executable
     796!else
     797! ifdef SUBDIRS
     798_SUBDIRS_EXECUTABLE = _subdir_executable
     799$(_SUBDIRS_EXECUTABLE):
    704800    @$(TOOL_DODIRS) "$(SUBDIRS)" $(TOOL_MAKE) -f $(BUILD_MAKEFILE) executable
    705 !endif
    706 
    707 !ifdef PREMAKEFILES
    708 PREMAKEFILES_EXECUTABLE = _premakefiles_executable
    709 $(PREMAKEFILES_EXECUTABLE):
     801! endif
     802!endif
     803
     804!ifdef PREMAKEFILES_EXECUTABLE
     805_PREMAKEFILES_EXECUTABLE = _premakefiles_executable
     806$(_PREMAKEFILES_EXECUTABLE):
     807    @$(TOOL_DOMAKES) "$(PREMAKEFILES_EXECUTABLE)" $(TOOL_MAKE) executable
     808!else
     809! ifdef PREMAKEFILES
     810_PREMAKEFILES_EXECUTABLE = _premakefiles_executable
     811$(_PREMAKEFILES_EXECUTABLE):
    710812    @$(TOOL_DOMAKES) "$(PREMAKEFILES)" $(TOOL_MAKE) executable
     813! endif
    711814!endif
    712815
    713816executable: \
    714 !if "$(TARGET_MODE)" != "LIB" && "$(TARGET_MODE)" != "SYSLIB" && "$(TARGET_MODE)" != "IFSLIB"
    715         $(SUBDIRS_EXECUTABLE) $(PREMAKEFILES_EXECUTABLE) $(TARGET) $(TARGET_PUBNAME)
     817!if "$(TARGET_MODE)" != "LIB" && "$(TARGET_MODE)" != "SYSLIB" && "$(TARGET_MODE)" != "IFSLIB" && "$(TARGET_NEEDED)" == ""
     818        $(_SUBDIRS_EXECUTABLE) $(_PREMAKEFILES_EXECUTABLE) $(TARGET) $(TARGET_PUBNAME)
    716819! if "$(TARGET)" != ""
    717820    @$(ECHO) Successfully Built $(CLRFIL)$(TARGET)$(CLRRST)
    718821! endif
    719822!else
    720         $(SUBDIRS_EXECUTABLE) $(PREMAKEFILES_EXECUTABLE)
    721 !endif
    722 !ifdef POSTMAKEFILES
     823        $(_SUBDIRS_EXECUTABLE) $(_PREMAKEFILES_EXECUTABLE)
     824!endif
     825!ifdef POSTMAKEFILES_EXECUTABLE
     826    @$(TOOL_DOMAKES) "$(POSTMAKEFILES_EXECUTABLE)" $(TOOL_MAKE) $@
     827!else
     828! ifdef POSTMAKEFILES
    723829    @$(TOOL_DOMAKES) "$(POSTMAKEFILES)" $(TOOL_MAKE) $@
    724 !endif
    725 
    726 
    727 
    728 # -----------------------------------------------------------------------------
    729 # Pass 4 - The miscellaneous rule - Makes other miscellaneous stuff like
     830! endif
     831!endif
     832
     833
     834
     835# -----------------------------------------------------------------------------
     836# Pass 5 - The miscellaneous rule - Makes other miscellaneous stuff like
    730837#   documentations etc. This is experimental for the moment.
    731838# -----------------------------------------------------------------------------
    732 !ifdef SUBDIRS
    733 SUBDIRS_MISC = _subdir_misc
     839!ifdef SUBDIRS_MISC
     840_SUBDIRS_MISC = _subdir_misc
    734841$(SUBDIRS_MISC):
     842    @$(TOOL_DODIRS) "$(SUBDIRS_MISC)" $(TOOL_MAKE) -f $(BUILD_MAKEFILE) miscellaneous
     843!else
     844! ifdef SUBDIRS
     845_SUBDIRS_MISC = _subdir_misc
     846$(_SUBDIRS_MISC):
    735847    @$(TOOL_DODIRS) "$(SUBDIRS)" $(TOOL_MAKE) -f $(BUILD_MAKEFILE) miscellaneous
    736 !endif
    737 
    738 !ifdef PREMAKEFILES
    739 PREMAKEFILES_MISC = _premakefiles_misc
     848! endif
     849!endif
     850
     851!ifdef PREMAKEFILES_MISC
     852_PREMAKEFILES_MISC = _premakefiles_misc
    740853$(PREMAKEFILES_MISC):
     854    @$(TOOL_DOMAKES) "$(PREMAKEFILES_MISC)" $(TOOL_MAKE) miscellaneous
     855!else
     856! ifdef PREMAKEFILES
     857_PREMAKEFILES_MISC = _premakefiles_misc
     858$(_PREMAKEFILES_MISC):
    741859    @$(TOOL_DOMAKES) "$(PREMAKEFILES)" $(TOOL_MAKE) miscellaneous
    742 !endif
    743 
    744 miscellaneous:  $(SUBDIRS_MISC) $(PREMAKEFILES_MISC) \
     860! endif
     861!endif
     862
     863miscellaneous:  $(_SUBDIRS_MISC) $(_PREMAKEFILES_MISC) \
    745864                $(TARGET_DOCS) $(TARGET_MISC)
    746865!if "$(TARGET_DOCS)$(TARGET_MISC)" != ""
    747866    @$(ECHO) Successfully Built $(CLRFIL)$(TARGET_DOCS) $(TARGET_MISC)$(CLRRST)
    748 !else
    749 !endif
    750 !ifdef POSTMAKEFILES
     867!endif
     868!ifdef POSTMAKEFILES_MISC
     869    @$(TOOL_DOMAKES) "$(POSTMAKEFILES_MISC)" $(TOOL_MAKE) $@
     870!else
     871! ifdef POSTMAKEFILES
    751872    @$(TOOL_DOMAKES) "$(POSTMAKEFILES)" $(TOOL_MAKE) $@
    752 !endif
    753 
    754 
    755 
    756 # -----------------------------------------------------------------------------
    757 # Pass 5 - The install rule - Copies target to main binary directory.
     873! endif
     874!endif
     875
     876
     877
     878# -----------------------------------------------------------------------------
     879# Pass 6 - The install rule - Copies target to main binary directory.
    758880#   Installation order is not concidered vital, so subdirectories and
    759881#   pre-makefiles are processed after this directory. This might be changed.
    760882# -----------------------------------------------------------------------------
    761883install:
    762 !if "$(TARGET_PUBLIC)" == ""
     884!if "$(TARGET_PUBLIC)" == "" && "$(TARGET_PUBNAME)" == "" && "$(TARGET_PRIVATE)" == ""
    763885! if "$(TARGET_MODE)" == "EXE"
    764886    @$(ECHO) Installing $(CLRFIL)$(TARGET)$(CLRTXT) in directory $(CLRFIL)$(PATH_BIN)$(CLRRST)
    … …  
    795917    $(TOOL_COPY) $(TARGET_DOCS) $(PATH_DOC)
    796918!endif
    797 !ifdef SUBDIRS
     919!ifdef SUBDIRS_INSTALL
     920    @$(TOOL_DODIRS) "$(SUBDIRS_INSTALL)" $(TOOL_MAKE) -f $(BUILD_MAKEFILE) $@
     921!else
     922! ifdef SUBDIRS
    798923    @$(TOOL_DODIRS) "$(SUBDIRS)" $(TOOL_MAKE) -f $(BUILD_MAKEFILE) $@
    799 !endif
    800 !ifdef PREMAKEFILES
     924! endif
     925!endif
     926!ifdef PREMAKEFILES_INSTALL
     927    @$(TOOL_DOMAKES) "$(PREMAKEFILES_INSTALL)" $(TOOL_MAKE) $@
     928!else
     929! ifdef PREMAKEFILES
    801930    @$(TOOL_DOMAKES) "$(PREMAKEFILES)" $(TOOL_MAKE) $@
    802 !endif
    803 !ifdef POSTMAKEFILES
     931! endif
     932!endif
     933!ifdef POSTMAKEFILES_INSTALL
     934    @$(TOOL_DOMAKES) "$(POSTMAKEFILES_INSTALL)" $(TOOL_MAKE) $@
     935!else
     936! ifdef POSTMAKEFILES
    804937    @$(TOOL_DOMAKES) "$(POSTMAKEFILES)" $(TOOL_MAKE) $@
     938! endif
    805939!endif
    806940
    … …  
    813947!if "$(TARGET_MODE)" != "TESTCASE"
    814948!ifndef BUILD_OWN_TESTCASE_RULE
     949
    815950!ifndef MAKEVER
    816951_TESTCASE_TST1 = [$(TOOL_EXISTS) testcase] == 0
    … …  
    829964    @$(TOOL_DOMAKES) "testcase.mak" $(TOOL_MAKE) $@
    830965!endif
    831 !ifdef SUBDIRS
     966!ifdef SUBDIRS_TESTCASE
     967    @$(TOOL_DODIRS) "$(SUBDIRS_TESTCASE)" $(TOOL_MAKE) -f $(BUILD_MAKEFILE) $@
     968!else
     969! ifdef SUBDIRS
    832970    @$(TOOL_DODIRS) "$(SUBDIRS)" $(TOOL_MAKE) -f $(BUILD_MAKEFILE) $@
    833 !endif
    834 !ifdef PREMAKEFILES
     971! endif
     972!endif
     973!ifdef PREMAKEFILES_TESTCASE
     974    @$(TOOL_DOMAKES) "$(PREMAKEFILES_TESTCASE)" $(TOOL_MAKE) $@
     975!else
     976! ifdef PREMAKEFILES
    835977    @$(TOOL_DOMAKES) "$(PREMAKEFILES)" $(TOOL_MAKE) $@
    836 !endif
    837 !ifdef POSTMAKEFILES
     978! endif
     979!endif
     980!ifdef POSTMAKEFILES_TESTCASE
     981    @$(TOOL_DOMAKES) "$(POSTMAKEFILES_TESTCASE)" $(TOOL_MAKE) $@
     982!else
     983! ifdef POSTMAKEFILES
    838984    @$(TOOL_DOMAKES) "$(POSTMAKEFILES)" $(TOOL_MAKE) $@
    839 !endif
    840 !endif
     985! endif
     986!endif
     987
     988!endif # BUILD_OWN_TESTCASE_RULE
    841989!endif #!TESTCASE
    842990
    … …  
    845993# -----------------------------------------------------------------------------
    846994# The target rule - Build the target.
    847 #   Note: This also builds libraries in subdirectories and submakefiles.
    848 # -----------------------------------------------------------------------------
    849 !ifdef SUBDIRS
    850 SUBDIRS_TARGET = _subdir_target
    851 $(SUBDIRS_TARGET):
    852     @$(TOOL_DODIRS) "$(SUBDIRS)" $(TOOL_MAKE) -f $(BUILD_MAKEFILE) target
    853 !endif
    854 
    855 !ifdef PREMAKEFILES
    856 PREMAKEFILES_TARGET = _premakefiles_target
    857 $(PREMAKEFILES_TARGET):
    858     @$(TOOL_DOMAKES) "$(PREMAKEFILES)" $(TOOL_MAKE) target
    859 !endif
    860 
    861 target: $(SUBDIRS_TARGET) $(PREMAKEFILES_TARGET) $(TARGET) $(TARGET_ILIB) $(TARGET_PUBNAME)
     995#   NOTE! NO SUBDIRS OR POST/PREMAKED INVOLVED!
     996# -----------------------------------------------------------------------------
     997target: $(TARGET) $(TARGET_ILIB) $(TARGET_PUBNAME)
    862998    @$(ECHO) Successfully Built $(CLRFIL)$(TARGET) $(TARGET_ILIB)$(CLRRST)
    863 !ifdef POSTMAKEFILES
    864     @$(TOOL_DOMAKES) "$(POSTMAKEFILES)" $(TOOL_MAKE) $@
    865 !endif
    866999
    8671000
Note: See TracChangeset for help on using the changeset viewer.