Integrated Steve's new "plib" conglomeration.

diff --git a/Lib/Makefile.am b/Lib/Makefile.am
index 6723c2dd62ef0bb913465cd55eca04b2ba9d5b28..a0bdf9327a18aea9232a2628c4bc1ea371f1b8ce 100644 (file)
--- a/Lib/Makefile.am
+++ b/Lib/Makefile.am
@@ -1,9 +1,3 @@
-if ENABLE_AUDIO_SUPPORT
-AUDIO_DIRS = Audio
-else
-AUDIO_DIRS = 
-endif
-
 if ENABLE_UNIX_SERIAL
 SERIAL_DIRS = Serial
 else
@@ -11,12 +5,11 @@ SERIAL_DIRS =
 endif
 
 SUBDIRS = \
-       $(AUDIO_DIRS) \
        Bucket \
        Debug \
        Math \
        Misc \
-       PUI \
        $(SERIAL_DIRS) \
        XGL\
+       plib \
        zlib