Changeset 363 for trunk/Makefile

Timestamp:

Jul 11, 2003, 5:40:31 PM (22 years ago)

Author:

bird

Message:

More hacking.

File:

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

trunk/Makefile

@@ -38 +38 @@
 export PATH_BUILTTOOLS = $(PATH_OBJ)/builttools
 export PATH_BUILTTOOLSD= $(PATH_OBJD)/builttools
+PATH_BUILTTOOLS_TMP    = $(PATH_OBJ)/builttools.tmp
+PATH_BUILTTOOLS_TMPD   = $(PATH_OBJD)/builttools.tmp
 
 # Debug info or not (when ever we feel like passing down such options).
@@ -292 +294 @@
 all-preload-unload-obj:
 ifeq "$(BUILD_PLATFORM)" "OS2"
-        -for prog in `emxload -l | sed -e 's|\\\|\/|g' -e 's@.*³[[:blank:]]*@@' | grep '$(PATH_OBJD)'`; \
+        -for prog in `emxload -l | sed -e 's|\\\|\/|g' -e 's@.*³[[:blank:]]*@@' | grep -i '$(PATH_OBJD)'`; \
         do \
+                echo $$prog; \
                 emxload -u $$prog; \
         done
 endif
-        
+
 
 #
@@ -358 +361 @@
         if [ -d $(PATH_OBJ)/gcc ] ; then mv $(PATH_OBJ)/gcc $(PATH_OBJ)/stage1/gcc; fi
         if [ -d $(PATH_OBJ)/emx ] ; then mv $(PATH_OBJ)/emx $(PATH_OBJ)/stage1/emx; fi
+        if [ -d $(PATH_TOP)/src/emx/out ] ; then mv $(PATH_TOP)/src/emx/out $(PATH_OBJ)/stage1/emx_out; fi
         $(MAKE) -f $(MAKEFILE) all-preload
         touch $@
@@ -418 +422 @@
         mkdir -p $(PATH_BUILTTOOLS)/bin $(PATH_BUILTTOOLS)/lib $(PATH_BUILTTOOLS)/include
         
-$(PATH_BUILTTOOLS)/bin/dllar.cmd: $(PATH_TOP)/src/misc/dllar.cmd
+$(PATH_BUILTTOOLS)/bin/dllar.cmd $(PATH_BUILTTOOLS_TMP)/bin/dllar.cmd: $(PATH_TOP)/src/misc/dllar.cmd
         cp $< $@
 
 all-builttools-stage2: \
                 all-banner-builttools-stage2 \
-                $(PATH_BUILTTOOLS)/bin/dllar.cmd \
                 gcc-builttools-stage2 \
                 emx-builttools-stage2 \
-                all-builttools-stage2-libs
-                
+                all-builttools-stage2-libs \
+                $(PATH_BUILTTOOLS_TMP)/bin/dllar.cmd \
+                all-builttools-clean
+        mv -f $(PATH_BUILTTOOLS_TMP) $(PATH_BUILTTOOLS)
+        
 all-builttools-stage2-libs:
-        -for aoutlib in `find $(PATH_BUILTTOOLS) -name "*.a" | sed -e 's/\.a$$//' `; \
+        -for aoutlib in `find $(PATH_BUILTTOOLS_TMP) -name "*.a" | sed -e 's/\.a$$//' `; \
         do \
                 if [ ! -f $(aoutlib).lib ]; then \
                         echo "  $${aoutlib}"; \
-                        $(PATH_BUILTTOOLS)/bin/emxomf.exe $${aoutlib}.a; \
+                        $(PATH_BUILTTOOLS_TMP)/bin/emxomf.exe $${aoutlib}.a; \
                 fi;\
         done
@@ -720 +726 @@
 ##     WARNING! Another spec HACK!
 gcc-builttools-stage2:
-        $(MAKE) -C $(PATH_OBJ)/gcc prefix=$(PATH_BUILTTOOLSD) install
+        $(MAKE) -C $(PATH_OBJ)/gcc prefix=$(PATH_BUILTTOOLS_TMPD) install
 ##      cp $(PATH_TOP)/src/emx/src/lib/libc.specs $(PATH_OBJ)/gcc/gcc/specs
 
@@ -937 +943 @@
 ##emx-builttools-stage2: emx-builttools-stage2-specs
 emx-builttools-stage2:
-        $(MAKE) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) INS=$(PATH_BUILTTOOLS)/  install
+        $(MAKE) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) INS=$(PATH_BUILTTOOLS_TMP)/  install
 
 ## bird: for now we will just replace the specs with the constantly updated libc specs. 
 emx-builttools-stage2-specs:
-##      -mv -f $(PATH_BUILTTOOLS)/lib/gcc-lib/i386-pc-os2-emx/$(GCC_VERSION)/specs \
-##                 $(PATH_BUILTTOOLS)/lib/gcc-lib/i386-pc-os2-emx/$(GCC_VERSION)/emxspecs
+##      -mv -f $(PATH_BUILTTOOLS_TMP)/lib/gcc-lib/i386-pc-os2-emx/$(GCC_VERSION)/specs \
+##                 $(PATH_BUILTTOOLS_TMP)/lib/gcc-lib/i386-pc-os2-emx/$(GCC_VERSION)/emxspecs
 ##      cp $(PATH_TOP)/src/emx/src/lib/libc.specs \
-##                 $(PATH_BUILTTOOLS)/lib/gcc-lib/i386-pc-os2-emx/$(GCC_VERSION)/specs
+##                 $(PATH_BUILTTOOLS_TMP)/lib/gcc-lib/i386-pc-os2-emx/$(GCC_VERSION)/specs