--- a/lsflib/tools/Makefile
+++ b/lsflib/tools/Makefile
@@ -1,20 +1,26 @@
-CC = gcc
-CPP = g++
-STRIP = strip -s
-INSTALL = cp -f
-RM = rm -f
-CFLAGS = -Wall -Wstrict-prototypes
-INCLUDE = -I/usr/local/include
-LDFLAGS = -L/usr/local/lib/ -llsf -Wl,--rpath,lib
+ CC = gcc
+ CPP = g++
+ STRIP = strip -s
+ INSTALL = cp -f
+ RM = rm -f
+ CFLAGS = -Wall -Wstrict-prototypes
+ INCLUDE = -I/usr/local/include
+ LDFLAGS = -L/usr/local/lib/ -llsf -Wl,--rpath,lib
-TARGET = progs
+OBJECTS = cpuid.o
+OBJECTS += main.o
+OBJECTS += digest.o
+OBJECTS += dump.o
+OBJECTS += list.o
+
+TARGET = progs
.c.o:
$(CC) -c $(CFLAGS) $(INCLUDE) -o $@ $<
all: progs
-progs: cpuid.o main.o digest.o dump.o list.o
+progs: $(OBJECTS)
$(CC) $(LDFLAGS) digest.o -o digest
$(CC) $(LDFLAGS) dump.o -o dump
$(CC) $(LDFLAGS) cpuid.o main.o -o cpuid
@@ -27,12 +33,12 @@
.PHONY: clean distclean
-clean:
+clean:
$(RM) *.o
$(RM) *~
$(RM) digest cpuid dump list
-distclean:
+distclean:
@make clean
install: progs
@@ -41,9 +47,8 @@
$(INSTALL) dump $(HOME)/bin/
$(INSTALL) list $(HOME)/bin/
-uninstall:
+uninstall:
$(RM) $(HOME)/bin/digest
$(RM) $(HOME)/bin/list
$(RM) $(HOME)/bin/cpuid
$(RM) $(HOME)/bin/dump
-