--- projects/cms/source/ihost/libstatgrab/Makefile	2002/05/13 12:05:22	1.1
+++ projects/cms/source/ihost/libstatgrab/Makefile	2002/05/17 14:47:58	1.12
@@ -1,26 +1,48 @@
-#  $Id: Makefile,v 1.1 2002/05/13 12:05:22 tdb Exp $
+#  $Id: Makefile,v 1.12 2002/05/17 14:47:58 tdb Exp $
 
 DEFS =
 
+LIBUKCPROG = ../libukcprog
+
 CFLAGS = -g
 
+INCLUDES = -I${LIBUKCPROG}
+
 CCFLAGS = ${CFLAGS} ${ARCH_CFLAGS} ${MORE_CFLAGS}
 
-CCLINE = ${CC} ${DEFS} ${CCFLAGS} -c
+CCLINE = ${CC} ${DEFS} ${CCFLAGS} ${INCLUDES} -c
 
 MAKE_LIBRARY = ar cq
 
-OBJS = load_stat.o disk_stat.o
+OBJS = load_stat.o disk_stat.o os_info.o user_stats.o cpu_stats.o \
+       process_stats.o swap_stats.o memory_stats.o page_stats.o
 
 HDRS = statgrab.h
 
 LIB = libstatgrab.a
 
-all: ${LIB}
+all:
+	@echo "Must use one of the following targets :-"
+	@echo "  $(MAKE) solaris"
+	@echo "  $(MAKE) linux"
+	@echo "  $(MAKE) freebsd"
+	@echo "  $(MAKE) oldlinux"
 
 ${LIB}: ${OBJS}
 	${MAKE_LIBRARY} $@ ${OBJS}
 
+solaris:
+	$(MAKE) ${LIB} DEFS=-DSOLARIS
+
+linux:
+	$(MAKE) ${LIB} DEFS=-DLINUX
+
+freebsd:
+	$(MAKE) ${LIB} DEFS=-DFREEBSD
+
+oldlinux:
+	$(MAKE) ${LIB} DEFS="-DOLDLINUX -DLINUX"
+
 clean:
 	rm -f ${OBJS} ${LIB}
 
@@ -28,3 +50,17 @@ load_stat.o: load_stat.c ${HDRS}
 	${CCLINE} load_stat.c
 disk_stat.o: disk_stat.c ${HDRS}
 	${CCLINE} disk_stat.c
+os_info.o: os_info.c ${HDRS}
+	${CCLINE} os_info.c
+user_stats.o: user_stats.c ${HDRS}
+	${CCLINE} user_stats.c
+cpu_stats.o: cpu_stats.c ${HDRS}
+	${CCLINE} cpu_stats.c
+process_stats.o: process_stats.c ${HDRS}
+	${CCLINE} process_stats.c
+swap_stats.o: swap_stats.c ${HDRS}
+	${CCLINE} swap_stats.c
+memory_stats.o: memory_stats.c ${HDRS}
+	${CCLINE} memory_stats.c
+page_stats.o: page_stats.c ${HDRS}
+	${CCLINE} page_stats.c