afsmonitor & gtx: Don't cast returns from malloc()

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

diff --git a/src/afsmonitor/Makefile.in b/src/afsmonitor/Makefile.in
index 16cdc4d..b8cd117 100644 (file)
--- a/src/afsmonitor/Makefile.in
+++ b/src/afsmonitor/Makefile.in
@@ -7,15 +7,9 @@
 
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
+include @TOP_OBJDIR@/src/config/Makefile.lwp
 
 
-CFLAGS=$(DBG) -I. \
-       -I${TOP_OBJDIR}/src/config \
-       -I${TOP_INCDIR} \
-       -I${TOP_INCDIR}/afs \
-       ${XCFLAGS}
-LDFLAGS = ${XLDFLAGS}
-
 INCLS=${TOP_INCDIR}/afs/gtxobjects.h \
        ${TOP_INCDIR}/afs/gtxwindows.h \
        ${TOP_INCDIR}/afs/gtxcurseswin.h \
@@ -40,9 +34,10 @@ LIBS=${TOP_LIBDIR}/libxstat_fs.a \
        ${TOP_LIBDIR}/librx.a \
        ${TOP_LIBDIR}/liblwp.a \
        ${TOP_LIBDIR}/libsys.a \
+       $(TOP_LIBDIR)/libopr.a \
        ${TOP_LIBDIR}/util.a
 
-EXTRA_LIBS=${TXLIBS} ${TOP_LIBDIR}/libtermlib.a  ${XLIBS}
+EXTRA_LIBS=${LIB_curses} ${XLIBS}
 
 all: afsmonitor
 
@@ -51,28 +46,22 @@ afsmon-win.o: afsmon-win.c ${INCLS}
 afsmonitor.o: afsmonitor.c ${INCLS} AFS_component_version_number.c
 
 afsmonitor: afsmonitor.o afsmon-win.o afsmon-output.o ${LIBS}
-       ${CC} ${LDFLAGS} -o afsmonitor afsmonitor.o afsmon-win.o \
-               afsmon-output.o ${LIBS} ${EXTRA_LIBS}
+       $(AFS_LDRULE) afsmonitor.o afsmon-win.o afsmon-output.o \
+               ${LIBS} $(LIB_roken) ${EXTRA_LIBS}
 
 afsmon-parselog:  afsmon-parselog.o ${LIBS}
-       ${CC} ${CFLAGS} -o afsmon-parselog afsmon-parselog.c \
-               ${LIBS} ${EXTRA_LIBS}
+       $(AFS_LDRULE) afsmon-parselog.c \
+               ${LIBS} $(LIB_roken) ${EXTRA_LIBS}
+
+install: afsmonitor
+       ${INSTALL} -d ${DESTDIR}${bindir}
+       ${INSTALL_PROGRAM} afsmonitor ${DESTDIR}${bindir}/afsmonitor
 
-#
-# Misc others
-#
-install:  ${DESTDIR}${bindir}/afsmonitor
+dest: afsmonitor
+       ${INSTALL} -d ${DEST}/bin
+       ${INSTALL_PROGRAM} afsmonitor ${DEST}/bin/afsmonitor
 
 clean:
        $(RM) -f *.o afsmonitor AFS_component_version_number.c
 
 include ../config/Makefile.version
-${DEST}/bin/afsmonitor: afsmonitor
-       ${INSTALL} $? $@
-
-${DESTDIR}${bindir}/afsmonitor: afsmonitor
-       ${INSTALL} $? $@
-
-
-dest:  ${DEST}/bin/afsmonitor
-