Changes in Makefile [4e9aaf5:8359969] in mainline

File:

• Makefile (modified) (1 diff)

Makefile

@@ -27 +27 @@
 #
 
+## Include configuration
+#
+
 CSCOPE = cscope
-CONFIG = tools/config.py
-AUTOTOOL = tools/autotool.py
-SANDBOX = autotool
+STANSE = stanse
 
-CONFIG_RULES = HelenOS.config
+.PHONY: all config config_default distclean clean cscope stanse
 
-COMMON_MAKEFILE = Makefile.common
-COMMON_HEADER = common.h
-COMMON_HEADER_PREV = $(COMMON_HEADER).prev
+all: Makefile.config config.h config.defs
+        $(MAKE) -C kernel
+        $(MAKE) -C uspace
+        $(MAKE) -C boot
 
-CONFIG_MAKEFILE = Makefile.config
-CONFIG_HEADER = config.h
-
-.PHONY: all precheck cscope autotool config_default config distclean clean
-
-all: $(COMMON_MAKEFILE) $(COMMON_HEADER) $(CONFIG_MAKEFILE) $(CONFIG_HEADER)
-        cp -a $(COMMON_HEADER) $(COMMON_HEADER_PREV)
-        $(MAKE) -C kernel PRECHECK=$(PRECHECK)
-        $(MAKE) -C uspace PRECHECK=$(PRECHECK)
-        $(MAKE) -C boot PRECHECK=$(PRECHECK)
-
-precheck: clean
-        $(MAKE) all PRECHECK=y
+stanse: Makefile.config config.h config.defs
+        $(MAKE) -C kernel clean
+        $(MAKE) -C kernel EXTRA_TOOL=stanse
+        $(STANSE) --checker ReachabilityChecker --checker ThreadChecker:contrib/$(STANSE)/ThreadChecker.xml --jobfile kernel/kernel.job
 
 cscope:
         find kernel boot uspace -regex '^.*\.[chsS]$$' | xargs $(CSCOPE) -b -k -u -f$(CSCOPE).out
 
-$(COMMON_MAKEFILE): autotool
-$(COMMON_HEADER): autotool
+Makefile.config: config_default
 
-autotool: $(CONFIG_MAKEFILE)
-        $(AUTOTOOL)
-        -[ -f $(COMMON_HEADER_PREV) ] && diff -q $(COMMON_HEADER_PREV) $(COMMON_HEADER) && mv -f $(COMMON_HEADER_PREV) $(COMMON_HEADER)
+config.h: config_default
 
-$(CONFIG_MAKEFILE): config_default
-$(CONFIG_HEADER): config_default
+config.defs: config_default
 
-config_default: $(CONFIG_RULES)
-        $(CONFIG) $< default
+config_default: HelenOS.config
+        tools/config.py HelenOS.config default
 
-config: $(CONFIG_RULES)
-        $(CONFIG) $<
+config: HelenOS.config
+        tools/config.py HelenOS.config
 
 distclean: clean
-        rm -f $(CSCOPE).out $(COMMON_MAKEFILE) $(COMMON_HEADER) $(COMMON_HEADER_PREV) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) tools/*.pyc tools/checkers/*.pyc
+        rm -f $(CSCOPE).out Makefile.config config.h config.defs tools/*.pyc
 
 clean:
-        rm -fr $(SANDBOX)
         $(MAKE) -C kernel clean
         $(MAKE) -C uspace clean