include/openflow: Simplify structure checking for OpenFlow headers.

This means that anyone who adds another openflow include file automatically
gets it checked.  It does mean that changing any of the OpenFlow headers
causes all of them to be checked, but that doesn't seem like a big deal
(it's quick).

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Thomas Graf <tgraf@noironetworks.com>

diff --git a/include/openflow/automake.mk b/include/openflow/automake.mk
index 512991e..50933d5 100644 (file)
--- a/include/openflow/automake.mk
+++ b/include/openflow/automake.mk
@@ -17,42 +17,10 @@ SUFFIXES += .h .hstamp
        $(AM_V_GEN)$(run_python) $(srcdir)/build-aux/check-structs -I$(srcdir)/include $< && \
        touch $@
 
-HSTAMP_FILES = \
-       include/openflow/nicira-ext.hstamp \
-       include/openflow/openflow-1.0.hstamp \
-       include/openflow/openflow-1.1.hstamp \
-       include/openflow/openflow-1.2.hstamp \
-       include/openflow/openflow-1.3.hstamp \
-       include/openflow/openflow-1.4.hstamp \
-       include/openflow/openflow-1.5.hstamp \
-       include/openflow/openflow-common.hstamp \
-       include/openflow/openflow.hstamp
+HSTAMP_FILES = $(openflowinclude_HEADERS:.h=.hstamp)
 CLEANFILES += $(HSTAMP_FILES)
 ALL_LOCAL += $(HSTAMP_FILES)
-$(HSTAMP_FILES): build-aux/check-structs
-
-include/openflow/openflow-1.0.hstamp: \
-       include/openflow/openflow-common.h
-include/openflow/openflow-1.1.hstamp: \
-       include/openflow/openflow-common.h
-include/openflow/openflow-1.2.hstamp: \
-       include/openflow/openflow-common.h \
-       include/openflow/openflow-1.1.h
-include/openflow/openflow-1.3.hstamp: \
-       include/openflow/openflow-common.h \
-       include/openflow/openflow-1.1.h \
-       include/openflow/openflow-1.2.h
-include/openflow/openflow-1.4.hstamp: \
-       include/openflow/openflow-1.4.h
-include/openflow/openflow-1.5.hstamp: \
-       include/openflow/openflow-1.5.h
-include/openflow/nicira-ext.hstamp: \
-       include/openflow/openflow.h \
-       include/openflow/openflow-common.h \
-       include/openflow/openflow-1.0.h \
-       include/openflow/openflow-1.1.h \
-       include/openflow/openflow-1.2.h \
-       include/openflow/openflow-1.3.h
+$(HSTAMP_FILES): build-aux/check-structs $(openflowinclude_HEADERS)
 endif
 
 EXTRA_DIST += build-aux/check-structs