Changeset b64eac6 in mainline for Makefile

Timestamp:

2011-03-18T09:18:40Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

11ac272, 73751c0

Parents:

1614ce3 (diff), 306061a (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:

• Makefile (modified) (2 diffs)

Makefile

@@ -42 +42 @@
 CONFIG_HEADER = config.h
 
-.PHONY: all precheck cscope autotool config_auto config_default config distclean clean check distfile dist
+.PHONY: all precheck cscope autotool config_auto config_default config distclean clean check releasefile release
 
 all: $(COMMON_MAKEFILE) $(COMMON_HEADER) $(CONFIG_MAKEFILE) $(CONFIG_HEADER)
@@ -88 +88 @@
         $(CONFIG) $<
 
-# Distribution files
+# Release files
 
-distfile: all
-        $(MAKE) -C dist distfile
+releasefile: all
+        $(MAKE) -C release releasefile
 
-dist:
-        $(MAKE) -C dist dist
+release:
+        $(MAKE) -C release release
 
 # Cleaning
 
 distclean: clean
-        rm -f $(CSCOPE).out $(COMMON_MAKEFILE) $(COMMON_HEADER) $(COMMON_HEADER_PREV) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) tools/*.pyc tools/checkers/*.pyc dist/HelenOS-*
+        rm -f $(CSCOPE).out $(COMMON_MAKEFILE) $(COMMON_HEADER) $(COMMON_HEADER_PREV) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) tools/*.pyc tools/checkers/*.pyc release/HelenOS-*
 
 clean: