Changeset 213 for trunk/src/emx/Makefile

Timestamp:

May 21, 2003, 11:57:27 PM (22 years ago)

Author:

zap

Message:

o Added OS/2 Unicode API headers and import file.
o Modified most standard functions in .s files to use the _std_ prefix.
o Fixed c_alias.a build rules so that it uses the correct c.a file (either

debug or optimized depending on build mode).

File:

• trunk/src/emx/Makefile (modified) (8 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 - you can depend on EMXBIND.BUILT :-)
-EMXBIND = $(if $(wildcard $(EMXBIND.BUILT)),$(EMXBIND.BUILT),emxbind$E)
-EMXBIND.BUILT = $.$(TOOLFMT)/emxbind$E
+# emxbind tool
+EMXBIND = $(call FINDTOOL,emxbind)
 # emxbind flags
 EMXBINDFLAGS = -q $(EMXBINDFLAGS.$(MODE))
@@ -103 +102 @@
 DO.LIBRARY = $(call RM,$@); $(AR) $(ARFLAGS)$1 $@ $(^O)
 
-# The tool to extract exports from object files and archives
-EMXEXP = $(if $(wildcard $(EMXEXP.BUILT)),$(EMXEXP.BUILT),emxexp$E)
-EMXEXP.BUILT = $./$(TOOLFMT)/emxexp$E
+# The tool to extract exports from object files and archives,
+# removing unused stuff (like empty lines and comments)
+# and sorting alphabetically (looks nicer).
+EMXEXP = $(call FINDTOOL,emxexp)
+EMXEXPFLAGS = -u
+DO.EMXEXP = $(EMXEXP) $(strip $(EMXEXPFLAGS) $1) $^ | sed -e "/^$$/d" -e "/^ *;/d" | sort -d >>$@
 
 # The tool to create import libraries
-IMPLIB = $(if $(wildcard $(IMPLIB.BUILT)),$(IMPLIB.BUILT),emximp$E)
-IMPLIB.BUILT = $./$(TOOLFMT)/emximp$E
+IMPLIB = $(call FINDTOOL,emximp)
 IMPLIBFLAGS.prof = -m
 IMPLIBFLAGS.KIND = $(foreach x,$(subst -, ,$(firstword $(subst /, ,$(subst $.,,$@)))),$(IMPLIBFLAGS.$x))
@@ -122 +123 @@
 
 # How to convert an a.out file to the OMF format
-EMXOMF = $(if $(wildcard $(EMXOMF.BUILT)),$(EMXOMF.BUILT),emxomf$E)
-EMXOMF.BUILT = $./$(TOOLFMT)/emxomf$E
-DO.AOUT2OMF = $(EMXOMF) $(strip $1 -o) $@ $<
+EMXOMF = $(call FINDTOOL,emxomf)
+DO.EMXOMF = $(EMXOMF) $(strip $1 -o) $@ $<
 
 # How to filter just the object files from $^
@@ -134 +134 @@
 # How to filter the libraries from $^
 ^LIB = $(filter %.$(if $(findstring omf,$(.TKIND)),lib,a),$^)
+# 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)
 
 # A newline
@@ -187 +189 @@
 TARGDEPEND :=
 
-.PHONY: default help all clean install cleandep cleandepend dep depend depdone
+.PHONY: default help all tools clean install cleandep cleandepend dep depend depdone
 .SUFFIXES:
 .SUFFIXES: .c .cpp .asm .s .o .exe .dll .a .lib .obj
@@ -207 +209 @@
 help:
         @$(call ECHO,$(SEP))
-        @$(call ECHO,Welcome to $(PACKAGE) build system!)
+        @$(call ECHO,Welcome to $(PACKAGE) version $(VERSION) build system!)
         @$(call ECHO,$(COPYRIGHT))
         @$(call ECHO,To build something, type 'make {target} {vars}', where {target} is one of:)
         @$(call ECHO,    all - build all available modules)
         @$(call ECHO,    {module-name} - build just a particular module)
+        @$(call ECHO,    tools - build just the tools)
         @$(call ECHO,    clean - remove all generated files (remove all built files))
         @$(call ECHO,    install - generate a installation tree in $(INS))
@@ -247 +250 @@
 # bird: add rule for forcibly re-generating the rules.
 rules:
-        @$(call RM,$(OUT)genrules.smak)
-        $(MAKE) $(OUT)genrules.smak
-
-$(OUT)genrules.smak: $(SUBMAK) # Makefile $(wildcard *.smak)
-        @$(call MKDIR,$(OUT))
+        @$(call RM,$.genrules.smak)
+        $(MAKE) $.genrules.smak
+
+$.genrules.smak: $(SUBMAK) # Makefile $(wildcard *.smak)
+        @$(call MKDIR,$.)
         @$(call ECHO,Please wait, rebuilding make rules ...)
         @$(call RM,$@)
@@ -259 +262 @@
 # The general a.out -> OMF conversion rule for object files
 $.omf/%.obj: $.aout/%.o
-        $(call DO.AOUT2OMF)
+        $(call DO.EMXOMF)
 
 # The general a.out -> OMF conversion rule for libraries
 $.omf%.lib: $.aout%.a
-        $(call DO.AOUT2OMF)
-
--include $(OUT)genrules.smak
+        $(call DO.EMXOMF)
+
+-include $.genrules.smak