Browse Source

clarify inter-tree dependencies comments

David Rose 21 years ago
parent
commit
35f40e8c2a
4 changed files with 8 additions and 23 deletions
  1. 2 5
      direct/Package.pp
  2. 2 6
      panda/Package.pp
  3. 2 6
      pandaapp/Package.pp
  4. 2 6
      pandatool/Package.pp

+ 2 - 5
direct/Package.pp

@@ -45,10 +45,6 @@
   #defer DIRECT_INSTALL_OTHER $[unixfilename $[INSTALL_DIR]]
 #endif
 
-
-// Define the inter-tree dependencies.
-#define NEEDS_TREES $[NEEDS_TREES] panda
-
 // Also get the PANDA Package file and everything that includes.
 #if $[not $[isfile $[PANDA_SOURCE]/Package.pp]]
   #error PANDA source directory not found!  Are you attached properly?
@@ -56,5 +52,6 @@
 
 #include $[PANDA_SOURCE]/Package.pp
 
-// Now define the intra-tree dependencies.
+// Define the inter-tree dependencies.
+#define NEEDS_TREES panda $[NEEDS_TREES]
 #define DEPENDABLE_HEADER_DIRS $[DEPENDABLE_HEADER_DIRS] $[PANDA_INSTALL]/include

+ 2 - 6
panda/Package.pp

@@ -45,11 +45,6 @@
   #defer PANDA_INSTALL_OTHER $[unixfilename $[INSTALL_DIR]]
 #endif
 
-
-// Define the inter-tree dependencies.
-#define NEEDS_TREES $[NEEDS_TREES] dtool
-
-
 // Also get the DTOOL Package file and everything that includes.
 #if $[not $[isfile $[DTOOL_SOURCE]/Package.pp]]
   #error DTOOL source directory not found!  Are you attached properly?
@@ -57,5 +52,6 @@
 
 #include $[DTOOL_SOURCE]/Package.pp
 
-// Now define the intra-tree dependencies.
+// Define the inter-tree dependencies.
+#define NEEDS_TREES dtool $[NEEDS_TREES]
 #define DEPENDABLE_HEADER_DIRS $[DEPENDABLE_HEADER_DIRS] $[DTOOL_INSTALL]/include

+ 2 - 6
pandaapp/Package.pp

@@ -46,11 +46,6 @@
   #defer PANDAAPP_INSTALL_OTHER $[INSTALL_DIR]
 #endif
 
-
-// Define the inter-tree dependencies.
-#define NEEDS_TREES $[NEEDS_TREES] pandatool
-
-
 // Also get the PANDATOOL Package file and everything that includes.
 #if $[not $[isfile $[PANDATOOL_SOURCE]/Package.pp]]
   #error PANDATOOL source directory not found!  Are you attached properly?
@@ -58,5 +53,6 @@
 
 #include $[PANDATOOL_SOURCE]/Package.pp
 
-// Now define the intra-tree dependencies.
+// Define the inter-tree dependencies.
+#define NEEDS_TREES pandatool $[NEEDS_TREES]
 #define DEPENDABLE_HEADER_DIRS $[DEPENDABLE_HEADER_DIRS] $[PANDATOOL_INSTALL]/include

+ 2 - 6
pandatool/Package.pp

@@ -47,11 +47,6 @@
   #defer PANDATOOL_INSTALL_OTHER $[unixfilename $[INSTALL_DIR]]
 #endif
 
-
-// Define the inter-tree dependencies.
-#define NEEDS_TREES $[NEEDS_TREES] panda
-
-
 // Also get the PANDA Package file and everything that includes.
 #if $[not $[isfile $[PANDA_SOURCE]/Package.pp]]
   #error PANDA source directory not found!  Are you attached properly?
@@ -59,5 +54,6 @@
 
 #include $[PANDA_SOURCE]/Package.pp
 
-// Now define the intra-tree dependencies.
+// Define the inter-tree dependencies.
+#define NEEDS_TREES panda $[NEEDS_TREES]
 #define DEPENDABLE_HEADER_DIRS $[DEPENDABLE_HEADER_DIRS] $[PANDA_INSTALL]/include