Changeset 748 for trunk/src

Timestamp:

Sep 29, 2003, 4:28:38 PM (22 years ago)

Author:

bird

Message:

It shouldn't be required to build the tools anylonger, but if we do, we should use them.

File:

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

trunk/src/emx/Makefile

@@ -73 +73 @@
 A = .$(if $(findstring omf,$(.TKIND)),lib,a)
 
+# Use the tool we built.
+GETTOOL ?= $.$(TOOLFMT)/$1$E
+# Use the tool we built if present
+GETTOOL2 ?= `test -f '$.$(TOOLFMT)/$1$E' && echo '$.$(TOOLFMT)/'`$1$E
+
 # The C compiler
 CC = gcc -c -Zmt
 # The C compiler flags
-CFLAGS.INC  += -Iinclude -Isrc/include
+ifndef NO_LOCAL_HEADERS
+CFLAGS.INC  += -Iinclude
+endif
+CFLAGS.INC  += -Isrc/include
 CFLAGS      = -Wall -Wmissing-prototypes -mstack-arg-probe $(CFLAGS.INC) $(CFLAGS.$(MODE)) $(CFLAGS.KIND)
 # The additional C compiler flags for different build modes
@@ -126 +134 @@
 
 # emxbind tool
-EMXBIND = $.$(TOOLFMT)/emxbind$E
+EMXBIND = $(call GETTOOL,emxbind)
 # emxbind flags
 EMXBINDFLAGS = -bq $(EMXBINDFLAGS.$(MODE))
@@ -146 +154 @@
 
 # The tool to create an archive
-AR = $(if $(findstring .lib,$@),emxomf)ar
+AR = $(if $(findstring .lib,$@), $(call GETTOOL2,emxomfar),ar)
 ARFLAGS = crs
 DO.LIBRARY = $(call RM,$@); $(AR) $(ARFLAGS)$1 $@ $(^O)
@@ -153 +161 @@
 # removing unused stuff (like empty lines and comments)
 # and sorting alphabetically (looks nicer).
-EMXEXP = $.$(TOOLFMT)/emxexp$E
+EMXEXP = $(call GETTOOL,emxexp)
 EMXEXPFLAGS = -u
 DO.EMXEXP = $(EMXEXP) $(strip $(EMXEXPFLAGS) $1) | sed -e "/^$$/d" -e "/^ *;/d" | sort -d >>$2
 
 # The tool to create import libraries
-IMPLIB = $.$(TOOLFMT)/emximp$E
+IMPLIB = $(call GETTOOL,emximp)
 IMPLIBFLAGS.prof = -m
 IMPLIBFLAGS.KIND = $(foreach x,$(subst -, ,$(firstword $(subst /, ,$(subst $.,,$@)))),$(IMPLIBFLAGS.$x))
@@ -174 +182 @@
 #   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
+EMXOMF = $(call GETTOOL2,emxomf)
 DO.EMXOMF = $(EMXOMF) $(strip $1 -o) $@ $(if $<,$<, $(subst /omf/,/aout/,$(@:.obj=.o)) )