Added mcra tool to autoconf and spec file.

And fixed prev commit mstregdump sources.

diff --git a/Makefile b/Makefile
deleted file mode 100644 (file)
index db777be..0000000
--- a/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-#default options
-CFLAGS += -O2
-CFLAGS += -g
-CFLAGS += -Wall
-CXXFLAGS += -fno-exceptions
-CFLAGS += -I.
-LD=$(CXX)
-EXTRA_LOADLIBES=-lz
-LOADLIBES+=${EXTRA_LOADLIBES}
-
-all: default
-bin: mstflint mstmread mstmwrite mstmcra mstregdump mstvpd
-
-default: bin
-static: bin
-shared: bin
-
-.PHONY: all bin clean static shared default
-.DELETE_ON_ERROR:
-
-default: EXTRA_LOADLIBES="$(shell $(CXX) ${LDFLAGS} ${CFLAGS} ${CXXFLAGS} -print-file-name=libz.a)" "$(shell $(CXX)  ${LDFLAGS} ${CFLAGS} ${CXXFLAGS} -print-file-name=libstdc++.a)"
-default: LD=$(CC)
-static: CFLAGS+=-static
-
-mstflint: mstflint.o mflash.o
-       $(LD) ${LDFLAGS} ${CFLAGS} ${CXXFLAGS} mstflint.o mflash.o -o mstflint ${LOADLIBES}
-
-mstflint.o: flint.cpp mflash.h
-       $(CXX) ${CFLAGS} ${CXXFLAGS} -c flint.cpp -o mstflint.o
-
-mflash.o: mtcr.h mflash.c mflash.h
-       $(CC) ${CFLAGS} -c mflash.c -o mflash.o
-
-mstmwrite: mwrite.c mtcr.h
-       $(CC) ${CFLAGS} mwrite.c -o mstmwrite
-
-mstmread: mread.c mtcr.h
-       $(CC) ${CFLAGS} mread.c -o mstmread
-
-mstmcra: mcra.c mtcr.h
-       $(CC) ${CFLAGS} mcra.c -o mstmcra
-       
-mstregdump: mstdump.c mtcr.h
-       $(CC) ${CFLAGS} mstdump.c -o mstregdump
-
-mstvpd: vpd.c
-       $(CC) ${CFLAGS} vpd.c -o mstvpd
-
-clean:
-       rm -f mstvpd mstregdump mstflint mstmread mstmwrite mstmcra mstflint.o mflash.o

diff --git a/Makefile.am b/Makefile.am
index f642d9db17a3cf3e9653eefdb76f070a1a084ccf..4335008b48626141b34fee220619384f939796ee 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,6 @@
 bin_PROGRAMS = mstmread \
                                        mstmwrite \
+                                       mstmcra \
                                        mstflint \
                                        mstregdump \
                                        mstvpd
@@ -11,10 +12,11 @@ mstmwrite_SOURCES = mwrite.c mtcr.h
 mstflint_SOURCES = flint.cpp mtcr.h mflash.h mflash.c
 mstflint_LDFLAGS = -lz
 
-mstregdump_SOURCES = mread.c mtcr.h
+mstregdump_SOURCES = mstdump.c mtcr.h
 
 mstvpd_SOURCES = vpd.c
 
+mstmcra_SOURCES  = mcra.c mtcr.h
 
 EXTRA_DIST = \
        mstflint.spec

diff --git a/mstflint.spec.in b/mstflint.spec.in
index b5937be5d92155dcc02e4b12e1d485c349e6da52..643f7ccf113b9b5d4aff31651e351ae29b17c858 100644 (file)
--- a/mstflint.spec.in
+++ b/mstflint.spec.in
@@ -38,6 +38,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/mstflint
 %{_bindir}/mstregdump
 %{_bindir}/mstvpd
+%{_bindir}/mstmcra
 
 %changelog
 * Fri Dec 07 2007 Ira Weiny <weiny2@llnl.gov> 1.0.0