Changeset 204

Timestamp:

May 20, 2003, 4:47:45 PM (22 years ago)

Author:

bird

Message:

Added a bunch of <sometool>.BUILT macros which we can .MDEP on.

File:

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

trunk/src/emx/Makefile

@@ -82 +82 @@
 DO.LINK.dll = $(LD) $(strip $(LDFLAGS.DLL) $(filter-out -l%,$1)) -o $@ $(^O) $(^DEF) $(^LIB) $(filter -l%,$1)
 
-# emxbind tool
-EMXBIND = $(if $(wildcard $./$(TOOLFMT)/emxbind$E),$.$(TOOLFMT)/)emxbind$E
+# emxbind tool - you can depend on EMXBIND.BUILT :-)
+EMXBIND = $(if $(wildcard $(EMXBIND.BUILT)),$(EMXBIND.BUILT),emxbind$E)
+EMXBIND.BUILT = $.$(TOOLFMT)/emxbind$E
 # emxbind flags
 EMXBINDFLAGS = -q $(EMXBINDFLAGS.$(MODE))
@@ -103 +104 @@
 
 # The tool to extract exports from object files and archives
-EMXEXP = $(if $(wildcard $./$(TOOLFMT)/emxexp$E),$.$(TOOLFMT)/)emxexp$E
+EMXEXP = $(if $(wildcard $(EMXEXP.BUILT)),$(EMXEXP.BUILT),emxexp$E)
+EMXEXP.BUILT = $./$(TOOLFMT)/emxexp$E
 
 # The tool to create import libraries
-IMPLIB = $(if $(wildcard $./$(TOOLFMT)/emximp$E),$.$(TOOLFMT)/)emximp$E
+IMPLIB = $(if $(wildcard $(IMPLIB.BUILT)),$(IMPLIB.BUILT),emximp$E)
+IMPLIB.BUILT = $./$(TOOLFMT)/emximp$E
 IMPLIBFLAGS.prof = -m
 IMPLIBFLAGS.KIND = $(foreach x,$(subst -, ,$(firstword $(subst /, ,$(subst $.,,$@)))),$(IMPLIBFLAGS.$x))
@@ -119 +122 @@
 
 # How to convert an a.out file to the OMF format
-# bird: use the one we build for explicit emxomf conversions.
-# todo: make sure emxomf is build first.
-#DO.AOUT2OMF = emxomf $(strip $1 -o) $@ $<
-DO.AOUT2OMF = $(if $(wildcard $./$(TOOLFMT)/emxomf$E),$.$(TOOLFMT)/)emxomf$E  $(strip $1 -o) $@ $<
+EMXOMF = $(if $(wildcard $(EMXOMF.BUILT)),$(EMXOMF.BUILT),emxomf$E)
+EMXOMF.BUILT = $./$(TOOLFMT)/emxomf$E
+DO.AOUT2OMF = $(EMXOMF) $(strip $1 -o) $@ $<
 
 # How to filter just the object files from $^