--- vserver-0.23.o/Makefile	2003-04-17 23:33:46.000000000 +0200
+++ vserver-0.23/Makefile	2003-09-15 20:13:43.000000000 +0200
@@ -2,7 +2,7 @@
 PACKAGE_REV=0.23
 MANDIR=/usr/share/man
 PROGS=chbind chcontext reducecap rebootmgr vreboot readlink vunify vbuild \
-	vcheck vserver-stat showattr vdu showperm capchroot vfiles \
+	vcheck showattr vdu showperm capchroot vfiles \
 	ifspec filetime listdevip fakerunlevel parserpmdump setctxlimit
 GCCOPTS=-funsigned-char -Wall -g -O
 all: $(PROGS)
@@ -11,83 +11,68 @@
 	proto -ceo -fvutil.p vutil.cc syscall.cc
 
 chcontext: chcontext.cc syscall.o
-	gcc $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" chcontext.cc syscall.o -o chcontext \
-		-lstdc++
+	g++ $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" $^ -o $@
 
 chbind: chbind.cc syscall.o
-	gcc $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" chbind.cc syscall.o -o chbind \
-		-lstdc++
+	g++ $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" $^ -o $@
 
 reducecap: reducecap.cc syscall.o
-	gcc $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" reducecap.cc syscall.o -o reducecap \
-		-lstdc++
+	g++ $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" $^ -o $@
 
 rebootmgr: rebootmgr.cc
-	gcc $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" rebootmgr.cc -o rebootmgr \
-		-lstdc++
+	g++ $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" $^ -o $@
 
 vreboot: vreboot.cc
-	gcc -static $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" vreboot.cc -o vreboot 
+	g++ -static $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" $^ -o $@
 
 readlink: readlink.cc
-	gcc -funsigned-char $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" readlink.cc -o readlink \
-		-lstdc++
+	g++ -funsigned-char $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" $^ -o $@
 
 vunify: vunify.cc vutil.o
-	gcc $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" vunify.cc vutil.o -o vunify \
-		-lstdc++
+	g++ $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" $^ -o $@
 
 vdu: vdu.cc
-	gcc $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" vdu.cc -o vdu \
-		-lstdc++
+	g++ $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" $^ -o $@
 
 
 vbuild: vbuild.cc vutil.o
-	gcc $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" vbuild.cc vutil.o -o vbuild \
-		-lstdc++
+	g++ $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" $^ -o $@
 
 vcheck: vcheck.cc vutil.o
-	gcc $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" vcheck.cc vutil.o -o vcheck \
-		-lstdc++
+	g++ $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" $^ -o $@
 
 vfiles: vfiles.cc vutil.o
-	gcc $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" vfiles.cc vutil.o -o vfiles \
-		-lstdc++
+	g++ $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" $^ -o $@
 
 showattr: showattr.cc
-	gcc $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" showattr.cc -o showattr \
-		-lstdc++
+	g++ $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" $^ -o $@
 
 showperm: showperm.cc
-	gcc $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" showperm.cc -o showperm \
-		-lstdc++
+	g++ $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" $^ -o $@
 
 capchroot: capchroot.cc syscall.o
-	gcc $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" capchroot.cc syscall.o -o capchroot \
-		-lstdc++
+	g++ $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" $^ -o $@
 
 ifspec: ifspec.cc 
-	gcc $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" ifspec.cc -o ifspec \
-		-lstdc++
+	g++ $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" $^ -o $@
 
 parserpmdump: parserpmdump.cc 
-	gcc $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" parserpmdump.cc -o parserpmdump \
-		-lstdc++
+	g++ $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" $^ -o $@
 
-vserver-stat: vserver-stat.c syscall.o
-	gcc $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" vserver-stat.c syscall.o -o vserver-stat
+vserver-stat: vserver-stat.cc syscall.o
+	g++ $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" $^ -o $@
 
-filetime: filetime.c
-	gcc $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" filetime.c -o filetime
+filetime: filetime.cc
+	g++ $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" $^ -o $@
 
 listdevip: listdevip.cc
-	gcc $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" listdevip.cc -o listdevip
+	g++ $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" $^ -o $@
 
 fakerunlevel: fakerunlevel.cc
-	gcc $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" fakerunlevel.cc -o fakerunlevel
+	g++ $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" $^ -o $@
 
 setctxlimit: setctxlimit.cc syscall.o
-	gcc $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" setctxlimit.cc syscall.o -o setctxlimit -lstdc++
+	g++ $(GCCOPTS) -DVERSION=\"$(PACKAGE_REV)\" $^ -o $@
 
 clean:
 	rm -f $(PROGS) *.bak *~ *.o */*.bak */*~