Changeset 123 for trunk/src/emx/Makefile

Timestamp:

May 12, 2003, 12:48:43 PM (22 years ago)

Author:

zap

Message:

Started the work for re-designing the EMX C runtime library to not require
EMX.DLL. The new design is projected to be as follows:

• all emx syscalls are replaced with the routines from the old sys.lib library which is now compilable in both a.out and OMF formats.
• the sys.a library should be made replaceable and selectable by some gcc switch (e.g. -msyslib=emx would link with emx.a instead of sys.a which would give almost full backward compatibility with emx).
• All C functions names were renamed to not contain the starting underscore (e.g. fopen and not _fopen). The underscored aliases will be added later with the c_alias library (which will be generated automatically from all public symbols of libc; any exported symbol that do not start with an underscore will be given an underscored alias unless such a symbol is already defined).

Also a lot of updates to the building system. It is now much faster (thanks
to Knut's suggestion of using ash's builtin echo).
Also re-wrote thunk1.asm and thunk2.asm to GAS format; this removes the need
for MASM and makes it possible to use 16-bit functions in a.out programs
without the need for EMX.DLL.
Also made a lot of small changes I don't remember now.

File:

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

trunk/src/emx/Makefile

@@ -23 +23 @@
 OUT = out/
 # Base installation directory
-INS = out/install/
+INS = out/$(MODE)/install/
 # CPU type (pretend we are portable ;-)
 CPU = 386
+# The object file format to use for tools (emxomf, ld and friends)
+TOOLFMT.dbg = aout
+TOOLFMT.opt = omf
+TOOLFMT = $(TOOLFMT.$(MODE))
 
 # Use ash.exe which is quite fast (comparable to cmd.exe) but has more features
@@ -44 +48 @@
 CC = gcc -c
 # The C compiler flags
-CFLAGS = -Wall -Iinclude -Isrc/include $(CFLAGS.$(MODE)) $(CFLAGS.KIND)
+CFLAGS.INC = -Iinclude -Isrc/include
+CFLAGS = -Wall -mstack-arg-probe -Zmt $(CFLAGS.INC) $(CFLAGS.$(MODE)) $(CFLAGS.KIND)
 # The additional C compiler flags for different build modes
 CFLAGS.opt = -s -O3 -fomit-frame-pointer
@@ -50 +55 @@
 CFLAGS.aout =
 CFLAGS.omf = -Zomf
-CFLAGS.st =
-CFLAGS.mt = -Zmt
 CFLAGS.prof = -pg
 # The object files are put in subdirectory objectformat-targetkind,
@@ -63 +66 @@
 LD = gcc
 # Linker flags
-LDFLAGS = $(LDFLAGS.$(MODE)) $(LDFLAGS.KIND)
+LDFLAGS = -Zmt $(LDFLAGS.$(MODE)) $(LDFLAGS.KIND)
 # Linker flags for different build modes
 LDFLAGS.opt = -s
@@ -69 +72 @@
 LDFLAGS.aout =
 LDFLAGS.omf = -Zomf -Zsys -Zsmall-conv -Zlinker /PM:VIO
-LDFLAGS.st =
-LDFLAGS.mt = -Zmt
-LDFLAGS.stp = -pg
-LDFLAGS.mtp = -pg -Zmt
+LDFLAGS.prof = -pg
 # Linker flags for different kinds of target
 LDFLAGS.KIND = $(foreach x,$(subst -, ,$(firstword $(subst /, ,$(subst $.,,$@)))),$(LDFLAGS.$x))
@@ -88 +88 @@
 ARFLAGS = crs
 DO.LIBRARY = $(AR) $(ARFLAGS) $@ $(^O)
+
+# How to create dependencies
+MAKEDEP = makedep
+MAKEDEPFLAGS = $(CFLAGS.INC)
+DO.DEPS = $(MAKEDEP) $(MAKEDEPFLAGS) \
+  -I$(subst $(SPACE), -I,$(sort $(dir $^))) -p$(@D)/ -c -S -f$@ $^
+
+# How to convert an a.out file to the OMF format
+DO.AOUT2OMF = emxomf $(strip $1 -o) $@ $<
 
 # How to filter just the object files from $^
@@ -109 +118 @@
 SEP := ==========================================================================
 
-# How to remove a file
+# How to remove one or more files without questions
 RM = rm -f $1
+# How to remove one or more directories without questions
+RMDIR = rm -rf $1
+# How to copy several files to a directory
+CP = cp $1 $2
 # Miscelaneous tools
 MKDIR = mkdir.exe -p $1
@@ -117 +130 @@
 ECHOIZE = $(subst $$,\$$,$1$(strip $(subst $(SPACE)$(COMMA),$(COMMA),$(foreach x,2 3 4 5 6 7 8 9,$(if $($x),$(COMMA) $($x))))))
 # How to output a text string (with appended newline)
-# bird: skip the .exe and ash will use internal echo implementation which is way faster
-#ECHO = echo.exe "$(call ECHOIZE,$1,$2,$3,$4,$5,$6,$7,$8,$9)"
 ECHO = echo "$(call ECHOIZE,$1,$2,$3,$4,$5,$6,$7,$8,$9)"
 # Same but append the text to a file (given with first argument)
-# bird: skip the .exe and ash will use internal echo implementation which is way faster
-#FECHO = echo.exe "$(call ECHOIZE,$2,$3,$4,$5,$6,$7,$8,$9)" >> "$1"
 FECHO = echo "$(call ECHOIZE,$2,$3,$4,$5,$6,$7,$8,$9)" >> "$1"
 # How to replace the source file extension with a .o extension
@@ -145 +154 @@
 # Build rules (_@_ replaced by name of generated makefile)
 RULES :=
-
-.PHONY: default help all clean install
+# The list of dependency files
+TARGDEPEND :=
+
+.PHONY: default help all clean install cleandep cleandepend dep depend depdone
 .SUFFIXES:
-.SUFFIXES: .c .cpp .asm .s .o .exe .dll .a .lib
+.SUFFIXES: .c .cpp .asm .s .o .exe .dll .a .lib .obj
 
 # Default target
@@ -172 +183 @@
         @$(call ECHO,    clean - remove all generated files (remove all built files))
         @$(call ECHO,    install - generate a installation tree in $(INS))
+        @$(call ECHO,    dep - generate dependency files for all changed targets)
+        @$(call ECHO,    cleandep - remove all dependency file)
         @$(call ECHO,$(SEP))
         @$(call ECHO,There are a number of variables than can be set in the make)
@@ -181 +194 @@
         @$(call ECHO,$(SEP))
 
-all: $(MODULES)
+all: $(TARGDIRS) $(MODULES)
 
 clean:
-        rm -rf $(OUT)
-
-install: $(INSDIRS)
+        $(call RMDIR,$(OUT))
+
+cleandep cleandepend:
+        $(call RM,$(TARGDEPEND))
+
+dep depend:
+        @$(MAKE) --no-print-directory BUILD_DEPS=1 depdone
+
+depdone:
+        @$(call ECHO,Dependency files succesfully updated)
+
+install: all $(INSDIRS)
         $(DO.INSTALL)
 
-$(OUT) $. $(INSDIRS) $(TARGDIRS):
+$. $(INSDIRS) $(TARGDIRS):
         $(call MKDIR,$@)
 
-# bird: add rule for generating the rules.
-rules: rules-rm $(OUT)genrules.smak
-rules-rm:
-        @$(call RM,$(OUT)genrules.smak)
-        
-#$(OUT)genrules.smak: $(OUT) Makefile $(SUBMAK)
-# bird: depeding on $(OUT) make it unstable.
-$(OUT)genrules.smak: Makefile $(SUBMAK)
-        $(call MKDIR,$(@D))
-        @$(call ECHO,Please wait, rebuilding make rules $@ ...)
+$(OUT)genrules.smak: $(SUBMAK) # Makefile $(wildcard *.smak)
+        @$(call MKDIR,$(OUT))
+        @$(call ECHO,Please wait, rebuilding make rules ...)
         @$(call RM,$@)
         @$(call FECHO,$@,# Autogenerated file -- DO NOT EDIT!)
         @$(subst _@,$@,$(RULES))
 
+# The general a.out -> OMF conversion rule for object files
+$.omf/%.obj: $.aout/%.o
+        $(call DO.AOUT2OMF)
+
+# The general a.out -> OMF conversion rule for libraries
+$.omf%.lib: $.aout%.a
+        $(call DO.AOUT2OMF)
+
 -include $(OUT)genrules.smak
-