Changes in / [be79a663:f00af83] in mainline

Files:

• HelenOS.config (modified) (1 diff)
• Makefile (modified) (4 diffs)
• boot/Makefile.common (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/app/binutils/Makefile (deleted)
• uspace/app/binutils/distclean.sh (deleted)
• uspace/app/binutils/intrusive.sh (deleted)
• uspace/app/binutils/patch.awk (deleted)
• uspace/app/binutils/toolchain.sh (deleted)
• uspace/drv/bus/usb/usbhid/kbd.h (added)
• uspace/drv/bus/usb/usbhid/kbd/layout.h (added)
• uspace/drv/bus/usb/usbhid/layout.h (added)

HelenOS.config

@@ -564 +564 @@
 ! CONFIG_BAREBONE (n/y)
 
-% Build binutils binaries 
-! CONFIG_BINUTILS (n/y)
-
 % Line debugging information
 ! [CONFIG_STRIP_BINARIES!=y] CONFIG_LINE_DEBUG (n/y)

Makefile

@@ -26 +26 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-
-# Just for this Makefile. Sub-makes will run in parallel if requested.
-.NOTPARALLEL:
 
 CSCOPE = cscope
@@ -69 +66 @@
 # Autotool (detects compiler features)
 
-autotool $(COMMON_MAKEFILE) $(COMMON_HEADER): $(CONFIG_MAKEFILE)
+$(COMMON_MAKEFILE): autotool
+$(COMMON_HEADER): autotool
+
+autotool: $(CONFIG_MAKEFILE)
         $(AUTOTOOL)
         -[ -f $(COMMON_HEADER_PREV) ] && diff -q $(COMMON_HEADER_PREV) $(COMMON_HEADER) && mv -f $(COMMON_HEADER_PREV) $(COMMON_HEADER)
@@ -75 +75 @@
 # Build-time configuration
 
-config_default $(CONFIG_MAKEFILE) $(CONFIG_HEADER): $(CONFIG_RULES)
+$(CONFIG_MAKEFILE): config_default
+$(CONFIG_HEADER): config_default
+
+config_default: $(CONFIG_RULES)
 ifeq ($(HANDS_OFF),y)
         $(CONFIG) $< hands-off $(PROFILE)
@@ -97 +100 @@
 distclean: clean
         rm -f $(CSCOPE).out $(COMMON_MAKEFILE) $(COMMON_HEADER) $(COMMON_HEADER_PREV) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) tools/*.pyc tools/checkers/*.pyc release/HelenOS-*
-        cd ./uspace/app/binutils/; ./distclean.sh
 
 clean:

boot/Makefile.common

@@ -173 +173 @@
         $(USPACE_PATH)/app/websrv/websrv
 
-ifeq ($(CONFIG_BINUTILS),y)
-RD_APPS_NON_ESSENTIAL += \
-        $(USPACE_PATH)/app/binutils/bin/as \
-        $(USPACE_PATH)/app/binutils/bin/ld
-endif
-
 ifneq ($(CONFIG_BAREBONE),y)
 NET_CFG = \

uspace/Makefile

@@ -114 +114 @@
         drv/bus/usb/vhc
 
-ifeq ($(CONFIG_BINUTILS),y)
-DIRS += \
-        app/binutils
-endif
-
 ## Networking
 #