From c5b62abdb867d79cfee4f827e1925beb786dc663 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Wed, 11 Oct 2000 02:39:07 +0000
Subject: [PATCH] *** empty log message ***

---
 dtool/src/build/Makefile.bin.vars  | 40 +++++++++++++++++-------------
 pandatool/src/eggprogs/Sources.pp  |  4 ++-
 pandatool/src/gtk-stats/Sources.pp |  3 ++-
 pandatool/src/maya/Sources.pp      |  3 ++-
 4 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/dtool/src/build/Makefile.bin.vars b/dtool/src/build/Makefile.bin.vars
index 28214f40fd..c5bc96f8f6 100644
--- a/dtool/src/build/Makefile.bin.vars
+++ b/dtool/src/build/Makefile.bin.vars
@@ -46,55 +46,55 @@ endif
 
 ifeq (PS2, $(PENV))
   AR = ee-ar
-  LD = ee-ld
+  SET_LD = ee-ld
 else
   AR = ar
-  LD = ld
+  SET_LD = ld
 endif
 
-LDFLAGS = 
+SET_LDFLAGS = 
 LINKFLAGS =
 
 # C files
 ifneq (,$(CFILES))   
-LD := $(CC)
-LDFLAGS := $(CLDFLAGS) $(CFLAGS)
+SET_LD := $(CC)
+SET_LDFLAGS := $(CLDFLAGS) $(CFLAGS)
 endif
 
 # C++ files
 ifneq (,$(C++FILES)) # If there are C++ files, make it CC
-LD := $(C++)
-LDFLAGS := $(C++LDFLAGS) $(C++FLAGS)
+SET_LD := $(C++)
+SET_LDFLAGS := $(C++LDFLAGS) $(C++FLAGS)
 endif
 
 # C files in the OFILES list 
 ifneq (,$(findstring .c,$(suffix $(OFILES))))
-LD := $(CC)
-LDFLAGS := $(IPATH) $(CLDFLAGS) $(CFLAGS)
+SET_LD := $(CC)
+SET_LDFLAGS := $(IPATH) $(CLDFLAGS) $(CFLAGS)
 endif
 
 # C++ files in the OFILES list
 ifneq (,$(findstring .cxx,$(suffix $(OFILES))))
-LD := $(C++)
-LDFLAGS := $(IPATH) $(C++LDFLAGS) $(C++FLAGS)
+SET_LD := $(C++)
+SET_LDFLAGS := $(IPATH) $(C++LDFLAGS) $(C++FLAGS)
 endif
 
 # Making a DSO - use C++ for now
 ifeq (.so,$(suffix $(TARGET)))
-LD := $(C++)
-LDFLAGS := $(IPATH) $(C++LDFLAGS) $(C++FLAGS)
+SET_LD := $(C++)
+SET_LDFLAGS := $(IPATH) $(C++LDFLAGS) $(C++FLAGS)
 endif
 
 # Making a DLL - use C++ for now
 ifeq (.dll,$(suffix $(TARGET)))
-LD := $(C++)
-LDFLAGS := $(C++LDFLAGS) $(C++FLAGS)
+SET_LD := $(C++)
+SET_LDFLAGS := $(C++LDFLAGS) $(C++FLAGS)
 endif
 
 # Making a WIN binary file
 ifeq (WIN32,$(PENV))
-  LD = link
-  LDFLAGS = -NOLOGO 
+  SET_LD = link
+  SET_LDFLAGS = -NOLOGO 
 
   ifeq (4,$(OPTIMIZE))
       LINKFLAGS += -fixed:no
@@ -107,6 +107,12 @@ ifeq (WIN32,$(PENV))
   endif
 endif
 
+
+ifeq ($(LD),)
+  LD := $(SET_LD)
+endif
+LDFLAGS += $(SET_LDFLAGS)
+
 ARFLAGS = ruv
 
 
diff --git a/pandatool/src/eggprogs/Sources.pp b/pandatool/src/eggprogs/Sources.pp
index 3215ad9db6..f873a0560e 100644
--- a/pandatool/src/eggprogs/Sources.pp
+++ b/pandatool/src/eggprogs/Sources.pp
@@ -3,7 +3,9 @@
   #define LOCAL_LIBS \
     eggbase progbase
   #define OTHER_LIBS \
-    egg:c linmath:c putil:c express:c panda:m dtool
+    egg:c linmath:c putil:c express:c panda:m \
+    dtoolutil:c dconfig:c dtool:m
+
   #define UNIX_SYS_LIBS \
     m
 
diff --git a/pandatool/src/gtk-stats/Sources.pp b/pandatool/src/gtk-stats/Sources.pp
index b92f9a5fc5..0da0af4f9b 100644
--- a/pandatool/src/gtk-stats/Sources.pp
+++ b/pandatool/src/gtk-stats/Sources.pp
@@ -6,7 +6,8 @@
   #define LOCAL_LIBS \
     gtkbase progbase pstatserver
   #define OTHER_LIBS \
-    pstatclient:c linmath:c putil:c express:c panda:m dtool
+    pstatclient:c linmath:c putil:c express:c panda:m \
+    dtoolutil:c dconfig:c dtool:m
   #define UNIX_SYS_LIBS \
     m
 
diff --git a/pandatool/src/maya/Sources.pp b/pandatool/src/maya/Sources.pp
index 5ca76c6f62..08700bc24f 100644
--- a/pandatool/src/maya/Sources.pp
+++ b/pandatool/src/maya/Sources.pp
@@ -14,7 +14,8 @@
   #define LOCAL_LIBS \
     eggbase progbase
   #define OTHER_LIBS \
-    egg:c linmath:c putil:c express:c panda:m dtool
+    egg:c linmath:c putil:c express:c panda:m \
+    dtoolutil:c dconfig:c dtool:m
   #define UNIX_SYS_LIBS \
     m