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

Timestamp:

May 16, 2003, 9:27:59 AM (23 years ago)

Author:

zap

Message:

o Modified makefiles so that os2.a builds correctly (with Vio, Kbd and friends,

not just from the import files).

o Moved os2.smak to the os2_386 directory (tcp32dll.imp will go into socket.a).
o Added the rules into libc.smak to build libc##.dll (finally it links without

errors! Don't know if it works, though ;-)

o Fixed emxbind so that it doesn't add underscores to exported symbols (taken

from the EXPORTS section of a .def file).

o Fixed emxexp so that it doesn't remove underscores from symbol names.
o Fixed all references to OS/2 functions to not contain an initial underscore

(since they are _System now).

o Added one builder makefile: mkimplib.smak, and two auxiliary submakefiles:

mkomflib.smak (included from both mklib and mkimplib), and a version.smak
that contains the version number, description and copyright for libc.

o Made a lot of small changes in order to remove duplicate symbols in libc.dll.
o Added sys/settime.c which was missing in EMX's -Zomf -Zsys variant.

File:

• trunk/src/emx/common.smak (modified) (4 diffs, 1 prop)

trunk/src/emx/common.smak

@@ -28 +28 @@
 .TKIND := $(.tmp)
 .TKIND.DIR := $(subst $(SPACE),-,$(.TKIND))/
+
 
 ifdef .TARGET
@@ -33 +34 @@
 # .TARG is same as .TARGET except that it has a st/ or mt/ prefix
 .TARG := $(.TKIND.DIR)$(.TARGET)
+
 
 ifdef .INSDIR
@@ -61 +63 @@
 
 .OBJS := $(addprefix $.,$(call OBJFILE,$(.TSRC)))
-.DIRS := $(sort $(dir $(.OBJS)))
-TARGDIRS += $(.DIRS)
+.DIRS += $(sort $(dir $(.OBJS)))
 
 # Remove the names of files for which we already generated build rules
@@ -97 +98 @@
 endif # def .TSRC
 
+
+
+
+
+
+
+
+
+
 ifdef .TARGET
-ifdef .MODULE
-$(.MODULE): $(.DIRS) $.$(.TARG)
-endif
-endif
+$(.MODULE): $.$(.TARG)
+endif # def .TARGET
 
 # Replace the special sequence in .TDEP @O@ with $.$(.TKIND.DIR)