From a5d7ebb1d18a3710cb6b86f0b68d2257c4ab061a Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Thu, 14 Jul 2005 10:48:42 +0000 Subject: Add shared library support for libzephyr. --- clients/xzwrite/Makefile.in | 19 ++++++++++------ clients/zaway/Makefile.in | 16 +++++++++----- clients/zctl/Makefile.in | 16 +++++++++----- clients/zleave/Makefile.in | 16 +++++++++----- clients/zlocate/Makefile.in | 16 +++++++++----- clients/zmailnotify/Makefile.in | 17 +++++++++----- clients/znol/Makefile.in | 16 +++++++++----- clients/zpopnotify/Makefile.in | 17 +++++++++----- clients/zshutdown_notify/Makefile.in | 17 +++++++++----- clients/zstat/Makefile.in | 16 +++++++++----- clients/zwrite/Makefile.in | 16 +++++++++----- configure.in | 1 + lib/Makefile.in | 43 +++++++++++++++++++++--------------- server/Makefile.in | 17 +++++++++----- zhm/Makefile.in | 16 +++++++++----- zwgc/Makefile.in | 16 +++++++++----- 16 files changed, 172 insertions(+), 103 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 diff --git a/configure.in b/configure.in index 81a0267..db07e50 100644 --- a/configure.in +++ b/configure.in @@ -18,6 +18,7 @@ AC_PROG_YACC AC_PROG_LEX AC_PROG_INSTALL AC_PROG_RANLIB +AC_PROG_LIBTOOL AC_MSG_CHECKING(location of temporary directory) if test -d /var/tmp; then diff --git a/lib/Makefile.in b/lib/Makefile.in index 336bd6a..045db60 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -6,6 +6,7 @@ datadir=@datadir@ sysconfdir=@sysconfdir@ sbindir=@sbindir@ lsbindir=@lsbindir@ +top_builddir=.. includedir=${prefix}/include mandir=${prefix}/man @@ -15,6 +16,7 @@ srcdir=@srcdir@ top_srcdir=@top_srcdir@ BUILDTOP=.. VPATH=@srcdir@ +LIBTOOL=@LIBTOOL@ CC=@CC@ INSTALL=@INSTALL@ RANLIB=@RANLIB@ @@ -24,37 +26,42 @@ CFLAGS=@CFLAGS@ 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 ZGetLocs.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 \ + 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.a +.SUFFIXES: .lo -libzephyr.a: ${OBJS} - ar cru $@ ${OBJS} - ${RANLIB} $@ +all: libzephyr.la + +libzephyr.la: ${OBJS} + ${LIBTOOL} --mode=link ${CC} -rpath ${libdir} -version-info 3:0:0 \ + -o $@ ${OBJS} 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} --mode=compile ${CC} -c -o $@ ${ALL_CFLAGS} $< check: -install: libzephyr.a - ${INSTALL} -m 644 libzephyr.a ${DESTDIR}${libdir} +install: libzephyr.la + ${LIBTOOL} --mode=install ${INSTALL} -m 644 libzephyr.la \ + ${DESTDIR}${libdir} ${INSTALL} -m 644 ${srcdir}/zephyr.1 ${DESTDIR}${mandir}/man1 clean: - rm -f ${OBJS} libzephyr.a zephyr_err.c zephyr_err.h + rm -f zephyr_err.c zephyr_err.h + ${LIBTOOL} --mode=clean rm -f ${OBJS} libzephyr.la ${OBJS}: ${top_srcdir}/h/internal.h ${top_srcdir}/h/sysdep.h ${OBJS}: ${BUILDTOP}/h/config.h ${BUILDTOP}/h/zephyr/zephyr.h diff --git a/server/Makefile.in b/server/Makefile.in index 3e79792..3cba0fc 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -10,20 +10,23 @@ lsbindir=@lsbindir@ includedir=${prefix}/include mandir=${prefix}/man libdir=${exec_prefix}/lib +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} -DSYSCONFDIR=\"${sysconfdir}\" -I${top_srcdir}/h \ -I${BUILDTOP}/h -I. ${CPPFLAGS} -LDFLAGS=-L${BUILDTOP}/lib @LDFLAGS@ -LIBS=-lzephyr @LIBS@ -lcom_err +LDFLAGS=@LDFLAGS@ +LIBS=${LIBZEPHYR} @LIBS@ -lcom_err OBJS= 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 \ @@ -31,8 +34,8 @@ OBJS= zsrv_err.o access.o acl_files.o bdump.o class.o client.o common.o \ all: zephyrd -zephyrd: ${OBJS} ${BUILDTOP}/lib/libzephyr.a - ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS} +zephyrd: ${OBJS} ${LIBZEPHYR} + ${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS} zsrv_err.c zsrv_err.h: zsrv_err.et compile_et ${srcdir}/zsrv_err.et @@ -49,13 +52,15 @@ check: # No dependency on zephyrd, to avoid rebuilding version.o. install: - ${INSTALL} -m 755 -s zephyrd ${DESTDIR}${sbindir} + ${LIBTOOL} --mode=install ${INSTALL} -m 755 zephyrd \ + ${DESTDIR}${sbindir} ${INSTALL} -m 644 ${srcdir}/zephyrd.8 ${DESTDIR}${mandir}/man8 ${INSTALL} -m 644 ${srcdir}/default.subscriptions \ ${DESTDIR}${sysconfdir}/zephyr clean: - rm -f ${OBJS} zephyrd zsrv_err.[ch] + ${LIBTOOL} --mode=clean rm -f zephyrd + rm -f ${OBJS} zsrv_err.[ch] always: diff --git a/zhm/Makefile.in b/zhm/Makefile.in index 060ab7d..29d7217 100644 --- a/zhm/Makefile.in +++ b/zhm/Makefile.in @@ -10,26 +10,29 @@ lsbindir=@lsbindir@ includedir=${prefix}/include mandir=${prefix}/man libdir=${exec_prefix}/lib +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= 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} ${LIBZEPHYR} + ${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS} .c.o: ${CC} -c ${ALL_CFLAGS} $< @@ -37,11 +40,12 @@ zhm: ${OBJS} ${BUILDTOP}/lib/libzephyr.a check: install: zhm - ${INSTALL} -m 755 -s zhm ${DESTDIR}${lsbindir} + ${LIBTOOL} --mode=install ${INSTALL} -m 755 zhm ${DESTDIR}${lsbindir} ${INSTALL} -m 644 ${srcdir}/zhm.8 ${DESTDIR}${mandir}/man8 clean: - rm -f ${OBJS} zhm + ${LIBTOOL} --mode=clean rm -f zhm + rm -f ${OBJS} ${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 058a971..dca3f72 100644 --- a/zwgc/Makefile.in +++ b/zwgc/Makefile.in @@ -11,23 +11,26 @@ 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@ YACC=@YACC@ INSTALL=@INSTALL@ INSTANTIATE=${srcdir}/instantiate +LIBZEPHYR=${BUILDTOP}/lib/libzephyr.la CPPFLAGS=@CPPFLAGS@ CFLAGS=@CFLAGS@ 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@ \ +LDFLAGS=@X_LIBS@ @LDFLAGS@ +LIBS=${LIBZEPHYR} @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 \ @@ -41,8 +44,8 @@ OBJS= port_dictionary.o pointer_dictionary.o unsigned_long_dictionary.o \ all: zwgc -zwgc: ${OBJS} ${BUILDTOP}/lib/libzephyr.a - ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS} +zwgc: ${OBJS} ${LIBZEPHYR} + ${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS} port_dictionary.c port_dictionary.h: dictionary.c dictionary.h ${INSTANTIATE} ${srcdir} dictionary port port.h @@ -83,13 +86,14 @@ y.tab.c y.tab.h: parser.y check: install: zwgc - ${INSTALL} -m 755 -s zwgc ${DESTDIR}${bindir} + ${LIBTOOL} --mode=install ${INSTALL} -m 755 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 clean: - rm -f ${OBJS} zwgc port_dictionary.[ch] pointer_dictionary.[ch] + ${LIBTOOL} --mode=clean rm -f zwgc + rm -f ${OBJS} 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] -- cgit v1.2.3