Changeset 96 for trunk/Makefile

Timestamp:

May 5, 2003, 9:44:50 PM (22 years ago)

Author:

bird

Message:

Going home commit.

File:

• trunk/Makefile (modified) (5 diffs, 1 prop)

trunk/Makefile

@@ -415 +415 @@
 endif
         for dir in $(GCC_CONFIGURE_DIRS); do \
-                $(MAKE) $(@:gcc-autoconf-%=%) -f $(PWD)/config.gmk -C src/$$dir ; \
+                if $(MAKE) $(@:gcc-autoconf-%=%) -f $(PWD)/config.gmk -C src/$$dir ; then \
+                        true; \
+                else \
+                        exit 8; \
+                fi \
         done
 
@@ -433 +437 @@
                 $(PATH_OBJ)/gcc/.ts.configured
 ifeq "$(BUILD_PLATFORM)" "OS2"          
-        unset GCCLOAD & $(MAKE) -C $(PATH_OBJ)/gcc \
+        unset GCCLOAD ; $(MAKE) -C $(PATH_OBJ)/gcc \
                 LIBGCC2_DEBUG_CFLAGS="$(BUILD_DEBUGINFO)" \
                 BOOT_CFLAGS="$(BUILD_DEBUGINFO) -O2 -mcpu=pentium -mpreferred-stack-boundary=2 -malign-strings=0 -falign-loops=2 -falign-jumps=2 -falign-functions=2" \
@@ -501 +505 @@
 ###############################################################################
 ###############################################################################
+
+BINUTILS_DIRS = \
+binutils/bfd \
+binutils/opcodes \
+binutils/gas \
+binutils/gprof \
+binutils/binutils \
+binutils/ld \
+
+BINUTILS_NOT_DIRS =\
+binutils/etc \
+binutils/libiberty \
+binutils/intl \
+
+
+BINUTILS_CONFIGURE_DIRS = $(BINUTILS_DIRS) $(BINUTILS_NOT_DIRS)
+
 all-binutils  binutils:
         echo "Binutils are build together with the other GNU Tools in GCC."
@@ -507 +528 @@
 
 
-# Generate diffs for GCC (v3.2.2) - part of packing a release.
+# configure.in/configure
+.PHONY: binutils-autoconf-refresh binutils-autoconf-rerun binutils-autoconf-clean binutils-autoconf-remove
+binutils-autoconf-refresh binutils-autoconf-rerun binutils-autoconf-clean binutils-autoconf-remove:
+ifeq "$(BUILD_PLATFORM)" "LINUX"
+        -$(SH) $(PATH_TOP)/xfix.sh
+endif
+        for dir in $(BINUTILS_CONFIGURE_DIRS); do \
+                if $(MAKE) $(@:binutils-autoconf-%=%) -f $(PWD)/config.gmk -C src/$$dir ; then \
+                        true; \
+                else \
+                        exit 8; \
+                fi \
+        done
+
+
+# build the components.
+.PHONY: binutils-build binutils-install binutils-configure
+binutils-build binutils-install binutils-configure:
+        mkdir -p $(PATH_OBJ)/binutils
+        $(MAKE) -C $(PATH_OBJ)/binutils -f $(MAKEFILE) $@-it
+
+
+# When changed directory
+binutils-build-it: \
+                $(PATH_OBJ)/binutils/.ts.configured
+        $(ASH) -c " unset GCCLOAD ; $(MAKE) -C $(PATH_OBJ)/binutils "
+                
+# configure it (invoked after directory change).
+#       We set CC to help configure finding it.
+binutils-configure-it $(PATH_OBJ)/binutils/.ts.configured: $(PATH_TOP)/src/binutils/configure
+        $(ASH) -c " \
+                export CC=\"gcc.exe\" ; \
+                $< \
+                --enable-shared \
+                --prefix=$(PATH_BIND)/gcc322 "
+        touch $(PATH_OBJ)/binutils/.ts.configured
+        
+        
+# Install the Binutils build
+#       Repeating the prefix doesn't hurt anybody.
+binutils-install-it:
+        $(MAKE) prefix=$(PATH_BIND)/gcc322 install
+
+
+
+# Generate diffs for Binutils (v2.11.2) - part of packing a release.
 .PHONY: binutils-diff $(PATH_BIN)/usr/src/binutils/binutils-2.11.2.diff
 binutils-diff: $(PATH_BIN)/usr/src/binutils/binutils-2.11.2.diff
@@ -515 +581 @@
         
 
+
 ###############################################################################
 ###############################################################################