Remove NINTERFACE define

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

diff --git a/src/viced/Makefile.in b/src/viced/Makefile.in
index 81d1ae9..a73cb62 100644 (file)
--- a/src/viced/Makefile.in
+++ b/src/viced/Makefile.in
@@ -9,19 +9,13 @@
 
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
+include @TOP_OBJDIR@/src/config/Makefile.lwp
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 HELPER_SPLINT=@HELPER_SPLINT@
 
-
-CFLAGS=${DBG} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I. -I${TOP_INCDIR} \
-       -I${TOP_INCDIR}/afs -I${TOP_OBJDIR} -I${TOP_OBJDIR}/fsint\
-        ${XCFLAGS} ${ARCHFLAGS} -DNINTERFACE
-
-LDFLAGS = ${DBUG} ${XLDFLAGS} ${ARCHFLAGS}
-
 LIBS=${TOP_LIBDIR}/libacl.a    \
        ${TOP_LIBDIR}/libvldb.a \
        ${TOP_LIBDIR}/libprot.a \
@@ -36,10 +30,10 @@ LIBS=${TOP_LIBDIR}/libacl.a \
        ${TOP_LIBDIR}/librxstat.a       \
        ${TOP_LIBDIR}/librx.a           \
        ${TOP_LIBDIR}/libsys.a  \
-       ${TOP_LIBDIR}/libdes.a          \
        ${TOP_LIBDIR}/libcom_err.a      \
        ${TOP_LIBDIR}/liblwp.a \
-       ${TOP_LIBDIR}/libafsutil.a
+       ${TOP_LIBDIR}/libafsutil.a \
+       ${TOP_LIBDIR}/libafshcrypto_lwp.a
 
 headers=${TOP_INCDIR}/lwp.h            \
        ${TOP_INCDIR}/afs/acl.h \
@@ -73,35 +67,36 @@ ${objects}: ${headers}
 viced.o: AFS_component_version_number.o
 
 check_sysid: check_sysid.c
-       ${CC} ${CFLAGS} -o check_sysid ${srcdir}/check_sysid.c
+       ${CC} ${AFS_CFLAGS} ${AFS_LDFLAGS} -o check_sysid \
+               ${srcdir}/check_sysid.c
 
 fileserver: ${objects} ${headers} ${LIBS}
        set -x; \
        case ${SYS_NAME} in \
        rs_aix*) \
-           ${CC} -K ${LDFLAGS} -o fileserver ${objects} \
-           ${TOP_LIBDIR}/libaudit.a ${LIBS} ${XLIBS} ;; \
+           ${CC} -K ${AFS_LDFLAGS} -o fileserver ${objects} \
+               ${TOP_LIBDIR}/libaudit.a ${LIBS} $(LIB_roken) ${XLIBS} ;; \
        *) \
-           ${CC} ${LDFLAGS} -o fileserver ${objects} \
-           ${TOP_LIBDIR}/libaudit.a ${LIBS} ${XLIBS} ;; \
+           $(AFS_LDRULE) ${objects} ${TOP_LIBDIR}/libaudit.a \
+               ${LIBS} $(LIB_roken) ${XLIBS} ;; \
        esac
 
 fsprobe.o: fsprobe.c AFS_component_version_number.c
-       ${CC} ${CFLAGS} -DINTERPRET_DUMP -c ${srcdir}/fsprobe.c
 
 fsprobe: fsprobe.o
-       ${CC} ${CFLAGS} -o fsprobe fsprobe.o ${LIBS} ${XLIBS} 
+       $(AFS_LDRULE) fsprobe.o ${LIBS} $(LIB_roken) ${XLIBS}
 
+CFLAGS_cbd.o = -DINTERPRET_DUMP
 cbd.o: callback.c AFS_component_version_number.c
-       ${CC} ${CFLAGS} -DINTERPRET_DUMP -c -o cbd.o ${srcdir}/callback.c
+       $(AFS_CCRULE) $(srcdir)/callback.c
 
 cbd: cbd.o
-       ${CC} ${CFLAGS} -DINTERPRET_DUMP -o cbd cbd.o ${LIBS} ${XLIBS} 
+       $(AFS_LDRULE) cbd.o ${LIBS} $(LIB_roken) ${XLIBS}
 
 install: fileserver fs_stats.h
        ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}
        ${INSTALL} -d ${DESTDIR}${includedir}/afs
-       ${INSTALL_DATA} fs_stats.h ${DESTDIR}${includedir}/afs/fs_stats.h
+       ${INSTALL_DATA} ${srcdir}/fs_stats.h ${DESTDIR}${includedir}/afs/fs_stats.h
        @case ${SYS_NAME} in \
        alpha_dux4*|*linux*|rs_aix*|sgi_6*|sun4x*|sunx86*) \
                echo "Don't install fileserver for ${SYS_NAME}" ;; \
@@ -118,7 +113,7 @@ install: fileserver fs_stats.h
 dest: fileserver fs_stats.h
        ${INSTALL} -d ${DEST}/root.server/usr/afs/bin
        ${INSTALL} -d ${DEST}/include/afs
-       ${INSTALL_DATA} fs_stats.h ${DEST}/include/afs/fs_stats.h
+       ${INSTALL_DATA} ${srcdir}/fs_stats.h ${DEST}/include/afs/fs_stats.h
        @case ${SYS_NAME} in \
        alpha_dux4*|*linux*|rs_aix*|sgi_6*|sun4x*|sunx86*) \
                echo "Don't install fileserver for ${SYS_NAME}" ;; \
@@ -143,3 +138,4 @@ check-splint::
            host.c              \
            physio.c    \
            callback.c
+