--- build2/cmd/ossctl/Makefile	2007-08-31 03:34:02.000000000 +0300
+++ build2/cmd/ossctl/Makefile	2007-08-31 03:38:40.000000000 +0300
@@ -28,17 +28,17 @@ 
 ossctl:	$(SBINDIR)/ossctl
 
 $(SBINDIR)/ossctl:	$(OBJECTS)
-	$(CC) $(CFLAGS) $(LIBRARIES) $(LDFLAGS) -s -o $(SBINDIR)/ossctl $(OBJECTS)
+	$(CC)  $(LDFLAGS) -s -o $(SBINDIR)/ossctl $(OBJECTS)
 
 
 $(TMPDIR)/ossctl.o:	ossctl.c
-	$(CC) -c $(CFLAGS) $(OSFLAGS) $(INCLUDES) ossctl.c -o $(TMPDIR)/ossctl.o
+	$(CC) -c  $(INCLUDES) ossctl.c -o $(TMPDIR)/ossctl.o
 
 $(TMPDIR)/ui.o:	ui.c
-	$(CC) -c $(CFLAGS) $(OSFLAGS) $(INCLUDES) ui.c -o $(TMPDIR)/ui.o
+	$(CC) -c  $(INCLUDES) ui.c -o $(TMPDIR)/ui.o
 
 $(TMPDIR)/ui_X.o:	ui_X.c
-	$(CC) -c $(CFLAGS) $(OSFLAGS) $(INCLUDES) ui_X.c -o $(TMPDIR)/ui_X.o
+	$(CC) -c  $(CFLAGS) $(INCLUDES) ui_X.c -o $(TMPDIR)/ui_X.o
 
 clean: clean_local
 
--- build2/cmd/ossdevlinks/Makefile	2007-08-31 03:34:02.000000000 +0300
+++ build2/cmd/ossdevlinks/Makefile	2007-08-31 03:37:27.000000000 +0300
@@ -26,11 +26,11 @@ 
 ossdevlinks:	$(SBINDIR)/ossdevlinks
 
 $(SBINDIR)/ossdevlinks:	$(OBJECTS)
-	$(CC) $(CFLAGS) $(LIBRARIES) $(LDFLAGS) -s -o $(SBINDIR)/ossdevlinks $(OBJECTS)
+	$(CC)  $(LDFLAGS) -s -o $(SBINDIR)/ossdevlinks $(OBJECTS)
 
 
 $(TMPDIR)/ossdevlinks.o:	ossdevlinks.c
-	$(CC) -c $(CFLAGS) $(OSFLAGS) $(INCLUDES) ossdevlinks.c -o $(TMPDIR)/ossdevlinks.o
+	$(CC) -c  $(INCLUDES) ossdevlinks.c -o $(TMPDIR)/ossdevlinks.o
 
 clean: clean_local
 
--- build2/cmd/ossinfo/Makefile	2007-08-31 03:34:02.000000000 +0300
+++ build2/cmd/ossinfo/Makefile	2007-08-31 03:37:27.000000000 +0300
@@ -26,11 +26,11 @@ 
 ossinfo:	$(BINDIR)/ossinfo
 
 $(BINDIR)/ossinfo:	$(OBJECTS)
-	$(CC) $(CFLAGS) $(LIBRARIES) $(LDFLAGS) -s -o $(BINDIR)/ossinfo $(OBJECTS)
+	$(CC)  $(LDFLAGS) -s -o $(BINDIR)/ossinfo $(OBJECTS)
 
 
 $(TMPDIR)/ossinfo.o:	ossinfo.c
-	$(CC) -c $(CFLAGS) $(OSFLAGS) $(INCLUDES) ossinfo.c -o $(TMPDIR)/ossinfo.o
+	$(CC) -c  $(INCLUDES) ossinfo.c -o $(TMPDIR)/ossinfo.o
 
 clean: clean_local
 
--- build2/cmd/ossmix/Makefile	2007-08-31 03:34:02.000000000 +0300
+++ build2/cmd/ossmix/Makefile	2007-08-31 03:37:27.000000000 +0300
@@ -26,11 +26,11 @@ 
 ossmix:	$(BINDIR)/ossmix
 
 $(BINDIR)/ossmix:	$(OBJECTS)
-	$(CC) $(CFLAGS) $(LIBRARIES) $(LDFLAGS) -s -o $(BINDIR)/ossmix $(OBJECTS)
+	$(CC)  $(LDFLAGS) -s -o $(BINDIR)/ossmix $(OBJECTS)
 
 
 $(TMPDIR)/ossmix.o:	ossmix.c
-	$(CC) -c $(CFLAGS) $(OSFLAGS) $(INCLUDES) ossmix.c -o $(TMPDIR)/ossmix.o
+	$(CC) -c  $(INCLUDES) ossmix.c -o $(TMPDIR)/ossmix.o
 
 clean: clean_local
 
--- build2/cmd/ossplay/Makefile	2007-08-31 03:34:02.000000000 +0300
+++ build2/cmd/ossplay/Makefile	2007-08-31 03:37:27.000000000 +0300
@@ -26,11 +26,11 @@ 
 ossplay:	$(BINDIR)/ossplay
 
 $(BINDIR)/ossplay:	$(OBJECTS)
-	$(CC) $(CFLAGS) $(LIBRARIES) $(LDFLAGS) -s -o $(BINDIR)/ossplay $(OBJECTS)
+	$(CC)  $(LDFLAGS) -s -o $(BINDIR)/ossplay $(OBJECTS)
 
 
 $(TMPDIR)/ossplay.o:	ossplay.c
-	$(CC) -c $(CFLAGS) $(OSFLAGS) $(INCLUDES) ossplay.c -o $(TMPDIR)/ossplay.o
+	$(CC) -c  $(INCLUDES) ossplay.c -o $(TMPDIR)/ossplay.o
 
 clean: clean_local
 
--- build2/cmd/ossrecord/Makefile	2007-08-31 03:34:02.000000000 +0300
+++ build2/cmd/ossrecord/Makefile	2007-08-31 03:37:27.000000000 +0300
@@ -26,11 +26,11 @@ 
 ossrecord:	$(BINDIR)/ossrecord
 
 $(BINDIR)/ossrecord:	$(OBJECTS)
-	$(CC) $(CFLAGS) $(LIBRARIES) $(LDFLAGS) -s -o $(BINDIR)/ossrecord $(OBJECTS)
+	$(CC)  $(LDFLAGS) -s -o $(BINDIR)/ossrecord $(OBJECTS)
 
 
 $(TMPDIR)/ossrecord.o:	ossrecord.c
-	$(CC) -c $(CFLAGS) $(OSFLAGS) $(INCLUDES) ossrecord.c -o $(TMPDIR)/ossrecord.o
+	$(CC) -c  $(INCLUDES) ossrecord.c -o $(TMPDIR)/ossrecord.o
 
 clean: clean_local
 
--- build2/cmd/osstest/Makefile	2007-08-31 03:34:02.000000000 +0300
+++ build2/cmd/osstest/Makefile	2007-08-31 03:37:27.000000000 +0300
@@ -27,17 +27,17 @@ 
 osstest:	$(BINDIR)/osstest
 
 $(BINDIR)/osstest:	$(OBJECTS)
-	$(CC) $(CFLAGS) $(LIBRARIES) $(LDFLAGS) -s -o $(BINDIR)/osstest $(OBJECTS)
+	$(CC)  $(LDFLAGS) -s -o $(BINDIR)/osstest $(OBJECTS)
 
 
 $(TMPDIR)/help.o:	help.c
-	$(CC) -c $(CFLAGS) $(OSFLAGS) $(INCLUDES) help.c -o $(TMPDIR)/help.o
+	$(CC) -c  $(INCLUDES) help.c -o $(TMPDIR)/help.o
 
 $(TMPDIR)/osstest.o:	osstest.c
-	$(CC) -c $(CFLAGS) $(OSFLAGS) $(INCLUDES) osstest.c -o $(TMPDIR)/osstest.o
+	$(CC) -c  $(INCLUDES) osstest.c -o $(TMPDIR)/osstest.o
 
 $(TMPDIR)/wavedata.o:	wavedata.c
-	$(CC) -c $(CFLAGS) $(OSFLAGS) $(INCLUDES) wavedata.c -o $(TMPDIR)/wavedata.o
+	$(CC) -c  $(INCLUDES) wavedata.c -o $(TMPDIR)/wavedata.o
 
 clean: clean_local
 
--- build2/cmd/savemixer/Makefile	2007-08-31 03:34:02.000000000 +0300
+++ build2/cmd/savemixer/Makefile	2007-08-31 03:37:27.000000000 +0300
@@ -26,11 +26,11 @@ 
 savemixer:	$(SBINDIR)/savemixer
 
 $(SBINDIR)/savemixer:	$(OBJECTS)
-	$(CC) $(CFLAGS) $(LIBRARIES) $(LDFLAGS) -s -o $(SBINDIR)/savemixer $(OBJECTS)
+	$(CC)  $(LDFLAGS) -s -o $(SBINDIR)/savemixer $(OBJECTS)
 
 
 $(TMPDIR)/savemixer.o:	savemixer.c
-	$(CC) -c $(CFLAGS) $(OSFLAGS) $(INCLUDES) savemixer.c -o $(TMPDIR)/savemixer.o
+	$(CC) -c  $(INCLUDES) savemixer.c -o $(TMPDIR)/savemixer.o
 
 clean: clean_local
 
--- build2/os_cmd/Linux/ossvermagic/Makefile	2007-08-31 03:34:02.000000000 +0300
+++ build2/os_cmd/Linux/ossvermagic/Makefile	2007-08-31 03:38:06.000000000 +0300
@@ -26,11 +26,11 @@ 
 ossvermagic:	$(SBINDIR)/ossvermagic
 
 $(SBINDIR)/ossvermagic:	$(OBJECTS)
-	$(CC) $(CFLAGS) $(LIBRARIES) $(LDFLAGS) -s -o $(SBINDIR)/ossvermagic $(OBJECTS)
+	$(CC)  $(LDFLAGS) -s -o $(SBINDIR)/ossvermagic $(OBJECTS)
 
 
 $(TMPDIR)/ossvermagic.o:	ossvermagic.c
-	$(CC) -c $(CFLAGS) $(OSFLAGS) $(INCLUDES) ossvermagic.c -o $(TMPDIR)/ossvermagic.o
+	$(CC) -c  $(INCLUDES) ossvermagic.c -o $(TMPDIR)/ossvermagic.o
 
 clean: clean_local