Add shared library support for libzephyr.

11 files changed, 115 insertions, 67 deletions

diff --git a/clients/xzwrite/Makefile.in b/clients/xzwrite/Makefile.in
index ce95ccb..6641df6 100644
--- a/clients/xzwrite/Makefile.in
+++ b/clients/xzwrite/Makefile.in
@@ -6,6 +6,7 @@ datadir=@datadir@
 sysconfdir=@sysconfdir@
 sbindir=@sbindir@
 lsbindir=@lsbindir@
+top_builddir=../..
 
 includedir=${prefix}/include
 mandir=${prefix}/man
@@ -16,17 +17,20 @@ srcdir=@srcdir@
 top_srcdir=@top_srcdir@
 BUILDTOP=../..
 VPATH=@srcdir@
+LIBTOOL=@LIBTOOL@
 CC=@CC@
 INSTALL=@INSTALL@
 at=@
 
+LIBZEPHYR=${BUILDTOP}/lib/libzephyr.la
+LIBDYN=${BUILDTOP}/libdyn/libdyn.a
 CPPFLAGS=@CPPFLAGS@
 CFLAGS=@CFLAGS@
 ALL_CFLAGS=${CFLAGS} -DDATADIR=\"${datadir}\" -I${top_srcdir}/h \
 	-I${BUILDTOP}/h @X_CFLAGS@ ${CPPFLAGS}
-LDFLAGS=-L${BUILDTOP}/lib -L${BUILDTOP}/libdyn @X_LIBS@ @LDFLAGS@
-LIBS=-lzephyr -ldyn -lXaw -lXmu -lXt @X_PRE_LIBS@ -lX11 -lXext @X_EXTRA_LIBS@ \
-     @LIBS@ -lcom_err
+LDFLAGS=@X_LIBS@ @LDFLAGS@
+LIBS=${LIBZEPHYR} ${LIBDYN} -lXaw -lXmu -lXt @X_PRE_LIBS@ -lX11 -lXext \
+	@X_EXTRA_LIBS@ @LIBS@ -lcom_err
 
 OBJS=	interface.o resource.o destlist.o util.o bfgets.o gethomedir.o \
 	dest_window.o xzwrite.o edit_window.o zephyr.o GetString.o Popup.o \
@@ -34,8 +38,8 @@ OBJS=	interface.o resource.o destlist.o util.o bfgets.o gethomedir.o \
 
 all: xzwrite XZwrite
 
-xzwrite: ${OBJS} ${BUILDTOP}/lib/libzephyr.a ${BUILDTOP}/libdyn/libdyn.a
-	${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
+xzwrite: ${OBJS} ${LIBZEPHYR} ${LIBDYN}
+	${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
 .c.o:
 	${CC} -c ${ALL_CFLAGS} $<
@@ -48,13 +52,14 @@ XZwrite: XZwrite.in
 check:
 
 install: xzwrite XZwrite
-	${INSTALL} -m 755 -s xzwrite ${DESTDIR}${bindir}
+	${LIBTOOL} --mode=install ${INSTALL} -m 755 xzwrite ${DESTDIR}${bindir}
 	${INSTALL} -m 644 ${srcdir}/xzwrite.1 ${DESTDIR}${mandir}/man1
 	${INSTALL} -m 644 XZwrite ${DESTDIR}${datadir}/zephyr
 	${INSTALL} -m 644 ${srcdir}/xzwrite.bitmap ${DESTDIR}${datadir}/zephyr
 
 clean:
-	rm -f ${OBJS} xzwrite
+	${LIBTOOL} --mode=clean rm -f xzwrite
+	rm -f ${OBJS}
 
 ${OBJS}: xzwrite.h xzwrite-proto.h ${top_srcdir}/h/sysdep.h
 ${OBJS}: ${BUILDTOP}/h/config.h ${BUILDTOP}/h/zephyr/zephyr.h
diff --git a/clients/zaway/Makefile.in b/clients/zaway/Makefile.in
index 7367e36..ebee5af 100644
--- a/clients/zaway/Makefile.in
+++ b/clients/zaway/Makefile.in
@@ -6,6 +6,7 @@ datadir=@datadir@
 sysconfdir=@sysconfdir@
 sbindir=@sbindir@
 lsbindir=@lsbindir@
+top_builddir=../..
 
 includedir=${prefix}/include
 mandir=${prefix}/man
@@ -16,21 +17,23 @@ srcdir=@srcdir@
 top_srcdir=@top_srcdir@
 BUILDTOP=../..
 VPATH=@srcdir@
+LIBTOOL=@LIBTOOL@
 CC=@CC@
 INSTALL=@INSTALL@
 
+LIBZEPHYR=${BUILDTOP}/lib/libzephyr.la
 CPPFLAGS=@CPPFLAGS@
 CFLAGS=@CFLAGS@
 ALL_CFLAGS=${CFLAGS} -I${top_srcdir}/h -I${BUILDTOP}/h ${CPPFLAGS}
-LDFLAGS=-L${BUILDTOP}/lib @LDFLAGS@
-LIBS=-lzephyr @LIBS@ -lcom_err
+LDFLAGS=@LDFLAGS@
+LIBS=${LIBZEPHYR} @LIBS@ -lcom_err
 
 OBJS=	zaway.o
 
 all: zaway
 
-zaway: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
-	${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
+zaway: ${OBJS} ${LIBZEPHYR}
+	${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
 .c.o:
 	${CC} -c ${ALL_CFLAGS} $<
@@ -38,11 +41,12 @@ zaway: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
 check:
 
 install: zaway
-	${INSTALL} -m 755 -s zaway ${DESTDIR}${bindir}
+	${LIBTOOL} --mode=install ${INSTALL} -m 755 zaway ${DESTDIR}${bindir}
 	${INSTALL} -m 644 ${srcdir}/zaway.1 ${DESTDIR}${mandir}/man1
 
 clean:
-	rm -f ${OBJS} zaway
+	${LIBTOOL} --mode=clean rm -f zaway
+	rm -f ${OBJS}
 
 ${OBJS}: ${top_srcdir}/h/sysdep.h ${BUILDTOP}/h/config.h
 ${OBJS}: ${BUILDTOP}/h/zephyr/zephyr.h ${BUILDTOP}/h/zephyr/zephyr_err.h
diff --git a/clients/zctl/Makefile.in b/clients/zctl/Makefile.in
index 64e8af9..0540927 100644
--- a/clients/zctl/Makefile.in
+++ b/clients/zctl/Makefile.in
@@ -11,26 +11,29 @@ includedir=${prefix}/include
 mandir=${prefix}/man
 libdir=${exec_prefix}/lib
 bindir=${exec_prefix}/bin
+top_builddir=../..
 
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
 BUILDTOP=../..
 VPATH=@srcdir@
+LIBTOOL=@LIBTOOL@
 CC=@CC@
 INSTALL=@INSTALL@
 
+LIBZEPHYR=${BUILDTOP}/lib/libzephyr.la
 CPPFLAGS=@CPPFLAGS@
 CFLAGS=@CFLAGS@
 ALL_CFLAGS=${CFLAGS} -I${top_srcdir}/h -I${BUILDTOP}/h @X_CFLAGS@ ${CPPFLAGS}
-LDFLAGS=-L${BUILDTOP}/lib @LDFLAGS@
-LIBS=-lzephyr -lss -lreadline -lhistory -lcurses @LIBS@ -lcom_err
+LDFLAGS=@LDFLAGS@
+LIBS=${LIBZEPHYR} -lss -lreadline -lhistory -lcurses @LIBS@ -lcom_err
 
 OBJS=	zctl.o zctl_cmds.o
 
 all: zctl
 
-zctl: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
-	${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
+zctl: ${OBJS} ${LIBZEPHYR}
+	${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
 zctl_cmds.c: zctl_cmds.ct
 	mk_cmds ${srcdir}/zctl_cmds.ct
@@ -41,11 +44,12 @@ zctl_cmds.c: zctl_cmds.ct
 check:
 
 install: zctl
-	${INSTALL} -m 755 -s zctl ${DESTDIR}${bindir}
+	${LIBTOOL} --mode=install ${INSTALL} -m 755 zctl ${DESTDIR}${bindir}
 	${INSTALL} -m 644 ${srcdir}/zctl.1 ${DESTDIR}${mandir}/man1
 
 clean:
-	rm -f ${OBJS} zctl_cmds.c zctl
+	${LIBTOOL} --mode=clean rm -f zctl
+	rm -f ${OBJS} zctl_cmds.c
 
 ${OBJS}: ${top_srcdir}/h/sysdep.h ${BUILDTOP}/h/config.h
 ${OBJS}: ${BUILDTOP}/h/zephyr/zephyr.h ${BUILDTOP}/h/zephyr/zephyr_err.h
diff --git a/clients/zleave/Makefile.in b/clients/zleave/Makefile.in
index 32017ae..cff622f 100644
--- a/clients/zleave/Makefile.in
+++ b/clients/zleave/Makefile.in
@@ -11,26 +11,29 @@ includedir=${prefix}/include
 mandir=${prefix}/man
 libdir=${exec_prefix}/lib
 bindir=${exec_prefix}/bin
+top_builddir=../..
 
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
 BUILDTOP=../..
 VPATH=@srcdir@
+LIBTOOL=@LIBTOOL@
 CC=@CC@
 INSTALL=@INSTALL@
 
+LIBZEPHYR=${BUILDTOP}/lib/libzephyr.la
 CPPFLAGS=@CPPFLAGS@
 CFLAGS=@CFLAGS@
 ALL_CFLAGS=${CFLAGS} -I${top_srcdir}/h -I${BUILDTOP}/h ${CPPFLAGS}
-LDFLAGS=-L${BUILDTOP}/lib @LDFLAGS@
-LIBS=-lzephyr @LIBS@ -lcom_err
+LDFLAGS=@LDFLAGS@
+LIBS=${LIBZEPHYR} @LIBS@ -lcom_err
 
 OBJS=	zleave.o
 
 all: zleave
 
-zleave: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
-	${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
+zleave: ${OBJS} ${LIBZEPHYR}
+	${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
 .c.o:
 	${CC} -c ${ALL_CFLAGS} $<
@@ -38,11 +41,12 @@ zleave: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
 check:
 
 install: zleave
-	${INSTALL} -m 755 -s zleave ${DESTDIR}${bindir}
+	${LIBTOOL} --mode=install ${INSTALL} -m 755 zleave ${DESTDIR}${bindir}
 	${INSTALL} -m 644 ${srcdir}/zleave.1 ${DESTDIR}${mandir}/man1
 
 clean:
-	rm -f ${OBJS} zleave
+	${LIBTOOL} --mode=clean rm -f zleave
+	rm -f ${OBJS}
 
 ${OBJS}: ${top_srcdir}/h/sysdep.h ${BUILDTOP}/h/config.h
 ${OBJS}: ${BUILDTOP}/h/zephyr/zephyr.h ${BUILDTOP}/h/zephyr/zephyr_err.h
diff --git a/clients/zlocate/Makefile.in b/clients/zlocate/Makefile.in
index 7d3c335..fe88f0e 100644
--- a/clients/zlocate/Makefile.in
+++ b/clients/zlocate/Makefile.in
@@ -11,26 +11,29 @@ includedir=${prefix}/include
 mandir=${prefix}/man
 libdir=${exec_prefix}/lib
 bindir=${exec_prefix}/bin
+top_builddir=../..
 
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
 BUILDTOP=../..
 VPATH=@srcdir@
+LIBTOOL=@LIBTOOL@
 CC=@CC@
 INSTALL=@INSTALL@
 
+LIBZEPHYR=${BUILDTOP}/lib/libzephyr.la
 CPPFLAGS=@CPPFLAGS@
 CFLAGS=@CFLAGS@
 ALL_CFLAGS=${CFLAGS} -I${top_srcdir}/h -I${BUILDTOP}/h ${CPPFLAGS}
-LDFLAGS=-L${BUILDTOP}/lib @LDFLAGS@
-LIBS=-lzephyr @LIBS@ -lcom_err
+LDFLAGS=@LDFLAGS@
+LIBS=${LIBZEPHYR} @LIBS@ -lcom_err
 
 OBJS=	zlocate.o
 
 all: zlocate
 
-zlocate: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
-	${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
+zlocate: ${OBJS} ${LIBZEPHYR}
+	${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
 .c.o:
 	${CC} -c ${ALL_CFLAGS} $<
@@ -38,11 +41,12 @@ zlocate: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
 check:
 
 install: zlocate
-	${INSTALL} -m 755 -s zlocate ${DESTDIR}${bindir}
+	${LIBTOOL} --mode=install ${INSTALL} -m 755 zlocate ${DESTDIR}${bindir}
 	${INSTALL} -m 644 ${srcdir}/zlocate.1 ${DESTDIR}${mandir}/man1
 
 clean:
-	rm -f ${OBJS} zlocate
+	${LIBTOOL} --mode=clean rm -f zlocate
+	rm -f ${OBJS}
 
 ${OBJS}: ${top_srcdir}/h/sysdep.h ${BUILDTOP}/h/config.h
 ${OBJS}: ${BUILDTOP}/h/zephyr/zephyr.h ${BUILDTOP}/h/zephyr/zephyr_err.h
diff --git a/clients/zmailnotify/Makefile.in b/clients/zmailnotify/Makefile.in
index b64836e..0461a60 100644
--- a/clients/zmailnotify/Makefile.in
+++ b/clients/zmailnotify/Makefile.in
@@ -11,26 +11,29 @@ includedir=${prefix}/include
 mandir=${prefix}/man
 libdir=${exec_prefix}/lib
 bindir=${exec_prefix}/bin
+top_builddir=../..
 
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
 BUILDTOP=../..
 VPATH=@srcdir@
+LIBTOOL=@LIBTOOL@
 CC=@CC@
 INSTALL=@INSTALL@
 
+LIBZEPHYR=${BUILDTOP}/lib/libzephyr.la
 CPPFLAGS=@CPPFLAGS@
 CFLAGS=@CFLAGS@
 ALL_CFLAGS=${CFLAGS} -I${top_srcdir}/h -I${BUILDTOP}/h -DKPOP ${CPPFLAGS}
-LDFLAGS=-L${BUILDTOP}/lib @LDFLAGS@
-LIBS=-lzephyr @LIBS@ -lcom_err
+LDFLAGS=@LDFLAGS@
+LIBS=${LIBZEPHYR} @LIBS@ -lcom_err
 
 OBJS=	zmailnotify.o
 
 all: zmailnotify
 
-zmailnotify: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
-	${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
+zmailnotify: ${OBJS} ${LIBZEPHYR}
+	${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
 .c.o:
 	${CC} -c ${ALL_CFLAGS} $<
@@ -38,11 +41,13 @@ zmailnotify: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
 check:
 
 install: zmailnotify
-	${INSTALL} -m 755 -s zmailnotify ${DESTDIR}${bindir}
+	${LIBTOOL} --mode=install ${INSTALL} -m 755 zmailnotify \
+	  ${DESTDIR}${bindir}
 	${INSTALL} -m 644 ${srcdir}/zmailnotify.1 ${DESTDIR}${mandir}/man1
 
 clean:
-	rm -f ${OBJS} zmailnotify
+	${LIBTOOL} --mode=clean rm -f zmailnotify
+	rm -f ${OBJS}
 
 ${OBJS}: ${top_srcdir}/h/sysdep.h ${BUILDTOP}/h/config.h
 ${OBJS}: ${BUILDTOP}/h/zephyr/zephyr.h ${BUILDTOP}/h/zephyr/zephyr_err.h
diff --git a/clients/znol/Makefile.in b/clients/znol/Makefile.in
index 3125534..969e44b 100644
--- a/clients/znol/Makefile.in
+++ b/clients/znol/Makefile.in
@@ -11,26 +11,29 @@ includedir=${prefix}/include
 mandir=${prefix}/man
 libdir=${exec_prefix}/lib
 bindir=${exec_prefix}/bin
+top_builddir=../..
 
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
 BUILDTOP=../..
 VPATH=@srcdir@
+LIBTOOL=@LIBTOOL@
 CC=@CC@
 INSTALL=@INSTALL@
 
+LIBZEPHYR=${BUILDTOP}/lib/libzephyr.la
 CPPFLAGS=@CPPFLAGS@
 CFLAGS=@CFLAGS@
 ALL_CFLAGS=${CFLAGS} -I${top_srcdir}/h -I${BUILDTOP}/h ${CPPFLAGS}
-LDFLAGS=-L${BUILDTOP}/lib @LDFLAGS@
-LIBS=-lzephyr @LIBS@ -lcom_err
+LDFLAGS=@LDFLAGS@
+LIBS=${LIBZEPHYR} @LIBS@ -lcom_err
 
 OBJS=	znol.o
 
 all: znol
 
-znol: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
-	${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
+znol: ${OBJS} ${LIBZEPHYR}
+	${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
 .c.o:
 	${CC} -c ${ALL_CFLAGS} $<
@@ -38,11 +41,12 @@ znol: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
 check:
 
 install: znol
-	${INSTALL} -m 755 -s znol ${DESTDIR}${bindir}
+	${LIBTOOL} --mode=install ${INSTALL} -m 755 znol ${DESTDIR}${bindir}
 	${INSTALL} -m 644 ${srcdir}/znol.1 ${DESTDIR}${mandir}/man1
 
 clean:
-	rm -f ${OBJS} znol
+	${LIBTOOL} --mode=clean rm -f znol
+	rm -f ${OBJS}
 
 ${OBJS}: ${top_srcdir}/h/sysdep.h ${BUILDTOP}/h/config.h
 ${OBJS}: ${BUILDTOP}/h/zephyr/zephyr.h ${BUILDTOP}/h/zephyr/zephyr_err.h
diff --git a/clients/zpopnotify/Makefile.in b/clients/zpopnotify/Makefile.in
index 1de21bf..020a181 100644
--- a/clients/zpopnotify/Makefile.in
+++ b/clients/zpopnotify/Makefile.in
@@ -11,26 +11,29 @@ includedir=${prefix}/include
 mandir=${prefix}/man
 libdir=${exec_prefix}/lib
 bindir=${exec_prefix}/bin
+top_builddir=../..
 
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
 BUILDTOP=../..
 VPATH=@srcdir@
+LIBTOOL=@LIBTOOL@
 CC=@CC@
 INSTALL=@INSTALL@
 
+LIBZEPHYR=${BUILDTOP}/lib/libzephyr.la
 CPPFLAGS=@CPPFLAGS@
 CFLAGS=@CFLAGS@
 ALL_CFLAGS=${CFLAGS} -I${top_srcdir}/h -I${BUILDTOP}/h ${CPPFLAGS}
-LDFLAGS=-L${BUILDTOP}/lib @LDFLAGS@
-LIBS=-lzephyr @LIBS@ -lcom_err
+LDFLAGS=@LDFLAGS@
+LIBS=${LIBZEPHYR} @LIBS@ -lcom_err
 
 OBJS=	zpopnotify.o
 
 all: zpopnotify
 
-zpopnotify: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
-	${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
+zpopnotify: ${OBJS} ${LIBZEPHYR}
+	${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
 .c.o:
 	${CC} -c ${ALL_CFLAGS} $<
@@ -38,11 +41,13 @@ zpopnotify: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
 check:
 
 install: zpopnotify
-	${INSTALL} -m 755 -s zpopnotify ${DESTDIR}${sbindir}
+	${LIBTOOL} --mode=install ${INSTALL} -m 755 zpopnotify \
+	  ${DESTDIR}${sbindir}
 	${INSTALL} -m 644 ${srcdir}/zpopnotify.8 ${DESTDIR}${mandir}/man8
 
 clean:
-	rm -f ${OBJS} zpopnotify
+	${LIBTOOL} --mode=clean rm -f zpopnotify
+	rm -f ${OBJS}
 
 ${OBJS}: ${top_srcdir}/h/sysdep.h ${BUILDTOP}/h/config.h
 ${OBJS}: ${BUILDTOP}/h/zephyr/zephyr.h ${BUILDTOP}/h/zephyr/zephyr_err.h
diff --git a/clients/zshutdown_notify/Makefile.in b/clients/zshutdown_notify/Makefile.in
index 6891efd..f619a09 100644
--- a/clients/zshutdown_notify/Makefile.in
+++ b/clients/zshutdown_notify/Makefile.in
@@ -11,26 +11,29 @@ includedir=${prefix}/include
 mandir=${prefix}/man
 libdir=${exec_prefix}/lib
 bindir=${exec_prefix}/bin
+top_builddir=../..
 
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
 BUILDTOP=../..
 VPATH=@srcdir@
+LIBTOOL=@LIBTOOL@
 CC=@CC@
 INSTALL=@INSTALL@
 
+LIBZEPHYR=${BUILDTOP}/lib/libzephyr.la
 CPPFLAGS=@CPPFLAGS@
 CFLAGS=@CFLAGS@
 ALL_CFLAGS=${CFLAGS} -I${top_srcdir}/h -I${BUILDTOP}/h ${CPPFLAGS}
-LDFLAGS=-L${BUILDTOP}/lib @LDFLAGS@
-LIBS=-lzephyr @LIBS@ -lcom_err
+LDFLAGS=@LDFLAGS@
+LIBS=${LIBZEPHYR} @LIBS@ -lcom_err
 
 OBJS=	zshutdown_notify.o
 
 all: zshutdown_notify
 
-zshutdown_notify: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
-	${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
+zshutdown_notify: ${OBJS} ${LIBZEPHYR}
+	${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
 .c.o:
 	${CC} -c ${ALL_CFLAGS} $<
@@ -38,11 +41,13 @@ zshutdown_notify: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
 check:
 
 install: zshutdown_notify
-	${INSTALL} -m 755 -s zshutdown_notify ${DESTDIR}${lsbindir}
+	${LIBTOOL} --mode=install ${INSTALL} -m 755 zshutdown_notify \
+	  ${DESTDIR}${lsbindir}
 	${INSTALL} -m 644 ${srcdir}/zshutdown_notify.8 ${DESTDIR}${mandir}/man8
 
 clean:
-	rm -f ${OBJS} zshutdown_notify
+	${LIBTOOL} --mode=clean rm -f zshutdown_notify
+	rm -f ${OBJS}
 
 ${OBJS}: ${top_srcdir}/h/sysdep.h ${BUILDTOP}/h/config.h
 ${OBJS}: ${BUILDTOP}/h/zephyr/zephyr.h ${BUILDTOP}/h/zephyr/zephyr_err.h
diff --git a/clients/zstat/Makefile.in b/clients/zstat/Makefile.in
index d33f7f0..d5aae02 100644
--- a/clients/zstat/Makefile.in
+++ b/clients/zstat/Makefile.in
@@ -11,26 +11,29 @@ includedir=${prefix}/include
 mandir=${prefix}/man
 libdir=${exec_prefix}/lib
 bindir=${exec_prefix}/bin
+top_builddir=../..
 
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
 BUILDTOP=../..
 VPATH=@srcdir@
+LIBTOOL=@LIBTOOL@
 CC=@CC@
 INSTALL=@INSTALL@
 
+LIBZEPHYR=${BUILDTOP}/lib/libzephyr.la
 CPPFLAGS=@CPPFLAGS@
 CFLAGS=@CFLAGS@
 ALL_CFLAGS=${CFLAGS} -I${top_srcdir}/h -I${BUILDTOP}/h ${CPPFLAGS}
-LDFLAGS=-L${BUILDTOP}/lib @LDFLAGS@
-LIBS=-lzephyr @LIBS@ -lcom_err
+LDFLAGS=@LDFLAGS@
+LIBS=${LIBZEPHYR} @LIBS@ -lcom_err
 
 OBJS=	zstat.o
 
 all: zstat
 
-zstat: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
-	${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
+zstat: ${OBJS} ${LIBZEPHYR}
+	${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
 .c.o:
 	${CC} -c ${ALL_CFLAGS} $<
@@ -38,11 +41,12 @@ zstat: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
 check:
 
 install: zstat
-	${INSTALL} -m 755 -s zstat ${DESTDIR}${bindir}
+	${LIBTOOL} --mode=install ${INSTALL} -m 755 zstat ${DESTDIR}${bindir}
 	${INSTALL} -m 644 ${srcdir}/zstat.8 ${DESTDIR}${mandir}/man8
 
 clean:
-	rm -f ${OBJS} zstat
+	${LIBTOOL} --mode=clean rm -f zstat
+	rm -f ${OBJS}
 
 ${OBJS}: zserver.h ${top_srcdir}/h/sysdep.h ${BUILDTOP}/h/config.h
 ${OBJS}: ${BUILDTOP}/h/zephyr/zephyr.h ${BUILDTOP}/h/zephyr/zephyr_err.h
diff --git a/clients/zwrite/Makefile.in b/clients/zwrite/Makefile.in
index 819e56c..304f268 100644
--- a/clients/zwrite/Makefile.in
+++ b/clients/zwrite/Makefile.in
@@ -11,26 +11,29 @@ includedir=${prefix}/include
 mandir=${prefix}/man
 libdir=${exec_prefix}/lib
 bindir=${exec_prefix}/bin
+top_builddir=../..
 
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
 BUILDTOP=../..
 VPATH=@srcdir@
+LIBTOOL=@LIBTOOL@
 CC=@CC@
 INSTALL=@INSTALL@
 
+LIBZEPHYR=${BUILDTOP}/lib/libzephyr.la
 CPPFLAGS=@CPPFLAGS@
 CFLAGS=@CFLAGS@
 ALL_CFLAGS=${CFLAGS} -I${top_srcdir}/h -I${BUILDTOP}/h ${CPPFLAGS}
-LDFLAGS=-L${BUILDTOP}/lib @LDFLAGS@
-LIBS=-lzephyr @LIBS@ -lcom_err
+LDFLAGS=@LDFLAGS@
+LIBS=${LIBZEPHYR} @LIBS@ -lcom_err
 
 OBJS=	zwrite.o
 
 all: zwrite
 
-zwrite: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
-	${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
+zwrite: ${OBJS} ${LIBZEPHYR}
+	${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
 .c.o:
 	${CC} -c ${ALL_CFLAGS} $<
@@ -38,11 +41,12 @@ zwrite: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
 check:
 
 install: zwrite
-	${INSTALL} -m 755 -s zwrite ${DESTDIR}${bindir}
+	${LIBTOOL} --mode=install ${INSTALL} -m 755 zwrite ${DESTDIR}${bindir}
 	${INSTALL} -m 644 ${srcdir}/zwrite.1 ${DESTDIR}${mandir}/man1
 
 clean:
-	rm -f ${OBJS} zwrite
+	${LIBTOOL} --mode=clean rm -f zwrite
+	rm -f ${OBJS}
 
 ${OBJS}: ${top_srcdir}/h/sysdep.h ${BUILDTOP}/h/config.h
 ${OBJS}: ${BUILDTOP}/h/zephyr/zephyr.h ${BUILDTOP}/h/zephyr/zephyr_err.h