Changeset f5b2522 in mainline for uspace/app/binutils/Makefile

Timestamp:

2011-07-07T03:34:03Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

8cd8bf6

Parents:

10fdd0e

Message:

Changed behaviour of clean routine. Removed conflict between toolchain and binaries.

File:

• uspace/app/binutils/Makefile (modified) (5 diffs)

uspace/app/binutils/Makefile

@@ -30 +30 @@
 space = $(nullstring) # space
 
+# When redefined to 'y' on the command line, certain areas of this Makefile
+# behave slightly differently to simplify the maintenance of binutils port.
+MAINTAIN_BINUTILS=n
+
 # Information for obtaining specific binutils redistributable package.
 # Might be subject to change in the future.
@@ -42 +46 @@
 # File to detect the presence of binutils source tree.
 REDIST_DETECT = $(REDIST_DIR)/configure
+
+# Directory for resulting binutils binaries.
+BIN_DIR = ./bin
 
 # $USPACE_PREFIX have to be based on the absolute path,
@@ -146 +153 @@
                 $(CONFOBJ_OBJECT) $(BINUTILS_CONFIGURED) $(REDIST_DETECT)
         make -C $(REDIST_DIR) $(MAKE_TARGETS)
-        cp -f $(REDIST_DIR)/gas/as-new ./as
-        cp -f $(REDIST_DIR)/ld/ld-new ./ld
+        cp -f $(REDIST_DIR)/gas/as-new $(BIN_DIR)/as
+        cp -f $(REDIST_DIR)/ld/ld-new $(BIN_DIR)/ld
 else
 all:
@@ -206 +213 @@
 # Clean binutils.
 # Unpatch binutils.
+# Delete everything in redist folder.
 # Delete generated scripts.
 clean: $(BINUTILS_PATCH) clean_
-        rm -f as ld
+        rm -f $(BIN_DIR)/as $(BIN_DIR)/ld
         rm -f $(CONFOBJ_SOURCE) $(CONFOBJ_OBJECT)
+ifeq ($(MAINTAIN_BINUTILS),y)
         if [ -e $(REDIST_DIR)/Makefile ]; then \
                 make -C $(REDIST_DIR) distclean; \
@@ -217 +226 @@
                 rm -f $(BINUTILS_PATCHED); \
         fi
+else
+        rm -r -f redist/*
+        rm -f $(BINUTILS_PATCHED)
+endif
         rm -f $(TOOLCHAIN)
         rm -f $(COMMON_MAKEFILE_PATCHED)