Platform Independe EXTRA_LIBS fixes

gconfig/FreeBSD2.mk

@@ -30,10 +30,10 @@ CPU_ARCH		= x86
 OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
 
 ifdef USE_PTHREADS
-	OS_LIBS		= -lc_r
+	OS_LIBS		+= -lc_r
 	DEFINES		+= -D_PR_NEED_FAKE_POLL
 else
-	OS_LIBS		= -lc
+	OS_LIBS		+= -lc
 endif
 
 ARCH			= freebsd

gconfig/Linux.mk

@@ -54,7 +54,7 @@ ifeq ($(OS_RELEASE),2.0)
 endif
 
 OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DLINUX -Dlinux -D_POSIX_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR
-OS_LIBS			= -L/lib -ldl -lc
+OS_LIBS			+= -L/lib -ldl -lc
 
 ifdef USE_PTHREADS
 	DEFINES		+= -D_REENTRANT -D_PR_NEED_FAKE_POLL

gconfig/NEC4.2.mk

@@ -37,7 +37,7 @@ MKSHLIB			= $(LD) $(DSO_LDOPTS)
 RANLIB			= /bin/true
 
 OS_CFLAGS		+= $(ODD_CFLAGS) -DSVR4 -D__SVR4 -DNEC -Dnec_ews -DHAVE_STRERROR
-OS_LIBS			= -lsocket -lnsl -ldl $(LDOPTIONS)
+OS_LIBS			+= -lsocket -lnsl -ldl $(LDOPTIONS)
 LDOPTIONS		= -lc -L/usr/ucblib -lucb
 
 NOSUCHFILE		= /nec-rm-f-sucks

gconfig/UNIX.mk

@@ -35,6 +35,12 @@ MKDEPEND_DIR    = $(GDEPTH)/gconfig/mkdepend
 MKDEPEND        = $(MKDEPEND_DIR)/$(OBJDIR_NAME)/mkdepend
 MKDEPENDENCIES  = $(NSINSTALL_DIR)/$(OBJDIR_NAME)/depend.mk
 
+GUI_LIBS        = -lXt -lX11
+OPT_SLASH       = /
+LIB_PREFIX      = lib
+LIB_SUFFIX      = .a
+NSPR_LIBS       = plds21 plc21 nspr21 msgc21
+
 ####################################################################
 #
 # One can define the makefile variable NSDISTMODE to control

gconfig/WIN32.mk

@@ -49,6 +49,13 @@ OUT_NAME     = -out:
 
 OS_LIBS = gdi32.lib kernel32.lib advapi32.lib user32.lib
 
+GUI_LIBS = 
+NSPR_LIBS = libplds21 libplc21 libnspr21 libmsgc21
+OPT_SLASH = /
+LIB_PREFIX      =
+LIB_SUFFIX      = .lib
+
+
 ifdef BUILD_OPT
 	OS_CFLAGS  += -MD
 	OPTIMIZER  += -O2

gconfig/location.mk

@@ -24,12 +24,14 @@
 BUILD         = $(PLATFORM)
 OBJDIR        = $(PLATFORM)
 DIST          = $(GDEPTH)/dist/$(PLATFORM)
+DIST_LIB      = $(GDEPTH)/dist/$(PLATFORM)/lib
 VPATH         = $(NSINSTALL_DIR)/$(PLATFORM)
 DEPENDENCIES  = $(PLATFORM)/.md
 
 # XXX - Need this for compatibility with 'old' config style
 #       when your component requires something in the 'other' world
 CONFIG_DIST          = $(GDEPTH)/dist/$(CONFIG_PLATFORM)
+CONFIG_DIST_LIB      = $(GDEPTH)/dist/$(CONFIG_PLATFORM)/lib
 
 ifdef BUILD_DEBUG_GC
 	DEFINES += -DDEBUG_GC

gconfig/ruleset.mk

@@ -141,6 +141,11 @@ ifndef LIBRARY
 	endif
 endif
 
+# Rules to convert EXTRA_LIBS to platform-dependent naming scheme
+ifdef EXTRA_LIBS
+	EXTRA_LIBS := $(addprefix $(CONFIG_DIST_LIB)$(OPT_SLASH)$(LIB_PREFIX), $(EXTRA_LIBS:%=%$(LIB_SUFFIX)))
+endif
+
 ifdef LIBRARY
 #	LIBRARY := $(addprefix $(OBJDIR)/, $(LIBRARY))
 	ifdef MKSHLIB