Merge forward makefile changes

git-svn-id: svn://svn.1ts.org/debian/trunk/zephyr@132 cbed1d16-5ef5-0310-b6a1-d4a37b08ba1f

diff --git a/Makefile.in b/Makefile.in
index 1d7392e210c392922e32fbae73595da2f0e9f60f..6f8b3e92e99a77ba1f7088295f757f4e1e41ac90 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -12,13 +12,14 @@ bindir=${exec_prefix}/bin
 libdir=${exec_prefix}/lib
 
 srcdir=@srcdir@
+VPATH=@srcdir@
 top_srcdir=@top_srcdir@
 ENSUREDIR=${srcdir}/ensure-dir.sh
 INSTALL=@INSTALL@
 
 SUBDIRS=lib libdyn clients server zhm zwgc
 
-all:
+all: libtool h/config.h
        for i in ${SUBDIRS}; do (cd $$i; ${MAKE} $@) || exit 1; done
 
 check clean:
@@ -49,3 +50,17 @@ install:
 
 .PHONY: all check install clean
 
+aclocal.m4: acinclude.m4
+       cd $(srcdir) && aclocal
+configure: configure.in aclocal.m4
+       cd $(srcdir) && autoconf
+h/config.h.in: configure.in aclocal.m4 acconfig.h
+       cd $(srcdir) && autoheader
+libtool: $(LIBTOOL_DEPS)
+       $(SHELL) ./config.status --recheck
+config.status: configure
+       $(SHELL) ./config.status --recheck
+h/config.h: h/config.h.in config.status
+       $(SHELL) ./config.status
+Makefile: config.status Makefile.in
+       $(SHELL) ./config.status

diff --git a/clients/xzwrite/Makefile.in b/clients/xzwrite/Makefile.in
index 652170f6ef335f81dfddc9a390b994606a49f700..f2813683059a4fa0d0dc5068aaf6af4a2824b7f0 100644 (file)
--- a/clients/xzwrite/Makefile.in
+++ b/clients/xzwrite/Makefile.in
@@ -14,10 +14,12 @@ bindir=${exec_prefix}/bin
 
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
+top_builddir=../..
 BUILDTOP=../..
 VPATH=@srcdir@
 CC=@CC@
 INSTALL=@INSTALL@
+LIBTOOL=@LIBTOOL@
 at=@
 
 CPPFLAGS=@CPPFLAGS@
@@ -25,8 +27,8 @@ 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
+LIBS=${BUILDTOP}/lib/libzephyr.la ${BUILDTOP}/libdyn/libzdyn.la -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 +36,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} ${BUILDTOP}/lib/libzephyr.la ${BUILDTOP}/libdyn/libzdyn.la
+       ${LIBTOOL} ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
 .c.o:
        ${CC} -c ${ALL_CFLAGS} $<
@@ -48,13 +50,13 @@ XZwrite: XZwrite.in
 check:
 
 install: xzwrite XZwrite
-       ${INSTALL} -m 755 -s 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
+       ${LIBTOOL} ${INSTALL} -m 755 -s xzwrite ${DESTDIR}${bindir}
+       ${LIBTOOL} ${INSTALL} -m 644 ${srcdir}/xzwrite.1 ${DESTDIR}${mandir}/man1
+       ${LIBTOOL} ${INSTALL} -m 644 XZwrite ${DESTDIR}${datadir}/zephyr
+       ${LIBTOOL} ${INSTALL} -m 644 ${srcdir}/xzwrite.bitmap ${DESTDIR}${datadir}/zephyr
 
 clean:
-       rm -f ${OBJS} xzwrite
+       ${LIBTOOL} rm -f ${OBJS} xzwrite
 
 ${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 055e0be488b9d505227f73d367f67bb363a091bb..f29ad44d1486a6de07a69af97bfd92330e42fba8 100644 (file)
--- a/clients/zaway/Makefile.in
+++ b/clients/zaway/Makefile.in
@@ -14,23 +14,25 @@ bindir=${exec_prefix}/bin
 
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
+top_builddir=../..
 BUILDTOP=../..
 VPATH=@srcdir@
 CC=@CC@
 INSTALL=@INSTALL@
+LIBTOOL=@LIBTOOL@
 
 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
+LIBS=${BUILDTOP}/lib/libzephyr.la @LIBS@ -lcom_err
 
 OBJS=  zaway.o
 
 all: zaway
 
-zaway: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
-       ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
+zaway: ${OBJS} ${BUILDTOP}/lib/libzephyr.la
+       ${LIBTOOL} ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
 .c.o:
        ${CC} -c ${ALL_CFLAGS} $<
@@ -38,11 +40,11 @@ zaway: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
 check:
 
 install: zaway
-       ${INSTALL} -m 755 -s zaway ${DESTDIR}${bindir}
-       ${INSTALL} -m 644 ${srcdir}/zaway.1 ${DESTDIR}${mandir}/man1
+       ${LIBTOOL} ${INSTALL} -m 755 -s zaway ${DESTDIR}${bindir}
+       ${LIBTOOL} ${INSTALL} -m 644 ${srcdir}/zaway.1 ${DESTDIR}${mandir}/man1
 
 clean:
-       rm -f ${OBJS} zaway
+       ${LIBTOOL} rm -f ${OBJS} zaway
 
 ${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 1d6bdb13a406fcec8ac1dc88911d48b7a01997b6..145245ec811f35265b7533346c527f04c35eb91a 100644 (file)
--- a/clients/zctl/Makefile.in
+++ b/clients/zctl/Makefile.in
@@ -14,23 +14,26 @@ bindir=${exec_prefix}/bin
 
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
+top_builddir=../..
 BUILDTOP=../..
 VPATH=@srcdir@
 CC=@CC@
 INSTALL=@INSTALL@
+LIBTOOL=@LIBTOOL@
 
 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
+LIBS=${BUILDTOP}/lib/libzephyr.la -lss -lreadline -lhistory -lcurses @LIBS@ \
+       -lcom_err
 
-OBJS=  zctl.o zctl_cmds.o
+OBJS=  zctl.o zutils.o zctl_cmds.o
 
 all: zctl
 
-zctl: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
-       ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
+zctl: ${OBJS} ${BUILDTOP}/lib/libzephyr.la
+       ${LIBTOOL} ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
 zctl_cmds.c: zctl_cmds.ct
        mk_cmds ${srcdir}/zctl_cmds.ct
@@ -41,11 +44,11 @@ zctl_cmds.c: zctl_cmds.ct
 check:
 
 install: zctl
-       ${INSTALL} -m 755 -s zctl ${DESTDIR}${bindir}
-       ${INSTALL} -m 644 ${srcdir}/zctl.1 ${DESTDIR}${mandir}/man1
+       ${LIBTOOL} ${INSTALL} -m 755 -s zctl ${DESTDIR}${bindir}
+       ${LIBTOOL} ${INSTALL} -m 644 ${srcdir}/zctl.1 ${DESTDIR}${mandir}/man1
 
 clean:
-       rm -f ${OBJS} zctl_cmds.c zctl
+       ${LIBTOOL} rm -f ${OBJS} zctl_cmds.c zctl
 
 ${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 45c794b2b9b8794082b306d0088683aa6ee10016..dc0e34b93b490bb869c5640fb5a635b6e0c19b3f 100644 (file)
--- a/clients/zleave/Makefile.in
+++ b/clients/zleave/Makefile.in
@@ -14,23 +14,25 @@ bindir=${exec_prefix}/bin
 
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
+top_builddir=../..
 BUILDTOP=../..
 VPATH=@srcdir@
 CC=@CC@
 INSTALL=@INSTALL@
+LIBTOOL=@LIBTOOL@
 
 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
+LIBS=${BUILDTOP}/lib/libzephyr.la @LIBS@ -lcom_err
 
 OBJS=  zleave.o
 
 all: zleave
 
-zleave: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
-       ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
+zleave: ${OBJS} ${BUILDTOP}/lib/libzephyr.la
+       ${LIBTOOL} ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
 .c.o:
        ${CC} -c ${ALL_CFLAGS} $<
@@ -38,11 +40,11 @@ zleave: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
 check:
 
 install: zleave
-       ${INSTALL} -m 755 -s zleave ${DESTDIR}${bindir}
-       ${INSTALL} -m 644 ${srcdir}/zleave.1 ${DESTDIR}${mandir}/man1
+       ${LIBTOOL} ${INSTALL} -m 755 -s zleave ${DESTDIR}${bindir}
+       ${LIBTOOL} ${INSTALL} -m 644 ${srcdir}/zleave.1 ${DESTDIR}${mandir}/man1
 
 clean:
-       rm -f ${OBJS} zleave
+       ${LIBTOOL} rm -f ${OBJS} zleave
 
 ${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 66843e4bea0c8c8a545cadfc662d2643b54b8615..2a6dd0638f5a74e361829e81be4ea415f8b5ec44 100644 (file)
--- a/clients/zlocate/Makefile.in
+++ b/clients/zlocate/Makefile.in
@@ -14,23 +14,25 @@ bindir=${exec_prefix}/bin
 
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
+top_builddir=../..
 BUILDTOP=../..
 VPATH=@srcdir@
 CC=@CC@
 INSTALL=@INSTALL@
+LIBTOOL=@LIBTOOL@
 
 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
+LIBS=${BUILDTOP}/lib/libzephyr.la @LIBS@ -lcom_err
 
 OBJS=  zlocate.o
 
 all: zlocate
 
-zlocate: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
-       ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
+zlocate: ${OBJS} ${BUILDTOP}/lib/libzephyr.la
+       ${LIBTOOL} ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
 .c.o:
        ${CC} -c ${ALL_CFLAGS} $<
@@ -38,11 +40,11 @@ zlocate: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
 check:
 
 install: zlocate
-       ${INSTALL} -m 755 -s zlocate ${DESTDIR}${bindir}
-       ${INSTALL} -m 644 ${srcdir}/zlocate.1 ${DESTDIR}${mandir}/man1
+       ${LIBTOOL} ${INSTALL} -m 755 -s zlocate ${DESTDIR}${bindir}
+       ${LIBTOOL} ${INSTALL} -m 644 ${srcdir}/zlocate.1 ${DESTDIR}${mandir}/man1
 
 clean:
-       rm -f ${OBJS} zlocate
+       ${LIBTOOL} rm -f ${OBJS} zlocate
 
 ${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 b43133d4d6bb47d101d15e1b3ff1e027c0cc70eb..436d1659dcf63a24ae6a7e4371606912af440722 100644 (file)
--- a/clients/zmailnotify/Makefile.in
+++ b/clients/zmailnotify/Makefile.in
@@ -14,23 +14,25 @@ bindir=${exec_prefix}/bin
 
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
+top_builddir=../..
 BUILDTOP=../..
 VPATH=@srcdir@
 CC=@CC@
 INSTALL=@INSTALL@
+LIBTOOL=@LIBTOOL@
 
 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
+LIBS=${BUILDTOP}/lib/libzephyr.la @LIBS@ -lcom_err
 
 OBJS=  zmailnotify.o
 
 all: zmailnotify
 
-zmailnotify: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
-       ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
+zmailnotify: ${OBJS} ${BUILDTOP}/lib/libzephyr.la
+       ${LIBTOOL} ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
 .c.o:
        ${CC} -c ${ALL_CFLAGS} $<
@@ -38,11 +40,11 @@ zmailnotify: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
 check:
 
 install: zmailnotify
-       ${INSTALL} -m 755 -s zmailnotify ${DESTDIR}${bindir}
-       ${INSTALL} -m 644 ${srcdir}/zmailnotify.1 ${DESTDIR}${mandir}/man1
+       ${LIBTOOL} ${INSTALL} -m 755 -s zmailnotify ${DESTDIR}${bindir}
+       ${LIBTOOL} ${INSTALL} -m 644 ${srcdir}/zmailnotify.1 ${DESTDIR}${mandir}/man1
 
 clean:
-       rm -f ${OBJS} zmailnotify
+       ${LIBTOOL} rm -f ${OBJS} zmailnotify
 
 ${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 aa2224ea2ff02cf0544606d2a696b7cccb2981b8..84a7977589e44d7fb1e9a191dc6adfb496460da2 100644 (file)
--- a/clients/znol/Makefile.in
+++ b/clients/znol/Makefile.in
@@ -14,23 +14,25 @@ bindir=${exec_prefix}/bin
 
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
+top_builddir=../..
 BUILDTOP=../..
 VPATH=@srcdir@
 CC=@CC@
 INSTALL=@INSTALL@
+LIBTOOL=@LIBTOOL@
 
 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
+LIBS=${BUILDTOP}/lib/libzephyr.la @LIBS@ -lcom_err
 
 OBJS=  znol.o
 
 all: znol
 
-znol: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
-       ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
+znol: ${OBJS} ${BUILDTOP}/lib/libzephyr.la
+       ${LIBTOOL} ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
 .c.o:
        ${CC} -c ${ALL_CFLAGS} $<
@@ -38,11 +40,11 @@ znol: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
 check:
 
 install: znol
-       ${INSTALL} -m 755 -s znol ${DESTDIR}${bindir}
-       ${INSTALL} -m 644 ${srcdir}/znol.1 ${DESTDIR}${mandir}/man1
+       ${LIBTOOL} ${INSTALL} -m 755 -s znol ${DESTDIR}${bindir}
+       ${LIBTOOL} ${INSTALL} -m 644 ${srcdir}/znol.1 ${DESTDIR}${mandir}/man1
 
 clean:
-       rm -f ${OBJS} znol
+       ${LIBTOOL} rm -f ${OBJS} znol
 
 ${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 e6c1370599a4a042167a712feb0c7634bfbc7954..7a0f9ced97d5f47a3803757432a3f1d8a3406df6 100644 (file)
--- a/clients/zpopnotify/Makefile.in
+++ b/clients/zpopnotify/Makefile.in
@@ -14,23 +14,25 @@ bindir=${exec_prefix}/bin
 
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
+top_builddir=../..
 BUILDTOP=../..
 VPATH=@srcdir@
 CC=@CC@
 INSTALL=@INSTALL@
+LIBTOOL=@LIBTOOL@
 
 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
+LIBS=${BUILDTOP}/lib/libzephyr.la @LIBS@ -lcom_err
 
 OBJS=  zpopnotify.o
 
 all: zpopnotify
 
-zpopnotify: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
-       ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
+zpopnotify: ${OBJS} ${BUILDTOP}/lib/libzephyr.la
+       ${LIBTOOL} ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
 .c.o:
        ${CC} -c ${ALL_CFLAGS} $<
@@ -38,11 +40,11 @@ zpopnotify: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
 check:
 
 install: zpopnotify
-       ${INSTALL} -m 755 -s zpopnotify ${DESTDIR}${sbindir}
-       ${INSTALL} -m 644 ${srcdir}/zpopnotify.8 ${DESTDIR}${mandir}/man8
+       ${LIBTOOL} ${INSTALL} -m 755 -s zpopnotify ${DESTDIR}${sbindir}
+       ${LIBTOOL} ${INSTALL} -m 644 ${srcdir}/zpopnotify.8 ${DESTDIR}${mandir}/man8
 
 clean:
-       rm -f ${OBJS} zpopnotify
+       ${LIBTOOL} rm -f ${OBJS} zpopnotify
 
 ${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 78a42424c05ea947eab4817ddc5e8d679549e4b9..31c8d4d128fe30327fa6cf6c6f32a04548010f74 100644 (file)
--- a/clients/zshutdown_notify/Makefile.in
+++ b/clients/zshutdown_notify/Makefile.in
@@ -14,23 +14,25 @@ bindir=${exec_prefix}/bin
 
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
+top_builddir=../..
 BUILDTOP=../..
 VPATH=@srcdir@
 CC=@CC@
 INSTALL=@INSTALL@
+LIBTOOL=@LIBTOOL@
 
 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
+LIBS=${BUILDTOP}/lib/libzephyr.la @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} ${BUILDTOP}/lib/libzephyr.la
+       ${LIBTOOL} ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
 .c.o:
        ${CC} -c ${ALL_CFLAGS} $<
@@ -38,11 +40,11 @@ zshutdown_notify: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
 check:
 
 install: zshutdown_notify
-       ${INSTALL} -m 755 -s zshutdown_notify ${DESTDIR}${lsbindir}
-       ${INSTALL} -m 644 ${srcdir}/zshutdown_notify.8 ${DESTDIR}${mandir}/man8
+       ${LIBTOOL} ${INSTALL} -m 755 -s zshutdown_notify ${DESTDIR}${lsbindir}
+       ${LIBTOOL} ${INSTALL} -m 644 ${srcdir}/zshutdown_notify.8 ${DESTDIR}${mandir}/man8
 
 clean:
-       rm -f ${OBJS} zshutdown_notify
+       ${LIBTOOL} rm -f ${OBJS} zshutdown_notify
 
 ${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 2f38106f3c409245b2ac47c73d5bbee39ce17f37..aa6f92c8678bb9c1a05698024d412d3dc91be6f4 100644 (file)
--- a/clients/zstat/Makefile.in
+++ b/clients/zstat/Makefile.in
@@ -14,23 +14,25 @@ bindir=${exec_prefix}/bin
 
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
+top_builddir=../..
 BUILDTOP=../..
 VPATH=@srcdir@
 CC=@CC@
 INSTALL=@INSTALL@
+LIBTOOL=@LIBTOOL@
 
 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
+LIBS=${BUILDTOP}/lib/libzephyr.la @LIBS@ -lcom_err
 
 OBJS=  zstat.o
 
 all: zstat
 
-zstat: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
-       ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
+zstat: ${OBJS} ${BUILDTOP}/lib/libzephyr.la
+       ${LIBTOOL} ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
 .c.o:
        ${CC} -c ${ALL_CFLAGS} $<
@@ -38,11 +40,11 @@ zstat: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
 check:
 
 install: zstat
-       ${INSTALL} -m 755 -s zstat ${DESTDIR}${bindir}
-       ${INSTALL} -m 644 ${srcdir}/zstat.8 ${DESTDIR}${mandir}/man8
+       ${LIBTOOL} ${INSTALL} -m 755 -s zstat ${DESTDIR}${bindir}
+       ${LIBTOOL} ${INSTALL} -m 644 ${srcdir}/zstat.8 ${DESTDIR}${mandir}/man8
 
 clean:
-       rm -f ${OBJS} zstat
+       ${LIBTOOL} rm -f ${OBJS} zstat
 
 ${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 b26ac789bb65b716e1cd485d3b57a15657a3f172..6701250016517609b5af365a3bfa314b19a13513 100644 (file)
--- a/clients/zwrite/Makefile.in
+++ b/clients/zwrite/Makefile.in
@@ -14,23 +14,25 @@ bindir=${exec_prefix}/bin
 
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
+top_builddir=../..
 BUILDTOP=../..
 VPATH=@srcdir@
 CC=@CC@
 INSTALL=@INSTALL@
+LIBTOOL=@LIBTOOL@
 
 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
+LIBS=${BUILDTOP}/lib/libzephyr.la @LIBS@ -lcom_err
 
 OBJS=  zwrite.o
 
 all: zwrite
 
-zwrite: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
-       ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
+zwrite: ${OBJS} ${BUILDTOP}/lib/libzephyr.la
+       ${LIBTOOL} ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
 .c.o:
        ${CC} -c ${ALL_CFLAGS} $<
@@ -38,11 +40,11 @@ zwrite: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
 check:
 
 install: zwrite
-       ${INSTALL} -m 755 -s zwrite ${DESTDIR}${bindir}
-       ${INSTALL} -m 644 ${srcdir}/zwrite.1 ${DESTDIR}${mandir}/man1
+       ${LIBTOOL} ${INSTALL} -m 755 -s zwrite ${DESTDIR}${bindir}
+       ${LIBTOOL} ${INSTALL} -m 644 ${srcdir}/zwrite.1 ${DESTDIR}${mandir}/man1
 
 clean:
-       rm -f ${OBJS} zwrite
+       ${LIBTOOL} rm -f ${OBJS} zwrite
 
 ${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/lib/Makefile.in b/lib/Makefile.in
index b84ec48f79872bbd72feb1ab9c5ff3d6bc054594..a16c306ec1c304a0225b683632a9f68e410c43c3 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -14,59 +14,66 @@ LIBS=@LIBS@
 
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
+top_builddir=..
 BUILDTOP=..
 VPATH=@srcdir@
 CC=@CC@
 INSTALL=@INSTALL@
-RANLIB=@RANLIB@
+LIBTOOL=@LIBTOOL@
 FPIC=
 DEBUG=-O
+
 CPPFLAGS=@CPPFLAGS@
 CFLAGS=@CFLAGS@ ${DEBUG} ${FPIC}
 ALL_CFLAGS=${CFLAGS} -DSYSCONFDIR=\"${sysconfdir}\" -I${top_srcdir}/h \
        -I${BUILDTOP}/h ${CPPFLAGS}
 
-OBJS = zephyr_err.o ZAsyncLocate.o ZCkAuth.o ZCkIfNot.o ZClosePort.o \
-       ZCmpUID.o ZCmpUIDP.o ZFlsLocs.o ZFlsSubs.o ZFmtAuth.o ZFmtList.o \
-       ZFmtNotice.o ZFmtRaw.o ZFmtRawLst.o ZFmtSmRLst.o ZFmtSmRaw.o \
-       ZFreeNot.o ZGetLocs.o ZGetSender.o ZGetSubs.o ZGetWGPort.o ZhmStat.o \
-       ZIfNotice.o ZInit.o ZLocations.o ZMakeAscii.o ZMkAuth.o ZNewLocU.o \
-       ZOpenPort.o ZParseNot.o ZPeekIfNot.o ZPeekNot.o ZPeekPkt.o ZPending.o \
-       ZReadAscii.o ZRecvNot.o ZRecvPkt.o ZRetSubs.o ZSendList.o ZSendNot.o \
-       ZSendPkt.o ZSendRaw.o ZSendRLst.o ZSetDest.o ZSetFD.o ZSetSrv.o \
-       ZSubs.o ZVariables.o ZWait4Not.o Zinternal.o
+OBJS = zephyr_err.lo ZAsyncLocate.lo ZCkAuth.lo ZCkIfNot.lo            \
+       ZClosePort.lo ZCmpUID.lo ZCmpUIDP.lo ZFlsLocs.lo ZFlsSubs.lo    \
+       ZFmtAuth.lo ZFmtList.lo ZFmtNotice.lo ZFmtRaw.lo ZFmtRawLst.lo  \
+       ZFmtSmRLst.lo ZFmtSmRaw.lo ZFreeNot.lo ZGetDefRlm.lo            \
+       ZGetLocs.lo ZGetRhs.lo ZGetSender.lo ZGetSubs.lo ZGetWGPort.lo  \
+       ZhmStat.lo ZIfNotice.lo ZInit.lo ZLocations.lo ZMakeAscii.lo    \
+       ZMkAuth.lo ZNewLocU.lo ZOpenPort.lo ZParseNot.lo ZPeekIfNot.lo  \
+       ZPeekNot.lo ZPeekPkt.lo ZPending.lo ZReadAscii.lo ZRealmCnt.lo  \
+       ZRecvNot.lo ZRecvPkt.lo ZRetSubs.lo ZSendList.lo ZSendNot.lo    \
+       ZSendPkt.lo ZSendRaw.lo ZSendRLst.lo ZSetDest.lo ZSetFD.lo      \
+       ZSetSrv.lo ZSubs.lo ZVariables.lo ZWait4Not.lo Zinternal.lo
+
+all: libzephyr.la
 
-LIBEXT=a
-all: libzephyr.$(LIBEXT)
+libzephyr.la: ${OBJS}
+       ${LIBTOOL} $(CC) -version-info 4:0:0 -o libzephyr.la $(OBJS) -rpath $(libdir)
 
-libzephyr.a: ${OBJS}
-       ar cru $@ ${OBJS}
-       ${RANLIB} $@
 
-libzephyr.so: $(OBJS)
-       gcc  -shared -Wl,-soname -Wl,libzephyr.so.$(SONAME) -o libzephyr.so $(OBJS) $(LIBS)  -lcom_err  
 
 zephyr_err.c ${BUILDTOP}/h/zephyr/zephyr_err.h: zephyr_err.et
        compile_et ${srcdir}/zephyr_err.et
        mv zephyr_err.h ${BUILDTOP}/h/zephyr
 
-.c.o:
-       ${CC} -c ${ALL_CFLAGS} $<
+.c.lo:
+       ${LIBTOOL} ${CC} -c ${ALL_CFLAGS} $<
 
 check:
 
+<<<<<<< Makefile.in
 install: libzephyr.$(LIBEXT)
        -${INSTALL} -m 644 libzephyr.a ${DESTDIR}${libdir}
        -$(INSTALL) -m 644 libzephyr.so ${DESTDIR}$(libdir)
 
        ${INSTALL} -m 644 ${srcdir}/zephyr.1 ${DESTDIR}${mandir}/man1
+=======
+install: libzephyr.la
+       ${LIBTOOL} ${INSTALL} -m 644 libzephyr.la ${DESTDIR}${libdir}
+       ${LIBTOOL} ${INSTALL} -m 644 ${srcdir}/zephyr.1 ${DESTDIR}${mandir}/man1
+>>>>>>> 1.1.1.2
 
 clean:
-       rm -f ${OBJS} libzephyr.a zephyr_err.c zephyr_err.h
+       ${LIBTOOL} rm -f ${OBJS} libzephyr.la zephyr_err.c zephyr_err.h
 
 ${OBJS}: ${top_srcdir}/h/internal.h ${top_srcdir}/h/sysdep.h
 ${OBJS}: ${BUILDTOP}/h/config.h ${BUILDTOP}/h/zephyr/zephyr.h
 ${OBJS}: ${BUILDTOP}/h/zephyr/zephyr_err.h
 
 .PHONY: all check install clean
-
+.SUFFIXES: .lo

diff --git a/libdyn/Makefile.in b/libdyn/Makefile.in
index 6589f93bde33cd5eb2ddbb32e29472ce6cfcec61..0f5ecda00fe06dbbf68c6ec61312dd5068c07def 100644 (file)
--- a/libdyn/Makefile.in
+++ b/libdyn/Makefile.in
@@ -13,39 +13,39 @@ libdir=${exec_prefix}/lib
 
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
+top_builddir=..
 BUILDTOP=..
 VPATH=@srcdir@
 CC=@CC@
-RANLIB=@RANLIB@
+LIBTOOL=@LIBTOOL@
 
 CPPFLAGS=@CPPFLAGS@
 CFLAGS=@CFLAGS@
 ALL_CFLAGS=${CFLAGS} -I${top_srcdir}/h -I${BUILDTOP}/h ${CPPFLAGS}
 
-OBJS = dyn_append.o dyn_create.o dyn_debug.o dyn_delete.o dyn_insert.o \
-       dyn_paranoid.o dyn_put.o dyn_realloc.o dyn_size.o
+OBJS = dyn_append.lo dyn_create.lo dyn_debug.lo dyn_delete.lo dyn_insert.lo \
+       dyn_paranoid.lo dyn_put.lo dyn_realloc.lo dyn_size.lo
 
-all: libdyn.a dyntest
+all: libzdyn.la dyntest
 
-libdyn.a: ${OBJS}
-       ar cru $@ ${OBJS}
-       ${RANLIB} $@
+libzdyn.la: ${OBJS}
+       ${LIBTOOL} ${CC} -all-static -version-info 1:0:0 -o libzdyn.la ${OBJS} -rpath $(libdir)
 
-dyntest: libdyn.a dyntest.o
-       ${CC} ${LDFLAGS} -o $@ dyntest.o libdyn.a
+dyntest: dyntest.lo libzdyn.la 
+       ${LIBTOOL} ${CC} ${LDFLAGS} -o $@ dyntest.lo libzdyn.la
 
-.c.o:
-       ${CC} -c ${ALL_CFLAGS} $<
+.c.lo:
+       ${LIBTOOL} ${CC} -c ${ALL_CFLAGS} $<
 
 check:
 
 install:
 
 clean:
-       rm -f ${OBJS} libdyn.a dyntest.o dyntest
+       ${LIBTOOL} rm -f ${OBJS} libzdyn.la dyntest.lo dyntest
 
-${OBJS} dyntest.o: dynP.h ${top_srcdir}/h/dyn.h ${top_srcdir}/h/sysdep.h
-${OBJS} dyntest.o: ${BUILDTOP}/h/config.h
+${OBJS} dyntest.lo: dynP.h ${top_srcdir}/h/dyn.h ${top_srcdir}/h/sysdep.h
+${OBJS} dyntest.lo: ${BUILDTOP}/h/config.h
 
 .PHONY: all check install clean
-
+.SUFFIXES: .lo

diff --git a/server/Makefile.in b/server/Makefile.in
index 29ab46250870c7df27202d28f79722fda83f8835..427a2a0d00790e00011115e62bdc18657c53521f 100644 (file)
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -13,33 +13,36 @@ libdir=${exec_prefix}/lib
 
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
+top_builddir=..
 BUILDTOP=..
 VPATH=@srcdir@
 CC=@CC@
 INSTALL=@INSTALL@
+LIBTOOL=@LIBTOOL@
 
 CPPFLAGS=@CPPFLAGS@
 CFLAGS=@CFLAGS@
 ALL_CFLAGS=${CFLAGS} -DSYSCONFDIR=\"${sysconfdir}\" -I${top_srcdir}/h \
        -I${BUILDTOP}/h -I. ${CPPFLAGS}
 LDFLAGS=-L${BUILDTOP}/lib @LDFLAGS@
-LIBS=-lzephyr @LIBS@ -lcom_err
+LIBS=${BUILDTOP}/lib/libzephyr.la @LIBS@ -lcom_err
 
-OBJS=  zsrv_err.o access.o acl_files.o bdump.o class.o client.o common.o \
-       dispatch.o kopt.o kstuff.o main.o server.o subscr.o timer.o uloc.o \
-       zstring.o realm.o version.o
+OBJS=  ${OBJS2} version.o
+OBJS2= zsrv_err.o access.o acl_files.o bdump.o class.o client.o common.o \
+       dispatch.o kstuff.o main.o server.o subscr.o timer.o uloc.o \
+       zstring.o realm.o
 
 all: zephyrd
 
-zephyrd: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
-       ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
+zephyrd: ${OBJS} ${BUILDTOP}/lib/libzephyr.la
+       ${LIBTOOL} ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
 zsrv_err.c zsrv_err.h: zsrv_err.et
        compile_et ${srcdir}/zsrv_err.et
 
 version.o: version.h
 
-version.h: always
+version.h: ${OBJS2} ${BUILDTOP}/lib/libzephyr.la
        sh ${srcdir}/new_vers.sh
 
 .c.o:
@@ -49,13 +52,13 @@ check:
 
 # No dependency on zephyrd, to avoid rebuilding version.o.
 install:
-       ${INSTALL} -m 755 -s zephyrd ${DESTDIR}${sbindir}
-       ${INSTALL} -m 644 ${srcdir}/zephyrd.8 ${DESTDIR}${mandir}/man8
-       ${INSTALL} -m 644 ${srcdir}/default.subscriptions \
+       ${LIBTOOL} ${INSTALL} -m 755 -s zephyrd ${DESTDIR}${sbindir}
+       ${LIBTOOL} ${INSTALL} -m 644 ${srcdir}/zephyrd.8 ${DESTDIR}${mandir}/man8
+       ${LIBTOOL} ${INSTALL} -m 644 ${srcdir}/default.subscriptions \
                ${DESTDIR}${sysconfdir}/zephyr
 
 clean:
-       rm -f ${OBJS} zephyrd zsrv_err.[ch]
+       ${LIBTOOL} rm -f ${OBJS} zephyrd zsrv_err.[ch]
 
 always:
 

diff --git a/zhm/Makefile.in b/zhm/Makefile.in
index bb8ce73620db9a80718ec3723bd9e9b21d4b4001..8cf18bee864ee5541e6af94f48dcd33f858d9566 100644 (file)
--- a/zhm/Makefile.in
+++ b/zhm/Makefile.in
@@ -13,23 +13,25 @@ libdir=${exec_prefix}/lib
 
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
+top_builddir=..
 BUILDTOP=..
 VPATH=@srcdir@
 CC=@CC@
 INSTALL=@INSTALL@
+LIBTOOL=@LIBTOOL@
 
 CPPFLAGS=@CPPFLAGS@
-CFLAGS=@CFLAGS@
+CFLAGS=@CFLAGS@ -DSYSCONFDIR=\"@sysconfdir@\"
 ALL_CFLAGS=${CFLAGS} -I${top_srcdir}/h -I${BUILDTOP}/h ${CPPFLAGS}
 LDFLAGS=-L${BUILDTOP}/lib @LDFLAGS@
-LIBS=-lzephyr @LIBS@ -lcom_err
+LIBS=${BUILDTOP}/lib/libzephyr.la @LIBS@ -lcom_err
 
 OBJS=  timer.o queue.o zhm.o zhm_client.o zhm_server.o
 
 all: zhm
 
-zhm: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
-       ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
+zhm: ${OBJS} ${BUILDTOP}/lib/libzephyr.la
+       ${LIBTOOL} ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
 .c.o:
        ${CC} -c ${ALL_CFLAGS} $<
@@ -37,11 +39,11 @@ zhm: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
 check:
 
 install: zhm
-       ${INSTALL} -m 755 -s zhm ${DESTDIR}${lsbindir}
-       ${INSTALL} -m 644 ${srcdir}/zhm.8 ${DESTDIR}${mandir}/man8
+       ${LIBTOOL} ${INSTALL} -m 755 -s zhm ${DESTDIR}${lsbindir}
+       ${LIBTOOL} ${INSTALL} -m 644 ${srcdir}/zhm.8 ${DESTDIR}${mandir}/man8
 
 clean:
-       rm -f ${OBJS} zhm
+       ${LIBTOOL} rm -f ${OBJS} zhm
 
 ${OBJS}: zhm.h timer.h ${top_srcdir}/h/internal.h ${top_srcdir}/h/sysdep.h
 ${OBJS}: ${BUILDTOP}/h/config.h ${BUILDTOP}/h/zephyr/zephyr.h

diff --git a/zwgc/Makefile.in b/zwgc/Makefile.in
index e4b23420605a5168f114216f736d8010b40ddbe8..1ae13cc86e1ca9e4ab0b2815400cf67cdb4d233e 100644 (file)
--- a/zwgc/Makefile.in
+++ b/zwgc/Makefile.in
@@ -14,12 +14,14 @@ bindir=${exec_prefix}/bin
 
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
+top_builddir=..
 BUILDTOP=..
 VPATH=@srcdir@
 CC=@CC@
 YACC=@YACC@
 INSTALL=@INSTALL@
 INSTANTIATE=${srcdir}/instantiate
+LIBTOOL=@LIBTOOL@
 
 CPPFLAGS=@CPPFLAGS@
 CFLAGS=@CFLAGS@
@@ -27,8 +29,8 @@ ALL_CFLAGS=${CFLAGS} -DDATADIR=\"${datadir}\" -I${top_srcdir}/h \
        -I${BUILDTOP}/h -I${srcdir} -I. @X_CFLAGS@ ${CPPFLAGS}
 YFLAGS=-d
 LDFLAGS=-L${BUILDTOP}/lib @X_LIBS@ @LDFLAGS@
-LIBS=-lzephyr @LIBS@ -lcom_err @X_PRE_LIBS@ @ZWGC_LIBX11@ @X_EXTRA_LIBS@ \
-     @TLIB@ @REGEX_LIBS@ @ARES_LIBS@
+LIBS=${BUILDTOP}/lib/libzephyr.la @LIBS@ -lcom_err @X_PRE_LIBS@ @ZWGC_LIBX11@ \
+       @X_EXTRA_LIBS@ @TLIB@ @REGEX_LIBS@ @ARES_LIBS@
 
 OBJS=  port_dictionary.o pointer_dictionary.o unsigned_long_dictionary.o \
        string_dictionary.o int_dictionary.o string_dictionary_aux.o \
@@ -37,12 +39,12 @@ OBJS=       port_dictionary.o pointer_dictionary.o unsigned_long_dictionary.o \
        xcut.o regexp.o character_class.o text_operations.o file.o error.o \
        variables.o formatter.o X_fonts.o X_gram.o tty_filter.o \
        standard_ports.o xselect.o xmark.o xrevstack.o xerror.o \
-       new_string.o new_memory.o
+       new_string.o new_memory.o zutils.o
 
 all: zwgc
 
-zwgc: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
-       ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
+zwgc: ${OBJS} ${BUILDTOP}/lib/libzephyr.la
+       ${LIBTOOL} ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
 port_dictionary.c port_dictionary.h: dictionary.c dictionary.h
        ${INSTANTIATE} ${srcdir} dictionary port port.h
@@ -83,16 +85,16 @@ y.tab.c y.tab.h: parser.y
 check:
 
 install: zwgc
-       ${INSTALL} -m 755 -s zwgc ${DESTDIR}${bindir}
-       ${INSTALL} -m 644 ${srcdir}/zwgc.1 ${DESTDIR}${mandir}/man1
-       ${INSTALL} -m 644 ${srcdir}/zwgc.desc ${DESTDIR}${datadir}/zephyr
-       ${INSTALL} -m 644 ${srcdir}/zwgc_resources ${DESTDIR}${datadir}/zephyr
+       ${LIBTOOL} ${INSTALL} -m 755 -s zwgc ${DESTDIR}${bindir}
+       ${LIBTOOL} ${INSTALL} -m 644 ${srcdir}/zwgc.1 ${DESTDIR}${mandir}/man1
+       ${LIBTOOL} ${INSTALL} -m 644 ${srcdir}/zwgc.desc ${DESTDIR}${datadir}/zephyr
+       ${LIBTOOL} ${INSTALL} -m 644 ${srcdir}/zwgc_resources ${DESTDIR}${datadir}/zephyr
 
 clean:
-       rm -f ${OBJS} zwgc port_dictionary.[ch] pointer_dictionary.[ch]
-       rm -f unsigned_long_dictionary.[ch] string_dictionary.[ch]
-       rm -f int_dictionary.[ch] char_stack.h string_stack.h xmode_stack.h
-       rm -f y.tab.[ch]
+       ${LIBTOOL} rm -f ${OBJS} zwgc port_dictionary.[ch] pointer_dictionary.[ch]
+       ${LIBTOOL} rm -f unsigned_long_dictionary.[ch] string_dictionary.[ch]
+       ${LIBTOOL} rm -f int_dictionary.[ch] char_stack.h string_stack.h xmode_stack.h
+       ${LIBTOOL} rm -f y.tab.[ch]
 
 ${OBJS}: ${top_srcdir}/h/sysdep.h ${BUILDTOP}/h/config.h
 zephyr.o: ${BUILDTOP}/h/zephyr/zephyr.h ${BUILDTOP}/h/zephyr/zephyr_err.h