From 00a7956122a7f02f91c20724ff1b15c02a44da0f Mon Sep 17 00:00:00 2001
From: Chris Johns <chrisj@rtems.org>
Date: Mon, 18 Apr 2016 11:02:00 +1000
Subject: Remove the makefile generator.

---
 wscript | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'wscript')

diff --git a/wscript b/wscript
index 4c019008..f4378b5d 100644
--- a/wscript
+++ b/wscript
@@ -171,6 +171,18 @@ def build(bld):
             rule = rkw_rule)
 
     # Lex
+    if bld.env.AUTO_REGEN:
+        bld(target = "freebsd/lib/libipsec/policy_token.c",
+            source = "freebsd/lib/libipsec/policy_token.l",
+            rule = "${LEX} -P __libipsecyy -t ${SRC} | sed -e '/YY_BUF_SIZE/s/16384/1024/' > ${TGT}")
+    bld.objects(target = "lex___libipsecyy",
+                features = "c",
+                cflags = cflags,
+                includes = [] + includes,
+                defines = [],
+                source = "freebsd/lib/libipsec/policy_token.c")
+    libbsd_use += ["lex___libipsecyy"]
+
     if bld.env.AUTO_REGEN:
         bld(target = "freebsd/lib/libc/net/nslexer.c",
             source = "freebsd/lib/libc/net/nslexer.l",
@@ -195,19 +207,18 @@ def build(bld):
                 source = "freebsd/contrib/libpcap/scanner.c")
     libbsd_use += ["lex_pcap"]
 
+    # Yacc
     if bld.env.AUTO_REGEN:
-        bld(target = "freebsd/lib/libipsec/policy_token.c",
-            source = "freebsd/lib/libipsec/policy_token.l",
-            rule = "${LEX} -P __libipsecyy -t ${SRC} | sed -e '/YY_BUF_SIZE/s/16384/1024/' > ${TGT}")
-    bld.objects(target = "lex___libipsecyy",
+        bld(target = "freebsd/lib/libc/net/nsparser.c",
+            source = "freebsd/lib/libc/net/nsparser.y",
+            rule = "${YACC} -b _nsyy -d -p _nsyy ${SRC} && sed -e '/YY_BUF_SIZE/s/16384/1024/' < _nsyy.tab.c > ${TGT} && rm -f _nsyy.tab.c && mv _nsyy.tab.h freebsd/lib/libc/net/nsparser.h")
+    bld.objects(target = "yacc__nsyy",
                 features = "c",
                 cflags = cflags,
                 includes = [] + includes,
                 defines = [],
-                source = "freebsd/lib/libipsec/policy_token.c")
-    libbsd_use += ["lex___libipsecyy"]
-
-    # Yacc
+                source = "freebsd/lib/libc/net/nsparser.c")
+    libbsd_use += ["yacc__nsyy"]
     if bld.env.AUTO_REGEN:
         bld(target = "freebsd/lib/libipsec/policy_parse.c",
             source = "freebsd/lib/libipsec/policy_parse.y",
@@ -219,17 +230,6 @@ def build(bld):
                 defines = [],
                 source = "freebsd/lib/libipsec/policy_parse.c")
     libbsd_use += ["yacc___libipsecyy"]
-    if bld.env.AUTO_REGEN:
-        bld(target = "freebsd/lib/libc/net/nsparser.c",
-            source = "freebsd/lib/libc/net/nsparser.y",
-            rule = "${YACC} -b _nsyy -d -p _nsyy ${SRC} && sed -e '/YY_BUF_SIZE/s/16384/1024/' < _nsyy.tab.c > ${TGT} && rm -f _nsyy.tab.c && mv _nsyy.tab.h freebsd/lib/libc/net/nsparser.h")
-    bld.objects(target = "yacc__nsyy",
-                features = "c",
-                cflags = cflags,
-                includes = [] + includes,
-                defines = [],
-                source = "freebsd/lib/libc/net/nsparser.c")
-    libbsd_use += ["yacc__nsyy"]
     if bld.env.AUTO_REGEN:
         bld(target = "freebsd/contrib/libpcap/grammar.c",
             source = "freebsd/contrib/libpcap/grammar.y",
-- 
cgit v1.2.3