From 05424eb2478e3cc5cfecb8daf12050780176fc14 Mon Sep 17 00:00:00 2001
From: cxgeorge <>
Date: Wed, 6 Jun 2001 23:21:23 +0000
Subject: [PATCH] use combined srcs

---
 panda/src/pnmimagetypes/Sources.pp            | 30 +++++++++++--------
 .../pnmimagetypes_composite1.cxx              | 11 +++++++
 .../pnmimagetypes_composite2.cxx              |  8 +++++
 3 files changed, 37 insertions(+), 12 deletions(-)
 create mode 100644 panda/src/pnmimagetypes/pnmimagetypes_composite1.cxx
 create mode 100644 panda/src/pnmimagetypes/pnmimagetypes_composite2.cxx

diff --git a/panda/src/pnmimagetypes/Sources.pp b/panda/src/pnmimagetypes/Sources.pp
index 80b669b530..edb9ca40ad 100644
--- a/panda/src/pnmimagetypes/Sources.pp
+++ b/panda/src/pnmimagetypes/Sources.pp
@@ -7,18 +7,24 @@
   #define LOCAL_LIBS \
     pnm tiff pnmimage
 
-  #define SOURCES \
-    config_pnmimagetypes.cxx config_pnmimagetypes.h \
-    pnmFileTypeAlias.cxx pnmFileTypeAlias.h pnmFileTypeBMP.cxx \
-    pnmFileTypeBMP.h pnmFileTypeBMPReader.cxx pnmFileTypeBMPWriter.cxx \
-    pnmFileTypeIMG.cxx pnmFileTypeIMG.h pnmFileTypePNM.cxx \
-    pnmFileTypePNM.h pnmFileTypeRadiance.cxx pnmFileTypeRadiance.h \
-    pnmFileTypeSGI.cxx pnmFileTypeSGI.h pnmFileTypeSGIReader.cxx \
-    pnmFileTypeSGIWriter.cxx pnmFileTypeSoftImage.cxx \
-    pnmFileTypeSoftImage.h pnmFileTypeTIFF.cxx pnmFileTypeTIFF.h \
-    pnmFileTypeTGA.cxx pnmFileTypeTGA.h \
-    pnmFileTypeYUV.cxx pnmFileTypeYUV.h \
-    color.c colrops.c resolu.c header.c
+  #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx
+
+  #define SOURCES  \
+     config_pnmimagetypes.h pnmFileTypeAlias.h pnmFileTypeBMP.h  \
+     pnmFileTypeIMG.h pnmFileTypePNM.h pnmFileTypeRadiance.h  \
+     pnmFileTypeSGI.h pnmFileTypeSoftImage.h pnmFileTypeTIFF.h  \
+     pnmFileTypeTGA.h pnmFileTypeYUV.h color.c colrops.c resolu.c  \
+     header.c  
+
+  #define INCLUDED_SOURCES  \
+     config_pnmimagetypes.cxx pnmFileTypeAlias.cxx  \
+     pnmFileTypeBMPReader.cxx pnmFileTypeBMPWriter.cxx  \
+     pnmFileTypeIMG.cxx pnmFileTypePNM.cxx pnmFileTypeBMP.cxx  \
+     pnmFileTypeRadiance.cxx pnmFileTypeSGI.cxx  \
+     pnmFileTypeSGIReader.cxx pnmFileTypeSGIWriter.cxx  \
+     pnmFileTypeSoftImage.cxx pnmFileTypeTIFF.cxx  \
+     pnmFileTypeTGA.cxx pnmFileTypeYUV.cxx
+     
 
   #define IF_JPEG_SOURCES \
     pnmFileTypeJPG.cxx pnmFileTypeJPG.h \
diff --git a/panda/src/pnmimagetypes/pnmimagetypes_composite1.cxx b/panda/src/pnmimagetypes/pnmimagetypes_composite1.cxx
new file mode 100644
index 0000000000..dd8a1ebb4e
--- /dev/null
+++ b/panda/src/pnmimagetypes/pnmimagetypes_composite1.cxx
@@ -0,0 +1,11 @@
+
+#include "config_pnmimagetypes.cxx"
+#include "pnmFileTypeAlias.cxx"
+#include "pnmFileTypeBMPReader.cxx"
+#include "pnmFileTypeBMPWriter.cxx"
+#include "pnmFileTypeIMG.cxx"
+#include "pnmFileTypePNM.cxx"
+#include "pnmFileTypeBMP.cxx"
+#include "pnmFileTypeRadiance.cxx"
+
+
diff --git a/panda/src/pnmimagetypes/pnmimagetypes_composite2.cxx b/panda/src/pnmimagetypes/pnmimagetypes_composite2.cxx
new file mode 100644
index 0000000000..7b272041dc
--- /dev/null
+++ b/panda/src/pnmimagetypes/pnmimagetypes_composite2.cxx
@@ -0,0 +1,8 @@
+
+#include "pnmFileTypeSGI.cxx"
+#include "pnmFileTypeSGIReader.cxx"
+#include "pnmFileTypeSGIWriter.cxx"
+#include "pnmFileTypeSoftImage.cxx"
+#include "pnmFileTypeTIFF.cxx"
+#include "pnmFileTypeTGA.cxx"
+#include "pnmFileTypeYUV.cxx"