Changeset e160bfe8 in mainline for Makefile

Timestamp:

2017-10-23T18:51:34Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

327f147

Parents:

31cca4f3 (diff), 367db39a (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 (again) to fix build

Perhaps it wasn't so good idea to start merging mainline in these unstable times

File:

• Makefile (modified) (3 diffs)

Makefile

@@ -41 +41 @@
 COMMON_MAKEFILE = Makefile.common
 COMMON_HEADER = common.h
-COMMON_HEADER_PREV = $(COMMON_HEADER).prev
 
 CONFIG_MAKEFILE = Makefile.config
 CONFIG_HEADER = config.h
 
-.PHONY: all precheck cscope cscope_parts autotool config_auto config_default config distclean clean check releasefile release
+.PHONY: all precheck cscope cscope_parts autotool config_auto config_default config distclean clean check releasefile release common boot kernel uspace
 
-all: $(COMMON_MAKEFILE) $(COMMON_HEADER) $(CONFIG_MAKEFILE) $(CONFIG_HEADER)
-        cp -a $(COMMON_HEADER) $(COMMON_HEADER_PREV)
+all: kernel uspace
+        $(MAKE) -r -C boot PRECHECK=$(PRECHECK)
+
+common: $(COMMON_MAKEFILE) $(COMMON_HEADER) $(CONFIG_MAKEFILE) $(CONFIG_HEADER)
+
+kernel: common
         $(MAKE) -r -C kernel PRECHECK=$(PRECHECK)
+
+uspace: common
         $(MAKE) -r -C uspace PRECHECK=$(PRECHECK)
-        $(MAKE) -r -C boot PRECHECK=$(PRECHECK)
 
 precheck: clean
@@ -79 +83 @@
 # Autotool (detects compiler features)
 
-autotool $(COMMON_MAKEFILE) $(COMMON_HEADER): $(CONFIG_MAKEFILE)
+autotool $(COMMON_MAKEFILE) $(COMMON_HEADER): $(CONFIG_MAKEFILE) $(AUTOTOOL)
         $(AUTOTOOL)
-        -[ -f $(COMMON_HEADER_PREV) ] && diff -q $(COMMON_HEADER_PREV) $(COMMON_HEADER) && mv -f $(COMMON_HEADER_PREV) $(COMMON_HEADER)
+        diff -q $(COMMON_HEADER).new $(COMMON_HEADER) 2> /dev/null; if [ $$? -ne 0 ]; then mv -f $(COMMON_HEADER).new $(COMMON_HEADER); fi
 
 # Build-time configuration
@@ -109 +113 @@
 
 distclean: clean
-        rm -f $(CSCOPE).out $(COMMON_MAKEFILE) $(COMMON_HEADER) $(COMMON_HEADER_PREV) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) tools/*.pyc tools/checkers/*.pyc release/HelenOS-*
+        rm -f $(CSCOPE).out $(COMMON_MAKEFILE) $(COMMON_HEADER) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) tools/*.pyc tools/checkers/*.pyc release/HelenOS-*
 
 clean: