--- libsx-2.05/demo0/makefile.examples	1999-06-22 14:41:40.000000000 +0200
+++ libsx-2.05/demo0/makefile	2007-02-15 13:46:00.000000000 +0100
@@ -21,9 +21,9 @@
 
 
 # main.o depends on main.c (of course) and main.h and callbacks.h
-main.o : main.c main.h callbacks.h libsx.h
+main.o : main.c main.h callbacks.h
 
-callbacks.o : libsx.h callbacks.c main.h
+callbacks.o : callbacks.c main.h
 
 
 #
--- libsx-2.05/pcurve/makefile.examples	1994-11-06 00:21:09.000000000 +0100
+++ libsx-2.05/pcurve/makefile	2007-02-15 13:46:00.000000000 +0100
@@ -1,20 +1,23 @@
-#!smake
+include ../libsx_defs
 
 CFLAGS	= -g -I../controlbox
 
-CLIBS	= ../src/libsxGL.a -lGLU -lGL -lXaw -lXt -lXmu -lX11 -lm
-LDFLAGS = $(LIBPATH) $(LIBS)
+CLIBS	= -lGLU -lGL -lXaw -lXt -lXmu -lX11 -lm
+LDFLAGS = $(LIBPATH) $(LIBS) $(CLIBS)
 
 OBJS = fogl.o cfogl.o
-OTHEROBJS = ../controlbox/controlbox.o
+OTHEROBJS = controlbox.o
 
-default:	pcurve
+default: $(OTHEROBJS) pcurve
+
+controlbox.o: ../controlbox/controlbox.c
+	cc -c $(CFLAGS) ../controlbox/controlbox.c -o controlbox.o
 
 clean:
 	rm -f $(OBJS) cool
 
-pcurve:	pcurve.c
-	cc $(CFLAGS) pcurve.c -o pcurve $(OTHEROBJS) $(LIBPATH) $(CLIBS)
+pcurve:	pcurve.c $(OTHEROBJS)
+	cc $(CFLAGS) pcurve.c -o pcurve $(OTHEROBJS) $(LDFLAGS)
 
-cool2:	cool2.c
-	cc $(CFLAGS) cool2.c $(OTHEROBJS) -o cool2 $(LIBPATH) $(CLIBS)
+cool2:	cool2.c $(OTHEROBJS)
+	cc $(CFLAGS) cool2.c $(OTHEROBJS) -o cool2 $(LDFLAGS)
--- libsx-2.05/demo3/makefile.examples	2007-02-15 13:48:46.000000000 +0100
+++ libsx-2.05/demo3/makefile	2007-02-15 15:47:47.000000000 +0100
@@ -10,9 +10,9 @@
 
 
 # main.o depends on main.c (of course) and main.h and callbacks.h
-main.o : main.c main.h callbacks.h libsx.h
+main.o : main.c main.h callbacks.h
 
-callbacks.o : libsx.h callbacks.c main.h
+callbacks.o : callbacks.c main.h
 
 
 clean :
--- libsx-2.05/controlbox/makefile.examples	2000-07-23 20:57:49.000000000 +0200
+++ libsx-2.05/controlbox/makefile	2007-02-15 13:46:00.000000000 +0100
@@ -10,9 +10,9 @@
 
 
 # main.o depends on main.c (of course) and main.h and callbacks.h
-main.o : main.c main.h callbacks.h libsx.h controlbox.h
+main.o : main.c main.h callbacks.h controlbox.h
 
-callbacks.o : libsx.h callbacks.c
+callbacks.o : callbacks.c
 
 controlbox.o : controlbox.c controlbox.c
 
--- libsx-2.05/freq/makefile.examples	1994-02-02 17:54:22.000000000 +0100
+++ libsx-2.05/freq/makefile	2007-02-15 13:46:00.000000000 +0100
@@ -3,9 +3,11 @@
 include ../libsx_defs
 
 FREQ_OBJS  = freq.o dirlist.o
+SIMPLE_FREQ_OBJS = simple_freq.o
 OBJS       = main.o libfreq.a
+SIMPLE_OBJS = main.o libsimplefreq.a
 
-all : libfreq.a freq
+all : libfreq.a freq libsimplefreq.a simple_freq
 
 
 libfreq.a : $(FREQ_OBJS)
@@ -13,16 +15,24 @@
 	ar rc libfreq.a $(FREQ_OBJS)
 	$(RANLIB) libfreq.a
 
+libsimplefreq.a : $(SIMPLE_FREQ_OBJS)
+	rm -f libsimplefreq.a
+	ar rc libsimplefreq.a $(SIMPLE_FREQ_OBJS)
+	$(RANLIB) libsimplefreq.a
 
 freq : $(OBJS) 
 	$(CC) -o $@ $(OBJS) $(LIBS)
 
+simple_freq : $(SIMPLE_OBJS)
+	$(CC) -o $@ $(SIMPLE_OBJS) $(LIBS)
 
-main.o : main.c libsx.h freq.h
+main.o : main.c freq.h
 
 freq.o : freq.c
 
+simple_freq.o : simple_freq.c
+
 dirlist.o : dirlist.c
 
 clean:
-	rm -f *.o *~ core freq libfreq.a
+	rm -f *.o *~ core freq libfreq.a simple_freq libsimplefreq.a
--- libsx-2.05/multireq/makefile.examples	2007-02-15 13:47:36.000000000 +0100
+++ libsx-2.05/multireq/makefile	2007-02-15 13:47:45.000000000 +0100
@@ -9,7 +9,7 @@
 multireq : $(OBJS)
 	$(CC) -g -o $@ $(OBJS) $(LIBS)
 
-main.o : main.c libsx.h multireq.h
+main.o : main.c multireq.h
 
 multireq.o : multireq.c multireq.h
 
--- libsx-2.05/skel/makefile.examples	1994-01-19 21:10:46.000000000 +0100
+++ libsx-2.05/skel/makefile	2007-02-15 13:46:00.000000000 +0100
@@ -10,9 +10,9 @@
 
 
 # main.o depends on main.c (of course) and main.h and callbacks.h
-main.o : main.c main.h callbacks.h libsx.h
+main.o : main.c main.h callbacks.h
 
-callbacks.o : libsx.h callbacks.c
+callbacks.o : callbacks.c
 
 clean :
 	rm -f *.o *~ core skel
--- libsx-2.05/demo2/makefile.examples	1994-01-19 21:12:08.000000000 +0100
+++ libsx-2.05/demo2/makefile	2007-02-15 13:46:00.000000000 +0100
@@ -10,9 +10,9 @@
 
 
 # main.o depends on main.c (of course) and main.h and callbacks.h
-main.o : main.c main.h callbacks.h libsx.h
+main.o : main.c main.h callbacks.h
 
-callbacks.o : libsx.h callbacks.c main.h
+callbacks.o : callbacks.c main.h
 
 
 clean :
--- libsx-2.05/demo1/makefile.examples	1994-01-19 21:12:13.000000000 +0100
+++ libsx-2.05/demo1/makefile	2007-02-15 13:46:00.000000000 +0100
@@ -10,9 +10,9 @@
 
 
 # main.o depends on main.c (of course) and main.h and callbacks.h
-main.o : main.c main.h callbacks.h libsx.h
+main.o : main.c main.h callbacks.h
 
-callbacks.o : libsx.h callbacks.c main.h
+callbacks.o : callbacks.c main.h
 
 
 #
--- libsx-2.05/xrootbg/makefile.examples	1999-12-14 21:02:00.000000000 +0100
+++ libsx-2.05/xrootbg/makefile	2007-02-15 13:46:00.000000000 +0100
@@ -1,7 +1,7 @@
 #
 #
-XAWLIB=Xaw95
-# XAWLIB=Xaw
+#XAWLIB=Xaw95
+XAWLIB=Xaw
 include ../libsx_defs
 CFLAGS = -Wall -O2 -D_POSIX_SOURCE -D$(XAWLIB)
 
--- libsx-2.05/creq/makefile.examples	1994-01-19 21:21:40.000000000 +0100
+++ libsx-2.05/creq/makefile	2007-02-15 13:46:00.000000000 +0100
@@ -10,7 +10,7 @@
 creq : $(OBJS) 
 	$(CC) -o $@ $(OBJS) $(LIBS)
 
-main.o : main.c libsx.h creq.h
+main.o : main.c creq.h
 
 creq.o : creq.c