From 94cd079177de7b1fa59075e1c003e467ff93a2d7 Mon Sep 17 00:00:00 2001
From: Mike Goslin <mikegoslin@users.sourceforge.net>
Date: Sat, 7 Oct 2000 02:23:32 +0000
Subject: [PATCH] *** empty log message ***

---
 panda/metalibs/panda/Sources.pp               |  3 +-
 panda/src/audio/Sources.pp                    | 34 ------------------
 panda/src/audiotraits/Sources.pp              | 35 +++++++++++++++++++
 .../audio_load_midi.cxx                       |  0
 .../{audio => audiotraits}/audio_load_st.cxx  |  0
 .../{audio => audiotraits}/audio_load_wav.cxx |  0
 6 files changed, 36 insertions(+), 36 deletions(-)
 create mode 100644 panda/src/audiotraits/Sources.pp
 rename panda/src/{audio => audiotraits}/audio_load_midi.cxx (100%)
 rename panda/src/{audio => audiotraits}/audio_load_st.cxx (100%)
 rename panda/src/{audio => audiotraits}/audio_load_wav.cxx (100%)

diff --git a/panda/metalibs/panda/Sources.pp b/panda/metalibs/panda/Sources.pp
index 4abec3e211..1ba112f1f9 100644
--- a/panda/metalibs/panda/Sources.pp
+++ b/panda/metalibs/panda/Sources.pp
@@ -15,8 +15,7 @@
     gsgmisc light linmath mathutil net pnm \
     pnmimagetypes pnmimage sgattrib sgmanip sgraph sgraphutil \
     switchnode text tform tiff lerp loader putil effects \
-    audio pandabase \
-//     audio audio_load_midi audio_load_st audio_load_wav pandabase \
+     audio audio_load_midi audio_load_st audio_load_wav pandabase 
 
 #define LOCAL_LIBS downloader event ipc express pandabase
 #define OTHER_LIBS dtool
diff --git a/panda/src/audio/Sources.pp b/panda/src/audio/Sources.pp
index 9832c6343e..5d9542cd37 100644
--- a/panda/src/audio/Sources.pp
+++ b/panda/src/audio/Sources.pp
@@ -27,40 +27,6 @@
 
 #end lib_target
 
-#begin lib_target
-  #define TARGET audio_load_midi
-  #define BUILDING_DLL BUILDING_MISC
-  #define LOCAL_LIBS \
-    audio
-
-  #define SOURCES \
-    audio_load_midi.cxx
-
-#end lib_target
-
-#begin lib_target
-  #define TARGET audio_load_wav
-  #define BUILDING_DLL BUILDING_MISC
-  #define LOCAL_LIBS \
-    audio
-
-  #define SOURCES \
-    audio_load_wav.cxx
-
-#end lib_target
-
-#begin lib_target
-  #define TARGET audio_load_st
-  #define BUILDING_DLL BUILDING_MISC
-  #define USE_SOXST yes
-  #define LOCAL_LIBS \
-    audio
-
-  #define SOURCES \
-    audio_load_st.cxx
-
-#end lib_target
-
 #begin test_bin_target
   #define TARGET test_audio
   #define LOCAL_LIBS \
diff --git a/panda/src/audiotraits/Sources.pp b/panda/src/audiotraits/Sources.pp
new file mode 100644
index 0000000000..af53472ff9
--- /dev/null
+++ b/panda/src/audiotraits/Sources.pp
@@ -0,0 +1,35 @@
+#define OTHER_LIBS dtool
+
+#begin lib_target
+  #define TARGET audio_load_midi
+  #define BUILDING_DLL BUILDING_MISC
+  #define LOCAL_LIBS \
+    audio
+
+  #define SOURCES \
+    audio_load_midi.cxx
+
+#end lib_target
+
+#begin lib_target
+  #define TARGET audio_load_wav
+  #define BUILDING_DLL BUILDING_MISC
+  #define LOCAL_LIBS \
+    audio
+
+  #define SOURCES \
+    audio_load_wav.cxx
+
+#end lib_target
+
+#begin lib_target
+  #define TARGET audio_load_st
+  #define BUILDING_DLL BUILDING_MISC
+  #define USE_SOXST yes
+  #define LOCAL_LIBS \
+    audio
+
+  #define SOURCES \
+    audio_load_st.cxx
+
+#end lib_target
diff --git a/panda/src/audio/audio_load_midi.cxx b/panda/src/audiotraits/audio_load_midi.cxx
similarity index 100%
rename from panda/src/audio/audio_load_midi.cxx
rename to panda/src/audiotraits/audio_load_midi.cxx
diff --git a/panda/src/audio/audio_load_st.cxx b/panda/src/audiotraits/audio_load_st.cxx
similarity index 100%
rename from panda/src/audio/audio_load_st.cxx
rename to panda/src/audiotraits/audio_load_st.cxx
diff --git a/panda/src/audio/audio_load_wav.cxx b/panda/src/audiotraits/audio_load_wav.cxx
similarity index 100%
rename from panda/src/audio/audio_load_wav.cxx
rename to panda/src/audiotraits/audio_load_wav.cxx