From 21405bd4c3524cb31e1ab9aeaa905d4592e37ad3 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Mon, 26 Jul 2010 23:53:46 +0000
Subject: [PATCH] tiger linking issues

---
 pandatool/src/cvscopy/Sources.pp    | 11 ++++++-----
 pandatool/src/dxfegg/Sources.pp     |  9 +++++----
 pandatool/src/dxfprogs/Sources.pp   | 12 +++++++-----
 pandatool/src/egg-mkfont/Sources.pp | 18 ++++++++----------
 pandatool/src/eggbase/Sources.pp    |  9 +++++----
 pandatool/src/imagebase/Sources.pp  | 10 ++++++----
 pandatool/src/imageprogs/Sources.pp | 13 +++++++------
 pandatool/src/lwoprogs/Sources.pp   | 16 +++++++++-------
 pandatool/src/miscprogs/Sources.pp  | 13 ++++++++-----
 pandatool/src/palettizer/Sources.pp | 14 +++++++-------
 pandatool/src/progbase/Sources.pp   |  8 +++++---
 pandatool/src/softprogs/Sources.pp  | 13 +++++++------
 pandatool/src/vrmlprogs/Sources.pp  | 15 ++++++++-------
 pandatool/src/xfileprogs/Sources.pp | 15 ++++++++-------
 14 files changed, 96 insertions(+), 80 deletions(-)

diff --git a/pandatool/src/cvscopy/Sources.pp b/pandatool/src/cvscopy/Sources.pp
index 1b693d48e0..c0bd419d22 100644
--- a/pandatool/src/cvscopy/Sources.pp
+++ b/pandatool/src/cvscopy/Sources.pp
@@ -4,11 +4,12 @@
     progbase pandatoolbase
 
   #define OTHER_LIBS \
-    pipeline:c pnmimagetypes:c pnmimage:c putil:c linmath:c \
-    event:c \
-    panda:m \
-    pandabase:c express:c pandaexpress:m \
-    dtoolutil:c dtoolbase:c prc:c dconfig:c interrogatedb:c dtool:m
+    pipeline:c event:c pstatclient:c panda:m \
+    pandabase:c pnmimage:c mathutil:c linmath:c putil:c express:c \
+    interrogatedb:c prc:c dconfig:c dtoolconfig:m \
+    dtoolutil:c dtoolbase:c dtool:m \
+    $[if $[WANT_NATIVE_NET],nativenet:c] \
+    $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],net:c downloader:c]
 
   #define COMBINED_SOURCES $[TARGET]_composite1.cxx 
     
diff --git a/pandatool/src/dxfegg/Sources.pp b/pandatool/src/dxfegg/Sources.pp
index adeed8b7a6..fb3d12ae28 100644
--- a/pandatool/src/dxfegg/Sources.pp
+++ b/pandatool/src/dxfegg/Sources.pp
@@ -3,11 +3,12 @@
   #define LOCAL_LIBS converter dxf pandatoolbase
   #define OTHER_LIBS \
     egg:c pandaegg:m \
-    pandabase:c express:c pandaexpress:m \
-    pipeline:c mathutil:c linmath:c putil:c event:c \
-    panda:m \
+    pipeline:c event:c pstatclient:c panda:m \
+    pandabase:c pnmimage:c mathutil:c linmath:c putil:c express:c \
     interrogatedb:c prc:c dconfig:c dtoolconfig:m \
-    dtoolutil:c dtoolbase:c dtool:m
+    dtoolutil:c dtoolbase:c dtool:m \
+    $[if $[WANT_NATIVE_NET],nativenet:c] \
+    $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],net:c downloader:c]
 
   #define UNIX_SYS_LIBS \
     m
diff --git a/pandatool/src/dxfprogs/Sources.pp b/pandatool/src/dxfprogs/Sources.pp
index c3da5bdb50..a89b7e0313 100644
--- a/pandatool/src/dxfprogs/Sources.pp
+++ b/pandatool/src/dxfprogs/Sources.pp
@@ -2,11 +2,13 @@
 #define USE_PACKAGES fftw
 
 #define OTHER_LIBS \
-  egg:c pandaegg:m \
-  pipeline:c pnmimage:c putil:c event:c mathutil:c linmath:c panda:m \
-  pandabase:c express:c pandaexpress:m \
-  interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
-
+    egg:c pandaegg:m \
+    pipeline:c event:c pstatclient:c panda:m \
+    pandabase:c pnmimage:c mathutil:c linmath:c putil:c express:c \
+    interrogatedb:c prc:c dconfig:c dtoolconfig:m \
+    dtoolutil:c dtoolbase:c dtool:m \
+    $[if $[WANT_NATIVE_NET],nativenet:c] \
+    $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],net:c downloader:c]
 
 #begin bin_target
   #define TARGET dxf-points
diff --git a/pandatool/src/egg-mkfont/Sources.pp b/pandatool/src/egg-mkfont/Sources.pp
index 66b9c4b868..68602eb44a 100644
--- a/pandatool/src/egg-mkfont/Sources.pp
+++ b/pandatool/src/egg-mkfont/Sources.pp
@@ -4,17 +4,15 @@
 
 #define LOCAL_LIBS \
   palettizer eggbase progbase
+
 #define OTHER_LIBS \
-  egg:c pandaegg:m \
-  display:c pnmimagetypes:c pnmimage:c \
-  linmath:c putil:c pgraph:c pipeline:c cull:c \
-  gsgbase:c gobj:c event:c mathutil:c pstatclient:c \
-  lerp:c \
-  $[if $[HAVE_FREETYPE],pnmtext:c] \
-  $[if $[HAVE_NET],net:c] \
-  panda:m \
-  downloader:c pandabase:c express:c pandaexpress:m \
-  interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+    egg:c pandaegg:m \
+    pipeline:c event:c pstatclient:c panda:m \
+    pandabase:c pnmimage:c mathutil:c linmath:c putil:c express:c \
+    interrogatedb:c prc:c dconfig:c dtoolconfig:m \
+    dtoolutil:c dtoolbase:c dtool:m \
+    $[if $[WANT_NATIVE_NET],nativenet:c] \
+    $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],net:c downloader:c]
 
 #begin bin_target
   #define TARGET egg-mkfont
diff --git a/pandatool/src/eggbase/Sources.pp b/pandatool/src/eggbase/Sources.pp
index 365e26d7d8..743692f6aa 100644
--- a/pandatool/src/eggbase/Sources.pp
+++ b/pandatool/src/eggbase/Sources.pp
@@ -3,11 +3,12 @@
   #define LOCAL_LIBS \
     progbase converter
   #define OTHER_LIBS \
-    egg:c pandaegg:m \
-    pipeline:c event:c mathutil:c linmath:c putil:c pnmimage:c panda:m \
-    pandabase:c express:c pandaexpress:m \
+    pipeline:c event:c pstatclient:c panda:m \
+    pandabase:c pnmimage:c mathutil:c linmath:c putil:c express:c \
     interrogatedb:c prc:c dconfig:c dtoolconfig:m \
-    dtoolutil:c dtoolbase:c dtool:m
+    dtoolutil:c dtoolbase:c dtool:m \
+    $[if $[WANT_NATIVE_NET],nativenet:c] \
+    $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],net:c downloader:c]
     
   #define COMBINED_SOURCES $[TARGET]_composite1.cxx     
 
diff --git a/pandatool/src/imagebase/Sources.pp b/pandatool/src/imagebase/Sources.pp
index b59faf59fb..10946512aa 100644
--- a/pandatool/src/imagebase/Sources.pp
+++ b/pandatool/src/imagebase/Sources.pp
@@ -2,12 +2,14 @@
   #define TARGET imagebase
   #define LOCAL_LIBS \
     progbase
+
   #define OTHER_LIBS \
-    linmath:c putil:c pnmimage:c pipeline:c event:c \
-    panda:m \
-    pandabase:c express:c pandaexpress:m \
+    pipeline:c event:c pstatclient:c panda:m \
+    pandabase:c pnmimage:c mathutil:c linmath:c putil:c express:c \
     interrogatedb:c prc:c dconfig:c dtoolconfig:m \
-    dtoolutil:c dtoolbase:c dtool:m
+    dtoolutil:c dtoolbase:c dtool:m \
+    $[if $[WANT_NATIVE_NET],nativenet:c] \
+    $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],net:c downloader:c]
 
   #define COMBINED_SOURCES $[TARGET]_composite1.cxx 
 
diff --git a/pandatool/src/imageprogs/Sources.pp b/pandatool/src/imageprogs/Sources.pp
index 4c2314515d..1b9e37921d 100644
--- a/pandatool/src/imageprogs/Sources.pp
+++ b/pandatool/src/imageprogs/Sources.pp
@@ -1,12 +1,13 @@
 #define LOCAL_LIBS \
   imagebase progbase
+
 #define OTHER_LIBS \
-  egg:c pandaegg:m \
-  linmath:c event:c pipeline:c mathutil:c \
-  pnmimagetypes:c pnmimage:c putil:c express:c \
-  panda:m \
-  pandabase:c pandaexpress:m \
-  interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+    pipeline:c event:c pstatclient:c panda:m \
+    pandabase:c pnmimage:c mathutil:c linmath:c putil:c express:c \
+    interrogatedb:c prc:c dconfig:c dtoolconfig:m \
+    dtoolutil:c dtoolbase:c dtool:m \
+    $[if $[WANT_NATIVE_NET],nativenet:c] \
+    $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],net:c downloader:c]
 
 #begin bin_target
   #define TARGET image-trans
diff --git a/pandatool/src/lwoprogs/Sources.pp b/pandatool/src/lwoprogs/Sources.pp
index 081283475f..f2531c1b26 100644
--- a/pandatool/src/lwoprogs/Sources.pp
+++ b/pandatool/src/lwoprogs/Sources.pp
@@ -1,10 +1,12 @@
-#define OTHER_LIBS \
-  egg:c pandaegg:m \
-  linmath:c mathutil:c pipeline:c event:c \
-  pnmimagetypes:c pnmimage:c putil:c \
-  panda:m \
-  pandabase:c express:c pandaexpress:m \
-  interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+
+#define OTHER_LIBS \ 
+    egg:c pandaegg:m \
+    pipeline:c event:c pstatclient:c panda:m \
+    pandabase:c pnmimage:c mathutil:c linmath:c putil:c express:c \
+    interrogatedb:c prc:c dconfig:c dtoolconfig:m \
+    dtoolutil:c dtoolbase:c dtool:m \
+    $[if $[WANT_NATIVE_NET],nativenet:c] \
+    $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],net:c downloader:c]
 
 #begin bin_target
   #define TARGET lwo2egg
diff --git a/pandatool/src/miscprogs/Sources.pp b/pandatool/src/miscprogs/Sources.pp
index 12f4d413d6..11f81cc06e 100644
--- a/pandatool/src/miscprogs/Sources.pp
+++ b/pandatool/src/miscprogs/Sources.pp
@@ -1,10 +1,13 @@
 #define LOCAL_LIBS \
   progbase
-#define OTHER_LIBS \
-  pnmimage:c linmath:c pipeline:c event:c putil:c \
-  panda:m \
-  pandabase:c express:c pandaexpress:m \
-  interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+
+#define OTHER_LIBS \ 
+    pipeline:c event:c pstatclient:c panda:m \
+    pandabase:c pnmimage:c mathutil:c linmath:c putil:c express:c \
+    interrogatedb:c prc:c dconfig:c dtoolconfig:m \
+    dtoolutil:c dtoolbase:c dtool:m \
+    $[if $[WANT_NATIVE_NET],nativenet:c] \
+    $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],net:c downloader:c]
 #define UNIX_SYS_LIBS m
 
 #begin bin_target
diff --git a/pandatool/src/palettizer/Sources.pp b/pandatool/src/palettizer/Sources.pp
index 6814ed59d5..7fcd6b5258 100644
--- a/pandatool/src/palettizer/Sources.pp
+++ b/pandatool/src/palettizer/Sources.pp
@@ -2,15 +2,15 @@
   #define TARGET palettizer
   #define LOCAL_LIBS \
     pandatoolbase
+
   #define OTHER_LIBS \
     egg:c pandaegg:m \
-    display:c pgraph:c linmath:c putil:c pnmimage:c \
-    pnmimagetypes:c pipeline:c cull:c gsgbase:c gobj:c \
-    event:c mathutil:c pstatclient:c lerp:c \
-    $[if $[HAVE_NET],net:c] \
-    panda:m \
-    pandabase:c express:c downloader:c pandaexpress:m \
-    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m
+    pipeline:c event:c pstatclient:c panda:m \
+    pandabase:c pnmimage:c mathutil:c linmath:c putil:c express:c \
+    interrogatedb:c prc:c dconfig:c dtoolconfig:m \
+    dtoolutil:c dtoolbase:c dtool:m \
+    $[if $[WANT_NATIVE_NET],nativenet:c] \
+    $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],net:c downloader:c]
   
   #define COMBINED_SOURCES $[TARGET]_composite1.cxx     
 
diff --git a/pandatool/src/progbase/Sources.pp b/pandatool/src/progbase/Sources.pp
index 7c514aed86..d703ed2a72 100644
--- a/pandatool/src/progbase/Sources.pp
+++ b/pandatool/src/progbase/Sources.pp
@@ -5,10 +5,12 @@
   #define LOCAL_LIBS \
     pandatoolbase
   #define OTHER_LIBS \
-    pipeline:c event:c panda:m \
-    pandabase:c pnmimage:c linmath:c putil:c express:c \
+    pipeline:c event:c pstatclient:c panda:m \
+    pandabase:c pnmimage:c mathutil:c linmath:c putil:c express:c \
     interrogatedb:c prc:c dconfig:c dtoolconfig:m \
-    dtoolutil:c dtoolbase:c dtool:m
+    dtoolutil:c dtoolbase:c dtool:m \
+    $[if $[WANT_NATIVE_NET],nativenet:c] \
+    $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],net:c downloader:c]
     
   #define COMBINED_SOURCES $[TARGET]_composite1.cxx 
 
diff --git a/pandatool/src/softprogs/Sources.pp b/pandatool/src/softprogs/Sources.pp
index c6122f8eeb..6bdf7c410b 100644
--- a/pandatool/src/softprogs/Sources.pp
+++ b/pandatool/src/softprogs/Sources.pp
@@ -3,13 +3,14 @@
   #define LOCAL_LIBS progbase
   #define USE_PACKAGES openssl
 
-  #define OTHER_LIBS \
+  #define OTHER_LIBS \ 
     egg:c pandaegg:m \
-    event:c mathutil:c pnmimage:c putil:c \
-    linmath:c pipeline:c event:c \
-    panda:m \
-    pandabase:c express:c pandaexpress:m \
-    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+    pipeline:c event:c pstatclient:c panda:m \
+    pandabase:c pnmimage:c mathutil:c linmath:c putil:c express:c \
+    interrogatedb:c prc:c dconfig:c dtoolconfig:m \
+    dtoolutil:c dtoolbase:c dtool:m \
+    $[if $[WANT_NATIVE_NET],nativenet:c] \
+    $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],net:c downloader:c]
 
   #define SOURCES \
     softCVS.cxx softCVS.h softFilename.cxx softFilename.h
diff --git a/pandatool/src/vrmlprogs/Sources.pp b/pandatool/src/vrmlprogs/Sources.pp
index 2d328619ea..09370fef76 100644
--- a/pandatool/src/vrmlprogs/Sources.pp
+++ b/pandatool/src/vrmlprogs/Sources.pp
@@ -1,10 +1,11 @@
-#define OTHER_LIBS \
-  egg:c pandaegg:m \
-  linmath:c pnmimagetypes:c pnmimage:c putil:c mathutil:c event:c \
-  pipeline:c \
-  panda:m \
-  pandabase:c express:c pandaexpress:m \
-  interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+#define OTHER_LIBS \ 
+    egg:c pandaegg:m \
+    pipeline:c event:c pstatclient:c panda:m \
+    pandabase:c pnmimage:c mathutil:c linmath:c putil:c express:c \
+    interrogatedb:c prc:c dconfig:c dtoolconfig:m \
+    dtoolutil:c dtoolbase:c dtool:m \
+    $[if $[WANT_NATIVE_NET],nativenet:c] \
+    $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],net:c downloader:c]
 
 #begin bin_target
   #define TARGET vrml2egg
diff --git a/pandatool/src/xfileprogs/Sources.pp b/pandatool/src/xfileprogs/Sources.pp
index 183bf17374..ec8d340f03 100644
--- a/pandatool/src/xfileprogs/Sources.pp
+++ b/pandatool/src/xfileprogs/Sources.pp
@@ -1,10 +1,11 @@
-#define OTHER_LIBS \
-  egg:c pandaegg:m \
-  pipeline:c mathutil:c linmath:c putil:c \
-  event:c pnmimage:c \
-  panda:m \
-  pandabase:c express:c pandaexpress:m \
-  interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+#define OTHER_LIBS \ 
+    egg:c pandaegg:m \
+    pipeline:c event:c pstatclient:c panda:m \
+    pandabase:c pnmimage:c mathutil:c linmath:c putil:c express:c \
+    interrogatedb:c prc:c dconfig:c dtoolconfig:m \
+    dtoolutil:c dtoolbase:c dtool:m \
+    $[if $[WANT_NATIVE_NET],nativenet:c] \
+    $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],net:c downloader:c]
 
 #begin bin_target
   #define TARGET egg2x