several USE_PACKAGES oopses

direct/src/distributed/Sources.pp

@@ -2,7 +2,7 @@
 
 #begin lib_target
   #define BUILD_TARGET $[HAVE_PYTHON]
-  #define USE_PACKAGES openssl native_net p3net
+  #define USE_PACKAGES openssl native_net net
 
   #define TARGET p3distributed
   #define LOCAL_LIBS \

panda/metalibs/panda/Sources.pp

@@ -6,7 +6,7 @@
 
 #define DIR_TYPE metalib
 #define BUILDING_DLL BUILDING_PANDA
-#define USE_PACKAGES p3net
+#define USE_PACKAGES net
 
 #define COMPONENT_LIBS \
     p3recorder p3pgraph p3pgraphnodes p3pipeline \

panda/src/awesomium/Sources.pp

@@ -10,7 +10,7 @@
   #define LOCAL_LIBS \
     p3pgraph p3physics
 
-  #define USE_PACKAGES p3awesomium
+  #define USE_PACKAGES awesomium
     
   #define COMBINED_SOURCES $[TARGET]_composite1.cxx 
 

panda/src/bullet/Sources.pp

@@ -6,7 +6,7 @@
 #begin lib_target
   #define TARGET p3bullet
   #define LOCAL_LIBS p3pgraph p3linmath p3grutil
-  #define USE_PACKAGES p3bullet
+  #define USE_PACKAGES bullet
   #define COMBINED_SOURCES $[TARGET]_composite.cxx
 
   #define SOURCES \

panda/src/downloader/Sources.pp

@@ -1,7 +1,7 @@
 #define LOCAL_LIBS p3express p3pandabase
 #define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \
                    p3dtoolutil:c p3dtoolbase:c p3prc:c p3dtool:m
-#define USE_PACKAGES zlib p3net openssl
+#define USE_PACKAGES zlib net openssl
 
 #begin lib_target
   #define TARGET p3downloader

panda/src/net/Sources.pp

@@ -2,7 +2,7 @@
    p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \
    p3dtoolutil:c p3dtoolbase:c p3prc:c p3dtool:m
 #define BUILD_DIRECTORY $[and $[HAVE_NET],$[WANT_NATIVE_NET]]
-#define USE_PACKAGES p3net
+#define USE_PACKAGES net
 
 #begin lib_target
   #define TARGET p3net

panda/src/physx/Sources.pp

@@ -7,7 +7,7 @@
 #begin lib_target
   #define TARGET p3physx
   #define LOCAL_LIBS p3pgraph p3linmath p3grutil
-  #define USE_PACKAGES p3physx
+  #define USE_PACKAGES physx
   #define COMBINED_SOURCES $[TARGET]_composite.cxx
 
   #define SOURCES \

panda/src/speedtree/Sources.pp

@@ -3,7 +3,7 @@
 #define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \
                    p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c
 
-#define USE_PACKAGES p3speedtree $[if $[eq $[SPEEDTREE_API],OpenGL],gl cg cggl] $[if $[eq $[SPEEDTREE_API],DirectX9],dx9 cg cgdx9]
+#define USE_PACKAGES speedtree $[if $[eq $[SPEEDTREE_API],OpenGL],gl cg cggl] $[if $[eq $[SPEEDTREE_API],DirectX9],dx9 cg cgdx9]
 #define BUILDING_DLL BUILDING_PANDASPEEDTREE
 
 #begin lib_target

pandatool/src/assimp/Sources.pp

@@ -5,7 +5,7 @@
   #define BUILDING_DLL BUILDING_ASSIMP
   #define LOCAL_LIBS \
     p3pandatoolbase
-  #define USE_PACKAGES p3assimp
+  #define USE_PACKAGES assimp
 
   #define OTHER_LIBS \
     p3egg2pg:c p3egg:c pandaegg:m \

pandatool/src/gtk-stats/Sources.pp

@@ -1,5 +1,5 @@
 #define BUILD_DIRECTORY $[and $[HAVE_GTK],$[HAVE_NET]]
-#define USE_PACKAGES p3net gtk
+#define USE_PACKAGES net gtk
 
 #begin bin_target
   // We suspect gtk will not be built universal on OSX.  Don't try.

pandatool/src/maya/Sources.pp

@@ -1,7 +1,7 @@
 #define BUILD_DIRECTORY $[HAVE_MAYA]
 
 #begin ss_lib_target
-  #define USE_PACKAGES p3maya
+  #define USE_PACKAGES maya
   #define TARGET mayabase
   #define LOCAL_LIBS \
     p3converter p3pandatoolbase

pandatool/src/mayaegg/Sources.pp

@@ -1,7 +1,7 @@
 #define BUILD_DIRECTORY $[HAVE_MAYA]
 
 #begin ss_lib_target
-  #define USE_PACKAGES p3maya
+  #define USE_PACKAGES maya
   #define TARGET p3mayaegg
   #define LOCAL_LIBS \
     mayabase p3converter p3pandatoolbase

pandatool/src/mayaprogs/Sources.pp

@@ -17,7 +17,7 @@
 #end bin_target
 
 #begin bin_target
-  #define USE_PACKAGES p3maya
+  #define USE_PACKAGES maya
   #define TARGET maya2egg_bin
   #define LOCAL_LIBS \
     mayabase p3mayaegg p3eggbase p3progbase
@@ -38,7 +38,7 @@
 #end bin_target
 
 #begin bin_target
-  #define USE_PACKAGES p3maya
+  #define USE_PACKAGES maya
   #define TARGET maya2egg_server_bin
   #define LOCAL_LIBS \
     mayabase p3mayaegg p3eggbase p3progbase
@@ -59,7 +59,7 @@
 #end bin_target
 
 #begin bin_target
-  #define USE_PACKAGES p3maya
+  #define USE_PACKAGES maya
   #define TARGET maya2egg_client
   #define LOCAL_LIBS \
     mayabase p3mayaegg p3eggbase p3progbase
@@ -88,7 +88,7 @@
 #end bin_target
 
 #begin bin_target
-  #define USE_PACKAGES p3maya
+  #define USE_PACKAGES maya
   #define TARGET egg2maya_bin
   #define LOCAL_LIBS \
     mayabase p3mayaegg p3eggbase p3progbase
@@ -118,7 +118,7 @@
 #end bin_target
 
 #begin bin_target
-  #define USE_PACKAGES p3maya
+  #define USE_PACKAGES maya
   #define TARGET mayacopy_bin
   #define LOCAL_LIBS p3cvscopy mayabase p3progbase
 
@@ -141,7 +141,7 @@
 
 #begin lib_target
   #define BUILD_TARGET $[not $[LINK_ALL_STATIC]]
-  #define USE_PACKAGES p3maya
+  #define USE_PACKAGES maya
   #define TARGET mayapview
   #define LOCAL_LIBS mayabase p3mayaegg
   #define OTHER_LIBS \
@@ -168,7 +168,7 @@
 
 #begin lib_target
   #define BUILD_TARGET $[not $[LINK_ALL_STATIC]]
-  #define USE_PACKAGES p3maya
+  #define USE_PACKAGES maya
   #define TARGET mayasavepview
 
   #if $[WINDOWS_PLATFORM]
@@ -181,7 +181,7 @@
 
 #begin lib_target
   #define BUILD_TARGET $[not $[LINK_ALL_STATIC]]
-  #define USE_PACKAGES p3maya
+  #define USE_PACKAGES maya
   #define TARGET mayaEggImport
   #define LOCAL_LIBS mayabase p3mayaegg
   #define OTHER_LIBS \
@@ -204,7 +204,7 @@
 #end lib_target
 
 #begin lib_target
-  #define USE_PACKAGES p3maya
+  #define USE_PACKAGES maya
   #define TARGET mayaloader
   #define BUILDING_DLL BUILDING_MISC
   #define LOCAL_LIBS \
@@ -226,7 +226,7 @@
 #end lib_target
 
 #begin test_bin_target
-  #define USE_PACKAGES p3maya
+  #define USE_PACKAGES maya
   #define TARGET normal_test
 
   #define SOURCES \

pandatool/src/win-stats/Sources.pp

@@ -1,5 +1,5 @@
 #define BUILD_DIRECTORY $[and $[WINDOWS_PLATFORM],$[HAVE_NET]]
-#define USE_PACKAGES p3net
+#define USE_PACKAGES net
 
 #begin bin_target
   #define TARGET pstats