Changeset 456

Timestamp:

Jul 28, 2003, 12:22:33 AM (22 years ago)

Author:

bird

Message:

Corrected a bug in the libcXY.dll linking.

File:

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

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

@@ -52 +52 @@
 LIBC.LIBS       := $.omf/c.lib $.omf/c_app.lib
 LIBC.DEPS       := $.omf/os2stub.bin
-LIBC.DLL.OBJS   := 
+LIBC.DLL.OBJS   :=
 LIBC.DIRS       := $(sort $(dir $(LIBC.OBJS) $(LIBC.DEPS) $(LIBC.DLL.OBJS)))
 
@@ -67 +67 @@
 # LIBC linking.
 $(LIBC.DLL): $(LIBC.OBJS) $(LIBC.LIBS) $(LIBC.DEF) $(LIBC.DEPS)
-        $(LD) -o $(@:.dll=.dbg) -Zomf $(subst -s,,$(LDFLAGS.DLL)) -nostdlib  \
+        $(LD) -o $(@) -Zomf $(subst -s,,$(LDFLAGS.DLL)) -nostdlib  \
             $(LIBC.DEF) \
                 $(LIBC.OBJS) \
@@ -74 +74 @@
                 -Zlinker -STUB:$.omf/os2stub.bin
 ifeq ($(MODE),opt)
-        cp $(@:.dll=.dbg) $@
+        cp $@ $(@:.dll=.dbg)
         lxlite /X /AS /ZS:128 $@
 endif
@@ -135 +135 @@
   $(INS)lib/$(notdir $(LIBC.DLL:.dll=.dbg)) \
   $(addprefix $(INS)lib/,$(notdir $(LIBC.IMPLIB))) \
-  $(INS)lib/$(notdir $(LIBC.PRF.DLL)) 
+  $(INS)lib/$(notdir $(LIBC.PRF.DLL))
 
 $(INS)lib/$(notdir $(LIBC.DLL)): $(LIBC.DLL)
@@ -144 +144 @@
 
 ifeq ($(MODE),opt)
-INS.FILES       += $(INS)lib/$(notdir $(LIBC.DLL:.dll=.dbg)) 
+INS.FILES       += $(INS)lib/$(notdir $(LIBC.DLL:.dll=.dbg))
 
 $(INS)lib/$(notdir $(LIBC.DLL:.dll=.dbg)): $(LIBC.DLL:.dll=.dbg)
         $(call CP,$<,$@)
-endif  
+endif
 
 $(addprefix $(INS)lib/,$(notdir $(LIBC.IMPLIB))): $(LIBC.IMPLIB)