Changeset cc92076 in mainline


Ignore:
Timestamp:
2017-10-21T05:46:19Z (7 years ago)
Author:
jzr <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
8988fde, be1b1e68
Parents:
9c14309
Message:

Clean up minor issues with the Makefiles.

Files:
3 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    r9c14309 rcc92076  
    4141COMMON_MAKEFILE = Makefile.common
    4242COMMON_HEADER = common.h
    43 COMMON_HEADER_PREV = $(COMMON_HEADER).prev
    4443
    4544CONFIG_MAKEFILE = Makefile.config
    … …  
    5251
    5352common: $(COMMON_MAKEFILE) $(COMMON_HEADER) $(CONFIG_MAKEFILE) $(CONFIG_HEADER)
    54         cp -a $(COMMON_HEADER) $(COMMON_HEADER_PREV)
    5553
    5654kernel: common
    … …  
    8583# Autotool (detects compiler features)
    8684
    87 autotool $(COMMON_MAKEFILE) $(COMMON_HEADER): $(CONFIG_MAKEFILE)
     85autotool $(COMMON_MAKEFILE) $(COMMON_HEADER): $(CONFIG_MAKEFILE) $(AUTOTOOL)
    8886        $(AUTOTOOL)
    89         -[ -f $(COMMON_HEADER_PREV) ] && diff -q $(COMMON_HEADER_PREV) $(COMMON_HEADER) && mv -f $(COMMON_HEADER_PREV) $(COMMON_HEADER)
     87        diff -q $(COMMON_HEADER).new $(COMMON_HEADER) 2> /dev/null; if [ $$? -ne 0 ]; then mv -f $(COMMON_HEADER).new $(COMMON_HEADER); fi
    9088
    9189# Build-time configuration
    … …  
    115113
    116114distclean: clean
    117         rm -f $(CSCOPE).out $(COMMON_MAKEFILE) $(COMMON_HEADER) $(COMMON_HEADER_PREV) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) tools/*.pyc tools/checkers/*.pyc release/HelenOS-*
     115        rm -f $(CSCOPE).out $(COMMON_MAKEFILE) $(COMMON_HEADER) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) tools/*.pyc tools/checkers/*.pyc release/HelenOS-*
    118116
    119117clean:

  • boot/Makefile

    r9c14309 rcc92076  
    117117                cp "$(USPACE_PATH)/$(DRVS_PATH)/$$file_dir/$$file_name/$$file_name.fw" "$(DIST_PATH)/$(DRVS_PATH)/$$file_name/" ; \
    118118        done
    119         if ls $(DIST_OVERLAY_PATH)/* >/dev/null; then \
     119        if [ -d $(DIST_OVERLAY_PATH) ]; then \
    120120                cp -r -L $(DIST_OVERLAY_PATH)/* "$(DIST_PATH)"; \
    121121        fi

  • tools/autotool.py

    r9c14309 rcc92076  
    4242CONFIG = 'Makefile.config'
    4343MAKEFILE = 'Makefile.common'
    44 HEADER = 'common.h'
     44HEADER = 'common.h.new'
    4545GUARD = 'AUTOTOOL_COMMON_H_'
    4646
Note: See TracChangeset for help on using the changeset viewer.