Add a make target to rebuild our abidw .abixml files

Signed-off-by: Peter Jones <pjones@redhat.com>

diff --git a/Make.rules b/Make.rules
index 44112ec..86856e1 100644 (file)
--- a/Make.rules
+++ b/Make.rules
@@ -24,6 +24,7 @@ include $(TOPDIR)/Make.version
 
 %.abixml : %.so
        $(ABIDW) --headers-dir $(TOPDIR)/src/include/efivar/ --out-file $@ $^
+       @sed -i -s 's,$(TOPDIR)/,,g' $@
 
 %.abicheck : %.so
        $(ABIDIFF) \

diff --git a/Makefile b/Makefile
index a2943c3..8c67b9d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,10 @@ install :
 abidw abicheck efivar efivar-static static:
        $(MAKE) -C src $@
 
+abiupdate :
+       $(MAKE) clean all
+       $(MAKE) -C src abiclean abixml
+
 $(SUBDIRS) :
        $(MAKE) -C $@
 
@@ -35,7 +39,7 @@ a :
                exit 1 ; \
        fi
 
-.PHONY: $(SUBDIRS) a brick
+.PHONY: $(SUBDIRS) a brick abiupdate
 
 GITTAG = $(shell bash -c "echo $$(($(VERSION) + 1))")
 

diff --git a/src/Makefile b/src/Makefile
index 5f394e4..76bc474 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -34,6 +34,12 @@ all : $(TARGETS)
 
 static : $(STATICTARGETS)
 
+abiclean :
+       @rm -vf $(patsubst %.so,%.abixml,$@)
+
+abixml : | $(LIBTARGETS)
+abixml : $(patsubst %.so,%.abixml,$(LIBTARGETS))
+
 abidw : $(patsubst %.so,%.abixml,$(LIBTARGETS))
        git commit -s --amend $^
 
@@ -104,7 +110,7 @@ install : all
 test : all
        $(MAKE) -C test $@
 
-.PHONY: test deps
+.PHONY: test deps abiclean abixml
 .SECONDARY : libefivar.so.1.$(VERSION) libefivar.so.1
 .SECONDARY : libefiboot.so.1.$(VERSION) libefivar.so.1
 .SECONDARY : include/efivar/efivar-guids.h guid-symbols.c