aklog: Do not include XCFLAGS twice

[openafs.git] / src / aklog / Makefile.in

diff --git a/src/aklog/Makefile.in b/src/aklog/Makefile.in
index 54a9b93..e7f3c8f 100644 (file)
--- a/src/aklog/Makefile.in
+++ b/src/aklog/Makefile.in
@@ -4,52 +4,58 @@
 
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
+include @TOP_OBJDIR@/src/config/Makefile.pthread
 
-OPTMZ = @KRB5CFLAGS@ -DALLOW_REGISTER
-AKLIBS = ${LIBS} @KRB5LIBS@
-AFSLIBS = ${TOP_LIBDIR}/libprot.a ${TOP_LIBDIR}/libubik.a \
-         ${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/librxkad.a \
-         ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a \
-         ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libdes.a \
-         ${TOP_LIBDIR}/libafsutil.a
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
-SRCS=  aklog.c aklog_main.c  krb_util.c linked_list.c
-OBJS=   aklog.o aklog_main.o krb_util.o linked_list.o
+MODULE_CFLAGS=@KRB5_CPPFLAGS@ -DALLOW_REGISTER
 
-all: aklog @ASETKEY@
+AKLIBS= ${LIBS} @KRB5_LDFLAGS@ @KRB5_LIBS@
+AFSLIBS= ${TOP_LIBDIR}/libafsauthent.a \
+         ${TOP_LIBDIR}/libafsrpc.a \
+        ${TOP_LIBDIR}/libafshcrypto.a \
+        ${TOP_LIBDIR}/libcmd.a \
+         ${TOP_LIBDIR}/util.a
+
+SRCS=  aklog.c krb_util.c linked_list.c
+OBJS=   aklog.o krb_util.o linked_list.o
+
+all: aklog asetkey klog
 
 aklog: ${OBJS} ${AFSLIBS}
-       ${CC} -o $@ ${CFLAGS} ${OBJS} ${AKLIBS} ${AFSLIBS} ${XLIBS}
+       $(AFS_LDRULE) ${OBJS} ${AKLIBS} ${AFSLIBS} $(LIB_roken) ${MT_LIBS}
 
 asetkey: asetkey.o ${AFSLIBS}
-       ${CC} -o $@ ${CFLAGS} asetkey.o ${AKLIBS} ${AFSLIBS} ${XLIBS}
+       $(AFS_LDRULE) asetkey.o ${AKLIBS} ${AFSLIBS} $(LIB_roken) ${MT_LIBS}
+
+klog:  klog.o skipwrap.o ${AFSLIBS}
+       $(AFS_LDRULE) klog.o skipwrap.o \
+               ${AKLIBS} ${AFSLIBS} $(LIB_roken) ${MT_LIBS}
 
 #
 # Installation targets
 #
-install: \
-       ${DESTDIR}${bindir}/aklog ${DESTDIR}${afssrvbindir}/asetkey
-
-${DESTDIR}${bindir}/aklog: aklog
-       ${INSTALL} $? $@
-
-${DESTDIR}${afssrvbindir}/asetkey: @ASETKEY@
-       if test "x@ASETKEY@" != "x"; then ${INSTALL} $? $@; fi
-
-dest: \
-       ${DEST}/bin/aklog ${DEST}/root.server/usr/afs/bin/asetkey
-
-${DEST}/bin/aklog: aklog
-       ${INSTALL} $? $@
-
-${DEST}/root.server/usr/afs/bin/asetkey: @ASETKEY@
-       if test "x@ASETKEY@" != "x"; then ${INSTALL} $? $@; fi
+install: aklog asetkey klog
+       ${INSTALL} -d ${DESTDIR}${bindir}
+       ${INSTALL_PROGRAM} aklog ${DESTDIR}${bindir}/aklog
+       ${INSTALL_PROGRAM} klog ${DESTDIR}${bindir}/klog.krb5
+       ${INSTALL} -d ${DESTDIR}${afssrvbindir}
+       ${INSTALL_PROGRAM} asetkey ${DESTDIR}${afssrvbindir}/asetkey 
+
+dest: aklog asetkey klog
+       ${INSTALL} -d ${DEST}/bin
+       ${INSTALL_PROGRAM} aklog ${DEST}/bin/aklog
+       ${INSTALL_PROGRAM} klog ${DEST}/bin/klog.krb5
+       ${INSTALL} -d ${DEST}/root.server/usr/afs/bin
+       ${INSTALL_PROGRAM} asetkey ${DEST}/root.server/usr/afs/bin/asetkey
 
 #
 # Misc. targets
 #
 clean:
-       $(RM) -f *.o ${OBJS} aklog asetkey
+       $(RM) -f *.o ${OBJS} aklog asetkey klog
 
 include ../config/Makefile.version
-