regtools: modify description format and refactor tools

Change the XML description to unify multi dev/reg in a clean
fashion. Move the description parser to its own library. Fix
the tester and headergen tools to work with the new format and
library. Move the STMP3700/3780 descriptions to the new format
(and fixes many errors as well). Drop the hwemulgen tool
in favor on the upcoming hwstub tools revamp.

Change-Id: I7119a187aab5c8b083cc5228cb1b248ee29f184d

1 files changed, 15 insertions, 18 deletions

diff --git a/utils/regtools/Makefile b/utils/regtools/Makefile
index 5dad380..6ed827e 100644
--- a/utils/regtools/Makefile
+++ b/utils/regtools/Makefile
@@ -2,27 +2,24 @@ DEFINES=
 CC=gcc
 CXX=g++
 LD=g++
-CFLAGS=-g -std=c99 -W -Wall `xml2-config --cflags` $(DEFINES)
-CXXFLAGS=-g -W -Wall `xml2-config --cflags` $(DEFINES)
-LDFLAGS=`xml2-config --libs`
-BINS= tester headergen hwemulgen
+CFLAGS=-g -std=c99 -Wall $(DEFINES) -Ilib
+CXXFLAGS=-g -Wall $(DEFINES) -Ilib
+LDFLAGS=-Llib -lsocdesc `xml2-config --libs`
+SRC=$(wildcard *.c)
+SRCXX=$(wildcard *.cpp)
+EXEC=$(SRC:.c=) $(SRCXX:.cpp=)
+LIB=lib/libsocdesc.a
 
-all: $(BINS)
+all: $(EXEC)
 
-%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
+$(LIB):
+	make -C lib
 
-%.o: %.cpp
-	$(CXX) $(CXXFLAGS) -c -o $@ $<
+%: %.c $(LIB)
+	$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
 
-headergen: headergen.o desc_parser.o
-	$(LD) -o $@ $^ $(LDFLAGS)
-
-hwemulgen: hwemulgen.o desc_parser.o
-	$(LD) -o $@ $^ $(LDFLAGS)
-
-tester: tester.o desc_parser.o
-	$(LD) -o $@ $^ $(LDFLAGS)
+%: %.cpp $(LIB)
+	$(CXX) $(CXXFLAGS) -o $@ $< $(LDFLAGS)
 
 clean:
-	rm -fr *.o $(BINS)
+	rm -fr $(EXEC)