diff --git a/configure/CONFIG_ADDONS b/configure/CONFIG_ADDONS
index 15c4feb15..937e7bb33 100644
--- a/configure/CONFIG_ADDONS
+++ b/configure/CONFIG_ADDONS
@@ -162,11 +162,11 @@ OBJS_HOST+=$(OBJS_HOST_DEFAULT)
 endif
 endif
 
-ifneq ($(strip $(LIBOBJS_$(OS_CLASS))),)
-LIBOBJS+=$(subst -nil-,,$(LIBOBJS_$(OS_CLASS)))
+ifneq ($(strip $(LDOBJS_$(OS_CLASS))),)
+LDOBJS+=$(subst -nil-,,$(LDOBJS_$(OS_CLASS)))
 else
-ifneq (,$(strip $(LIBOBJS_DEFAULT)))
-LIBOBJS+=$(LIBOBJS_DEFAULT)
+ifneq (,$(strip $(LDOBJS_DEFAULT)))
+LDOBJS+=$(LDOBJS_DEFAULT)
 endif
 endif
 
diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON
index d54738df8..17e19e1b0 100644
--- a/configure/CONFIG_COMMON
+++ b/configure/CONFIG_COMMON
@@ -115,13 +115,13 @@ JAR =
 #--------------------------------------------------
 # obj files
 
-TARGET_OBJS = $(addsuffix $(OBJ),$(basename $($*_OBJS)))
+TARGET_OBJS =  $($*_LDOBJS) $(addsuffix $(OBJ),$(basename $($*_OBJS)))
 
 PRODUCT_OBJS = $(addsuffix $(OBJ),$(basename $(SRCS) $(PROD_SRCS) $(PROD_OBJS)))
-PROD_LD_OBJS = $(TARGET_OBJS) $(PRODUCT_OBJS)
+PROD_LD_OBJS = $(LDOBJS) $(TARGET_OBJS) $(PRODUCT_OBJS)
 
 LIBRARY_OBJS = $(addsuffix $(OBJ),$(basename $(SRCS) $(LIB_SRCS) $(LIBSRCS) $(LIB_OBJS)))
-LIBRARY_LD_OBJS = $(TARGET_OBJS) $(LIBRARY_OBJS)
+LIBRARY_LD_OBJS = $(LDOBJS) $(TARGET_OBJS) $(LIBRARY_OBJS)
 
 #--------------------------------------------------
 # WIN95/NT resource files
diff --git a/configure/tools/makeMakefileInclude.pl b/configure/tools/makeMakefileInclude.pl
index d80f9ccfc..c04a884a0 100755
--- a/configure/tools/makeMakefileInclude.pl
+++ b/configure/tools/makeMakefileInclude.pl
@@ -52,6 +52,13 @@ foreach $name ( @nameList ) {
 	print OUT "${name}_OBJS+=\$(${name}_OBJS_DEFAULT)\n";
 	print OUT "endif\n";
 	print OUT "endif\n";
+	print OUT "ifneq (\$(strip \$(${name}_LDOBJS_\$(OS_CLASS))),)\n";
+	print OUT "${name}_LDOBJS+=\$(subst -nil-,,\$(${name}_LDOBJS_\$(OS_CLASS)))\n";
+	print OUT "else\n";
+	print OUT "ifdef ${name}_LDOBJS_DEFAULT\n";
+	print OUT "${name}_LDOBJS+=\$(${name}_LDOBJS_DEFAULT)\n";
+	print OUT "endif\n";
+	print OUT "endif\n";
 	print OUT "ifneq (\$(strip \$(${name}_LIBS_\$(OS_CLASS))),)\n";
 	print OUT "${name}_LDLIBS+=\$(subst -nil-,,\$(${name}_LIBS_\$(OS_CLASS)))\n";
 	print OUT "else\n";