Merge forward makefile changes

[1ts-debian.git] / clients / xzwrite / Makefile.in

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