Changeset 217

Timestamp:

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

Author:

bird

Message:

Dependencies and tools we built.

File:

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

trunk/src/emx/Makefile

@@ -83 +83 @@
 
 # emxbind tool
-EMXBIND = $(call FINDTOOL,emxbind)
-EMXBIND.BUILD = $.$(TOOLFMT)/emxbind$E
+#EMXBIND = $(call FINDTOOL,emxbind)
+EMXBIND = $.$(TOOLFMT)/emxbind$E
+EMXBIND.DEPON = emxbind $.$(TOOLFMT)/emxbind$E
 # emxbind flags
 EMXBINDFLAGS = -q $(EMXBINDFLAGS.$(MODE))
@@ -106 +107 @@
 # removing unused stuff (like empty lines and comments)
 # and sorting alphabetically (looks nicer).
-EMXEXP = $(call FINDTOOL,emxexp)
-EMXEXP.BUILD = $.$(TOOLFMT)/emxexp$E
+#EMXEXP = $(call FINDTOOL,emxexp)
+EMXEXP = $.$(TOOLFMT)/emxexp$E
+EMXEXP.DEPON = emxexp $.$(TOOLFMT)/emxexp$E
 EMXEXPFLAGS = -u
 DO.EMXEXP = $(EMXEXP) $(strip $(EMXEXPFLAGS) $1) $^ | sed -e "/^$$/d" -e "/^ *;/d" | sort -d >>$@
 
 # The tool to create import libraries
-IMPLIB = $(call FINDTOOL,emximp)
-IMPLIB.BUILT = $.$(TOOLFMT)/emximp$E
+#IMPLIB = $(call FINDTOOL,emximp)
+IMPLIB = $.$(TOOLFMT)/emximp$E
+EMXIMP.DEPON = emximp $.$(TOOLFMT)/emximp$E
 IMPLIBFLAGS.prof = -m
 IMPLIBFLAGS.KIND = $(foreach x,$(subst -, ,$(firstword $(subst /, ,$(subst $.,,$@)))),$(IMPLIBFLAGS.$x))
@@ -126 +129 @@
 
 # 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.BUILT = $.$(TOOLFMT)/emxomf$E
+EMXOMF.DEPON = emxomf $.$(TOOLFMT)/emxomf$E
 DO.EMXOMF = $(EMXOMF) $(strip $1 -o) $@ $<
 
@@ -139 +143 @@
 ^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)
+FINDTOOL = $(firstword $(wildcard $.$(TOOLFMT)/$1$E) $(wildcard $(OUT)dbg/aout/$1$E) $1$E)
 
 # A newline