Changeset 109

Timestamp:

May 8, 2003, 8:08:59 PM (22 years ago)

Author:

bird

Message:

More stuff.

File:

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

trunk/Makefile

@@ -49 +49 @@
 
 
+# Version and CVS defines
+export GCC_VERSION              ?= 3.2.2
+export GCC_VERSION_SHORT        ?= 3022
+export GCC_CVS_VENDOR                   ?= GNU
+export GCC_CVS_REL                              ?= GCC_3-2-2
+export BINUTILS_VERSION                 ?= 2.11.2
+export BINUTILS_VERSION_SHORT   ?= 2112
+export BINUTILS_CVS_VENDOR              ?= GNU
+export BINUTILS_CVS_REL                 ?= BINUTILS_2-11-2
+export EMX_VERSION                              ?= 0.9d-fix04
+export EMX_VERSION_SHORT        ?= 9d04
+export EMX_CVS_VENDOR                   ?= EMX
+export EMX_CVS_REL                              ?= EMX_0-9D-FIX04
+
+                        
 #                       
 # For builds on Linux Host builds we do the environment setup here.
@@ -72 +87 @@
 
 
+
+# Misc Helpers
+ALL_PREFIX                  = $(PATH_BIND)/$(GCC_VERSION)/usr
+TOOL_CVS_DIFF_TREE          = -cvs diff -R -N -w -u -r
+
+                                                        
+                                                        
+
+
 ###############################################################################
 ###############################################################################
@@ -101 +125 @@
                 all-install \
                 \
+                all-symlinks-unlink \
         all-ended
 
@@ -207 +232 @@
         
 
-                        
 all-install:    \
         gcc-install
@@ -214 +238 @@
 
         
+all-diff: \
+        gcc-diff \
+        binutils-diff \
+        emx-diff \
+        
         
 ###############################################################################
@@ -255 +284 @@
 #               directories would cause 'cvs update -d' to refetch stuff.
 #
+#               IMPORTANT! Take care, the 'symlined' stuff will be removed at the
+#               end of the build. Remeber to do all-symlinks-unlink before a fresh
+#               build is started as the duplicated binutils things doesn't get
+#               updated by cvs.
+#
 #
 #w##############################################################################
@@ -262 +296 @@
                 all-symlinks-binutils
 
+all-symlinks-unlink: \
+                all-symlinks-unlink-binutils
+                
+                
 ifeq "$(BUILD_PLATFORM)" "OS2"
 TOOL_SYMLINK_FILE   = cp
@@ -348 +386 @@
                 fi ; \
         done
+        -ls -a1 src/gcc/.sym*
 
 all-symlinks-unlink-binutils:
@@ -362 +401 @@
                 fi ; \
         done
+        -ls -a1 src/gcc/.sym*
                                                 
 
@@ -461 +501 @@
                 --without-included-gettext \
                 --with-local-prefix=$(subst \,/,$(PATH_EMXPGCC)) \
-                --prefix=$(PATH_BIND)/gcc322 \
+                --prefix=$(ALL_PREFIX) \
                 --with-gnu-ld \
                 --with-gnu-as \
@@ -473 +513 @@
                 --without-included-gettext \
                 --with-local-prefix=$(subst \,/,$(PATH_EMXPGCC)) \
-                --prefix=$(PATH_BIND)/gcc322 \
+                --prefix=$(ALL_PREFIX) \
                 --with-gnu-ld \
                 --with-gnu-as \
@@ -486 +526 @@
 #       Repeating the prefix doesn't hurt anybody.
 gcc-install-it:
-        $(MAKE) prefix=$(PATH_BIND)/gcc322 install
+        $(MAKE) prefix=$(PATH_BIND)/usr install
         
 
 # Generate diffs for GCC (v3.2.2) - part of packing a release.
-.PHONY: gcc-diff $(PATH_BIN)/usr/src/gcc/gcc-3.2.2.diff
-gcc-diff: $(PATH_BIN)/usr/src/gcc/gcc-3.2.2.diff
-$(PATH_BIN)/usr/src/gcc/gcc-3.2.2.diff:
+.PHONY: gcc-diff $(ALL_PREFIX)/src/diffs/gcc-$(GCC_VERSION).diff
+gcc-diff: $(ALL_PREFIX)/src/diffs/gcc-$(GCC_VERSION).diff
+$(ALL_PREFIX)/src/diffs/gcc-$(GCC_VERSION).diff:
         mkdir -p $(@D)
-        -cvs diff -R -N -w -c -r GCC_3-2-2 src/gcc > $@
+        $(TOOL_CVS_DIFF_TREE) $(GCC_CVS_REL) src/gcc > $@
 
 
@@ -571 +611 @@
                 $< \
                 --enable-shared \
-                --prefix=$(PATH_BIND)/gcc322 "
+                --prefix=$(ALL_PREFIX) "
         $(ASH) -c "cd libiberty && \
                 $(PATH_TOP)/src/gcc/libiberty/configure \
-                --prefix=$(PATH_BIND)/gcc322 "
+                --prefix=$(ALL_PREFIX) "
         touch $(PATH_OBJ)/binutils/.ts.configured
         
@@ -581 +621 @@
 #       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
-$(PATH_BIN)/usr/src/binutils/binutils-2.11.2.diff:
+        $(MAKE) prefix=$(PATH_BIND)/usr install
+
+
+
+# Generate diffs for Binutils (part of packing).
+.PHONY: binutils-diff $(ALL_PREFIX)/src/diffs/binutils-$(BINUTILS_VERSION).diff
+binutils-diff: $(ALL_PREFIX)/src/diffs/binutils-$(BINUTILS_VERSION).diff
+$(ALL_PREFIX)/src/diffs/binutils-$(BINUTILS_VERSION).diff:
         mkdir -p $(@D)
-        -cvs diff -R -N -w -c -r BINUTILS_2-11-2 src/binutils > $@
-
-
-
-
+        $(TOOL_CVS_DIFF_TREE) $(BINUTILS_CVS_REL) src/binutils > $@
+
+
+
+                                                        
 
         
@@ -612 +652 @@
         echo "Warning!!! EMX not yet done!"
         
+                                                                        
+                                                                        
+                                                                        
+                                                                        
+                                                                        
+                                                                        
+# Generate diffs for Binutils (part of packing).
+.PHONY: binutils-diff $(ALL_PREFIX)/src/diffs/emx-$(EMX_VERSION).diff
+emx-diff: $(ALL_PREFIX)/src/diffs/emx-$(EMX_VERSION).diff
+$(ALL_PREFIX)/src/diffs/emx-$(EMX_VERSION).diff:
+        mkdir -p $(@D)
+        $(TOOL_CVS_DIFF_TREE) $(EMX_CVS_REL) src/emx > $@
+