Changeset 123 for trunk/src/emx/common.smak

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/common.smak (modified) (5 diffs, 1 prop)

trunk/src/emx/common.smak

@@ -19 +19 @@
 .tmp := omf
 endif # neq ($(findstring aout,$(.TKIND)),)
-ifneq ($(findstring mt,$(.TKIND)),)
-.tmp += mt
-else
-.tmp += st
-endif # neq ($(findstring mt,$(.TKIND)),)
 ifneq ($(findstring prof,$(.TKIND)),)
 .tmp += prof
@@ -29 +24 @@
 .TKIND := $(.tmp)
 .TKIND.DIR := $(subst $(SPACE),-,$(.TKIND))/
-.tmp :=
+
+ifdef .TARGET
 
 # .TARG is same as .TARGET except that it has a st/ or mt/ prefix
@@ -35 +31 @@
 
 ifdef .INSDIR
-DO.INSTALL += cp.exe $.$(.TARG) $(INS)$(.INSDIR)$(.TARGET)$(NL)
+DO.INSTALL += $(call CP,$.$(.TARG),$(INS)$(.INSDIR)$(.TARGET))$(NL)
 INSDIRS += $(INS)$(.INSDIR)
 endif # def .INSDIR
+
+# We know how to create dependency files for .c and .cpp files
+.tmp := $(strip $(filter %.c,$(.TSRC)) $(filter %.cpp,$(.TSRC)))
+ifdef .tmp
+# Read the dependency file
+-include $.$(.TKIND.DIR)dep-$(.TARGET).smak
+
+TARGDEPEND += $.$(.TKIND.DIR)dep-$(.TARGET).smak
+
+ifdef BUILD_DEPS
+# How to build the dependency file
+$.$(.TKIND.DIR)dep-$(.TARGET).smak: $(.tmp)
+        $(DO.DEPS)
+endif # BUILD_DEPS
+endif # def .tmp
+
+endif # def .TARGET
 
 # If module has any source files, find respective object file names
@@ -47 +60 @@
 TARGDIRS += $(.DIRS)
 
+ifdef .MDEP
+$(.MODULE): $(.MDEP)
+.MDEP :=
+endif
+
+ifdef .MODULE
 $(.MODULE): $(.DIRS) $.$(.TARG)
+endif
 
 # Remove the names of files for which we already generated build rules
@@ -61 +81 @@
 BUILD.RULES += $(.TSRC)
 .TSRC := $(filter-out $(.OBJS),$(subst :, ,$(.TSRC)))
-
-#.TSRC := $(foreach x,$(.TSRC),$(if $(findstring $(call OBJFILE,$x):$x,$(BUILD.RULES)),,$x))
-#BUILD.RULES += $(foreach x,$(.TSRC),$(if $(findstring $(call OBJFILE,$x):$x,$(BUILD.RULES)),,$(call OBJFILE,$x):$x))
 
 # Generate compilation rules for C files