From 71d6ab4533bd3320acaee738d65ccd98a5ecdb78 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Tue, 17 Mar 2015 14:39:27 -0700 Subject: [PATCH] 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 Acked-by: Thomas Graf --- include/openflow/automake.mk | 36 ++---------------------------------- 1 file changed, 2 insertions(+), 34 deletions(-) diff --git a/include/openflow/automake.mk b/include/openflow/automake.mk index 512991e57..50933d5be 100644 --- 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 -- 2.20.1