Changeset e2b73d4f in mainline for Makefile


Ignore:
Timestamp:
2010-03-21T09:25:29Z (15 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
19f857a
Parents:
facebd56 (diff), 4e9aaf5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    rfacebd56 re2b73d4f  
    2727#
    2828
    29 ## Include configuration
    30 #
    31 
    3229CSCOPE = cscope
    3330CONFIG = tools/config.py
     31AUTOTOOL = tools/autotool.py
     32SANDBOX = autotool
    3433
    35 .PHONY: all config config_default distclean clean cscope precheck
     34CONFIG_RULES = HelenOS.config
    3635
    37 all: Makefile.config config.h config.defs
     36COMMON_MAKEFILE = Makefile.common
     37COMMON_HEADER = common.h
     38COMMON_HEADER_PREV = $(COMMON_HEADER).prev
     39
     40CONFIG_MAKEFILE = Makefile.config
     41CONFIG_HEADER = config.h
     42
     43.PHONY: all precheck cscope autotool config_default config distclean clean
     44
     45all: $(COMMON_MAKEFILE) $(COMMON_HEADER) $(CONFIG_MAKEFILE) $(CONFIG_HEADER)
     46        cp -a $(COMMON_HEADER) $(COMMON_HEADER_PREV)
    3847        $(MAKE) -C kernel PRECHECK=$(PRECHECK)
    3948        $(MAKE) -C uspace PRECHECK=$(PRECHECK)
     
    4655        find kernel boot uspace -regex '^.*\.[chsS]$$' | xargs $(CSCOPE) -b -k -u -f$(CSCOPE).out
    4756
    48 Makefile.config: config_default
     57$(COMMON_MAKEFILE): autotool
     58$(COMMON_HEADER): autotool
    4959
    50 config.h: config_default
     60autotool: $(CONFIG_MAKEFILE)
     61        $(AUTOTOOL)
     62        -[ -f $(COMMON_HEADER_PREV) ] && diff -q $(COMMON_HEADER_PREV) $(COMMON_HEADER) && mv -f $(COMMON_HEADER_PREV) $(COMMON_HEADER)
    5163
    52 config.defs: config_default
     64$(CONFIG_MAKEFILE): config_default
     65$(CONFIG_HEADER): config_default
    5366
    54 config_default: HelenOS.config
    55         $(CONFIG) HelenOS.config default
     67config_default: $(CONFIG_RULES)
     68        $(CONFIG) $< default
    5669
    57 config: HelenOS.config
    58         $(CONFIG) HelenOS.config
     70config: $(CONFIG_RULES)
     71        $(CONFIG) $<
    5972
    6073distclean: clean
    61         rm -f $(CSCOPE).out Makefile.config config.h config.defs tools/*.pyc tools/checkers/*.pyc
     74        rm -f $(CSCOPE).out $(COMMON_MAKEFILE) $(COMMON_HEADER) $(COMMON_HEADER_PREV) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) tools/*.pyc tools/checkers/*.pyc
    6275
    6376clean:
     77        rm -fr $(SANDBOX)
    6478        $(MAKE) -C kernel clean
    6579        $(MAKE) -C uspace clean
Note: See TracChangeset for help on using the changeset viewer.