Changeset 1887

Timestamp:

Apr 24, 2005, 6:09:24 AM (20 years ago)

Author:

bird

Message:

Added syslog and socket to the libc import libraries.

File:

• trunk/src/emx/src/lib/libc.smak (modified) (6 diffs, 1 prop)

trunk/src/emx/src/lib/libc.smak

@@ -24 +24 @@
 .MODULE := libc
 .MDESC  := The C library
+.MDEP   := libsocket libsyslog
 
 .TARGET := libc_p_s.a
@@ -68 +69 @@
 LIBC.DLL        := $.omf/libc$(VH)$(VM).dll
 LIBC.IMPLIB     := $.omf/libc_dll.lib $.aout/libc_dll.a
+LIBC.IMPLIB.TCPIPV4 := $.omf/tcpipv4/libc_dll.lib $.aout/tcpipv4/libc_dll.a
 LIBC.DEF        := $.omf/libc.def
 LIBC.OBJS.COMMON := \
@@ -189 +191 @@
         krx.exe src/lib/dlllegacy.cmd -e "_DLL_InitTerm" $@ src/lib/libc.def
 
-# LIBC libraries with dllinit.
-$(LIBC.IMPLIB): $(LIBC.DEF) $.aout/src/lib/startup/dllinit.o
+# LIBC import libraries with dllinit, libsocket and libsyslog.
+# (It's stuff which belongs to libc, but for historical reasons isn't physically in the .dll yet.)
+$(filter %.lib,$(LIBC.IMPLIB) $(LIBC.IMPLIB.TCPIPV4)): $(LIBC.DEF) $.omf/src/lib/startup/dllinit.obj \
+                $.omf/libsocket.lib $.omf/tcpipv4/libsocket.lib \
+                $.omf/libsyslog.lib $.omf/tcpipv4/libsyslog.lib
         $(call RM,$@)
         $(IMPLIB) -o $@ $<
-        $(if $(findstring .lib,$@), $(EMXOMF) -o $.omf/src/lib/startup/dllinit.obj $.aout/src/lib/startup/dllinit.o)
-        $(AR) r $@ $(if $(findstring .lib,$@), $.omf/src/lib/startup/dllinit.obj, $.aout/src/lib/startup/dllinit.o)
+        $(AR) r $@ $(filter %.obj,$^) $(dir $@)libsocket.lib $(dir $@)libsyslog.lib
+
+$(filter   %.a,$(LIBC.IMPLIB) $(LIBC.IMPLIB.TCPIPV4)): $(LIBC.DEF) $.aout/src/lib/startup/dllinit.o  \
+                $.aout/libsocket.a  $.aout/tcpipv4/libsocket.a \
+                $.aout/libsyslog.a  $.aout/tcpipv4/libsyslog.a
+        $(call RM,$@)
+        $(IMPLIB) -o $@ $<
+        echo "CREATE $@" > $@.ar-script
+        echo "ADDMOD $(filter %.o,$^)" >> $@.ar-script
+        echo "ADDLIB $(dir $@)libsocket.a" >> $@.ar-script
+        echo "ADDLIB $(dir $@)libsyslog.a" >> $@.ar-script
+        echo "SAVE" >> $@.ar-script
+        echo "END" >> $@.ar-script
+        $(AR) -M < $@.ar-script
 
 # LIBC.LOG - Logging and checking version of libcXY.dll
@@ -317 +334 @@
 ifndef LIBC_CORE_ONLY
 libc-dll: emxbind emxexp app alias libc libos2 libos2@omf liblazyimp liblazyimp@omf libend \
-                        $(LIBC.DIRS) $(LIBC.DLL) $(LIBC.IMPLIB) \
+                        $(LIBC.DIRS) $(LIBC.DLL) $(LIBC.IMPLIB) $(LIBC.IMPLIB.TCPIPV4) \
                         $(LIBC.PRF.DIRS) $(LIBC.PRF.DLL) \
                         $(LIBC.LOG.DIRS) $(LIBC.LOG.DLL) \
@@ -323 +340 @@
 else
 libc-dll: emxbind emxexp app alias libc libos2 libos2@omf liblazyimp liblazyimp@omf libend \
-                        $(LIBC.DIRS) $(LIBC.DLL) $(LIBC.IMPLIB)
+                        $(LIBC.DIRS) $(LIBC.DLL) $(LIBC.IMPLIB) $(LIBC.IMPLIB.TCPIPV4)
 endif
 
 # Installation.
-INS.FILES       += $(INS)lib/$(notdir $(LIBC.DLL)) \
+INS.FILES       += \
+  $(INS)lib/$(notdir $(LIBC.DLL)) \
   $(INS)lib/$(notdir $(LIBC.DLL:.dll=.map)) \
-  $(addprefix $(INS)lib/,$(notdir $(LIBC.IMPLIB)))
+  $(addprefix $(INS)lib/,$(notdir $(LIBC.IMPLIB))) \
+  $(addprefix $(INS)lib/tcpipv4/,$(notdir $(LIBC.IMPLIB.TCPIPV4)))
 ifndef LIBC_CORE_ONLY
 INS.FILES       += \
@@ -368 +387 @@
 
 $(addprefix $(INS)lib/,$(notdir $(LIBC.IMPLIB))): $(LIBC.IMPLIB)
+        $(call CP,$^,$(dir $@))
+
+$(addprefix $(INS)lib/tcpipv4/,$(notdir $(LIBC.IMPLIB.TCPIPV4))): $(LIBC.IMPLIB.TCPIPV4)
         $(call CP,$^,$(dir $@))