include/openflow: Simplify structure checking for OpenFlow headers.

[cascardo/ovs.git] / include / openflow / automake.mk

diff --git a/include/openflow/automake.mk b/include/openflow/automake.mk
index 76a8f06..50933d5 100644 (file)
--- a/include/openflow/automake.mk
+++ b/include/openflow/automake.mk
@@ -1,9 +1,12 @@
-noinst_HEADERS += \
+openflowincludedir = $(includedir)/openflow
+openflowinclude_HEADERS = \
        include/openflow/nicira-ext.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 \
+       include/openflow/openflow-1.4.h \
+       include/openflow/openflow-1.5.h \
        include/openflow/openflow-common.h \
        include/openflow/openflow.h
 
@@ -11,39 +14,13 @@ if HAVE_PYTHON
 SUFFIXES += .h .hstamp
 
 .h.hstamp:
-       $(run_python) $(srcdir)/build-aux/check-structs -I$(srcdir)/include $<
+       $(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-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/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