From 0d436c7f7dbd71e7c9c43bb7f6c85e2c7dabcd88 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 8 Mar 2012 16:54:51 -0600 Subject: [PATCH] netipsec/ipsec.c was in header file list not C file list + Makefile: It was not listed since it was a header + freebsd/netipsec/ipsec.c: include transformation did not occur + freebsd-to-rtems.py: Moved ipsec.c to source. Added checks to ensure that only .h files are in header list and that only .c files are in source list. --- Makefile | 1 + freebsd-to-rtems.py | 13 ++++++++++++- freebsd/netipsec/ipsec.c | 2 ++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3161b58e..ee9bd81d 100644 --- a/Makefile +++ b/Makefile @@ -169,6 +169,7 @@ C_FILES = \ freebsd/netinet6/scope6.c \ freebsd/netinet6/sctp6_usrreq.c \ freebsd/netinet6/udp6_usrreq.c \ + freebsd/netipsec/ipsec.c \ freebsd/netipsec/ipsec_input.c \ freebsd/netipsec/ipsec_mbuf.c \ freebsd/netipsec/ipsec_output.c \ diff --git a/freebsd-to-rtems.py b/freebsd-to-rtems.py index 2398e100..8f809714 100755 --- a/freebsd-to-rtems.py +++ b/freebsd-to-rtems.py @@ -394,9 +394,20 @@ class Module: def addHeaderFiles(self, files): self.headerFiles.extend(files) + for file in files: + if file[-2] != '.' or file[-1] != 'h': + print "*** " + file + " does not end in .h" + print "*** Move it to a C source file list" + sys.exit(2) def addSourceFiles(self, files): self.sourceFiles.extend(files) + for file in files: + if file[-2] != '.' or file[-1] != 'c': + print "*** " + file + " does not end in .c" + print "*** Move it to a header file list" + sys.exit(2) + def addDependency(self, dep): self.dependencies.append(dep) @@ -1420,7 +1431,6 @@ netipsec.addHeaderFiles( 'netipsec/ipcomp_var.h', 'netipsec/ipip_var.h', 'netipsec/ipsec6.h', - 'netipsec/ipsec.c', 'netipsec/ipsec.h', 'netipsec/keydb.h', 'netipsec/key_debug.h', @@ -1432,6 +1442,7 @@ netipsec.addHeaderFiles( ) netipsec.addSourceFiles( [ + 'netipsec/ipsec.c', 'netipsec/ipsec_input.c', 'netipsec/ipsec_mbuf.c', 'netipsec/ipsec_output.c', diff --git a/freebsd/netipsec/ipsec.c b/freebsd/netipsec/ipsec.c index 990e56e4..95aefca3 100644 --- a/freebsd/netipsec/ipsec.c +++ b/freebsd/netipsec/ipsec.c @@ -1,3 +1,5 @@ +#include + /* $FreeBSD$ */ /* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */