Changeset 260

Timestamp:

May 28, 2003, 6:14:25 PM (22 years ago)

Author:

bird

Message:

Fixed emxomf problem once and for all. ASM too.

File:

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

trunk/src/emx/Makefile

@@ -89 +89 @@
 
 # emxbind tool
-#EMXBIND = $(call FINDTOOL,emxbind)
 EMXBIND = $.$(TOOLFMT)/emxbind$E
 # emxbind flags
@@ -99 +98 @@
 
 # The macro assembler
+ifdef PATH_TOP
+ASM = $(PATH_TOP)/tools/x86.os2/masm/v6.0/binp/ml.exe -c
+else
 ASM = ml -c
+endif
 ASMFLAGS = -Cp -W3 -WX -VM -nologo
 # How to compile an .asm file
@@ -112 +115 @@
 # removing unused stuff (like empty lines and comments)
 # and sorting alphabetically (looks nicer).
-#EMXEXP = $(call FINDTOOL,emxexp)
 EMXEXP = $.$(TOOLFMT)/emxexp$E
 EMXEXPFLAGS = -u
@@ -118 +120 @@
 
 # The tool to create import libraries
-#IMPLIB = $(call FINDTOOL,emximp)
 IMPLIB = $.$(TOOLFMT)/emximp$E
 IMPLIBFLAGS.prof = -m
@@ -132 +133 @@
 
 # How to convert an a.out file to the OMF format
-# We must use FINDTOOL here 'cause of the two libs which emxomf depends on
-EMXOMF = $(call FINDTOOL,emxomf)
+#   Emxomf depends on two libs, we have to detect wethere or not emxomf is built
+#   or not. Unfortunately make isn't up to the job of figuring this out, so we
+#       must use the shell.
+EMXOMF = `test -f '$.$(TOOLFMT)/emxomf$E' && echo '$.$(TOOLFMT)/'`emxomf$E
 DO.EMXOMF = $(EMXOMF) $(strip $1 -o) $@ $<
 
@@ -144 +147 @@
 # How to filter the libraries from $^
 ^LIB = $(strip $(filter %.a,$^) $(filter %.lib,$^))
-# This function finds a tool: if it has been already built, prefer it
-FINDTOOL = $(firstword $(wildcard $.$(TOOLFMT)/$1$E) $(wildcard $(OUT)dbg/aout/$1$E) $1$E)
 
 # A newline