Changeset 102 for trunk/Makefile

Timestamp:

May 7, 2003, 6:15:06 PM (22 years ago)

Author:

bird

Message:

Reneabled and fixed symlinking.

File:

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

trunk/Makefile

@@ -259 +259 @@
 ###############################################################################
 ###############################################################################
-all-symlinks:
-# Don't do this till we've got binutils working.
-#               all-symlinks-binutils
+all-symlinks: \
+                all-symlinks-binutils
 
 ifeq "$(BUILD_PLATFORM)" "OS2"
@@ -274 +273 @@
 TOOL_UNSYMLINK_DIR  = rm
 endif
-                        
+
+# ld is broken, so don't use it!        
+# ld \
+
 SYMLINKS_BINUTILS_TO_GCC_DIRS = \
 bfd \
@@ -282 +284 @@
 gprof \
 intl \
-ld \
 opcodes \
 texinfo \
@@ -337 +338 @@
                 if [ ! -f "$(PATH_TOP)/src/gcc/$$file" ]; then  \
                         $(TOOL_SYMLINK_FILE)  $(PATH_TOP)/src/binutils/$$file $(PATH_TOP)/src/gcc/$$file && \
-                        touch                 $(PATH_TOP)/src/gcc/$${file}.symlinked ; \
+                        touch                 $(PATH_TOP)/src/gcc/.symlinked.`echo $${file} | sed -e 's@/@_@g'`; \
                 fi ; \
         done
@@ -343 +344 @@
                 if [ ! -d "$(PATH_TOP)/src/gcc/$$dir" ] ; then  \
                         $(TOOL_SYMLINK_MKDIR) $(PATH_TOP)/src/gcc/$$dir && \
-                        touch                 $(PATH_TOP)/src/gcc/$${dir}.symlinked && \
-                        $(TOOL_SYMLINK_DIR)   $(PATH_TOP)/src/binutils/$$dir $(PATH_TOP)/src/gcc/ ; \
+                        touch                 $(PATH_TOP)/src/gcc/.symlinked.`echo $${dir} | sed -e 's@/@_@g'` && \
+                        $(TOOL_SYMLINK_DIR)   $(PATH_TOP)/src/binutils/$$dir $(PATH_TOP)/src/gcc/`echo $${dir}| sed -e '/\//!d' -e 's@\([a-zA-z0-9]*\)/.*@\1/@'` ; \
                 fi ; \
         done
@@ -350 +351 @@
 all-symlinks-unlink-binutils:
         for file in $(SYMLINKS_BINUTILS_TO_GCC_FILES); do \
-                if [ -f "$(PATH_TOP)/src/gcc/$${file}.symlinked" ]; then  \
+                if [ -f "$(PATH_TOP)/src/gcc/.symlinked.`echo $${file} | sed -e 's@/@_@g'`" ]; then  \
                         rm  $(PATH_TOP)/src/gcc/$${file} && \
-                        rm  $(PATH_TOP)/src/gcc/$${file}.symlinked ; \
+                        rm  $(PATH_TOP)/src/gcc/.symlinked.`echo $${file} | sed -e 's@/@_@g'` ; \
                 fi ; \
         done
         for dir in $(SYMLINKS_BINUTILS_TO_GCC_DIRS) ; do \
-                if [ -f "$(PATH_TOP)/src/gcc/$$dir.symlinked" ] ; then  \
+                if [ -f "$(PATH_TOP)/src/gcc/.symlinked.`echo $${dir} | sed -e 's@/@_@g'`" ] ; then  \
                         $(TOOL_UNSYMLINK_DIR) $(PATH_TOP)/src/gcc/$${dir} && \
-                        rm                    $(PATH_TOP)/src/gcc/$${dir}.symlinked ; \
+                        rm                    $(PATH_TOP)/src/gcc/.symlinked.`echo $${dir} | sed -e 's@/@_@g'`; \
                 fi ; \
         done
@@ -495 +496 @@
 
 
+                
+                
+                
+                
+                
+                
 
 ###############################################################################