Changeset cc92076 in mainline for Makefile

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.

File:

• Makefile (modified) (4 diffs)

Makefile

@@ -41 +41 @@
 COMMON_MAKEFILE = Makefile.common
 COMMON_HEADER = common.h
-COMMON_HEADER_PREV = $(COMMON_HEADER).prev
 
 CONFIG_MAKEFILE = Makefile.config
@@ -52 +51 @@
 
 common: $(COMMON_MAKEFILE) $(COMMON_HEADER) $(CONFIG_MAKEFILE) $(CONFIG_HEADER)
-        cp -a $(COMMON_HEADER) $(COMMON_HEADER_PREV)
 
 kernel: common
@@ -85 +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
@@ -115 +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: