From a102f845404461bb3dade04fe3cdc754949bd248 Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Tue, 17 Mar 2009 12:49:03 -0700 Subject: [PATCH] includes: add ext to the includes path. move dnet to the correct place so that we use this --HG-- rename : ext/dnet/dnet/addr.h => ext/dnet/addr.h rename : ext/dnet/dnet/arp.h => ext/dnet/arp.h rename : ext/dnet/dnet/blob.h => ext/dnet/blob.h rename : ext/dnet/dnet/eth.h => ext/dnet/eth.h rename : ext/dnet/dnet/fw.h => ext/dnet/fw.h rename : ext/dnet/dnet/icmp.h => ext/dnet/icmp.h rename : ext/dnet/dnet/intf.h => ext/dnet/intf.h rename : ext/dnet/dnet/ip.h => ext/dnet/ip.h rename : ext/dnet/dnet/ip6.h => ext/dnet/ip6.h rename : ext/dnet/dnet/os.h => ext/dnet/os.h rename : ext/dnet/dnet/rand.h => ext/dnet/rand.h rename : ext/dnet/dnet/route.h => ext/dnet/route.h rename : ext/dnet/dnet/tcp.h => ext/dnet/tcp.h rename : ext/dnet/dnet/udp.h => ext/dnet/udp.h --- SConstruct | 4 +++- ext/dnet/{dnet => }/addr.h | 0 ext/dnet/{dnet => }/arp.h | 0 ext/dnet/{dnet => }/blob.h | 0 ext/dnet/{dnet => }/eth.h | 0 ext/dnet/{dnet => }/fw.h | 0 ext/dnet/{dnet => }/icmp.h | 0 ext/dnet/{dnet => }/intf.h | 0 ext/dnet/{dnet => }/ip.h | 0 ext/dnet/{dnet => }/ip6.h | 0 ext/dnet/{dnet => }/os.h | 0 ext/dnet/{dnet => }/rand.h | 0 ext/dnet/{dnet => }/route.h | 0 ext/dnet/{dnet => }/tcp.h | 0 ext/dnet/{dnet => }/udp.h | 0 ext/gzstream/SConscript | 2 -- 16 files changed, 3 insertions(+), 3 deletions(-) rename ext/dnet/{dnet => }/addr.h (100%) rename ext/dnet/{dnet => }/arp.h (100%) rename ext/dnet/{dnet => }/blob.h (100%) rename ext/dnet/{dnet => }/eth.h (100%) rename ext/dnet/{dnet => }/fw.h (100%) rename ext/dnet/{dnet => }/icmp.h (100%) rename ext/dnet/{dnet => }/intf.h (100%) rename ext/dnet/{dnet => }/ip.h (100%) rename ext/dnet/{dnet => }/ip6.h (100%) rename ext/dnet/{dnet => }/os.h (100%) rename ext/dnet/{dnet => }/rand.h (100%) rename ext/dnet/{dnet => }/route.h (100%) rename ext/dnet/{dnet => }/tcp.h (100%) rename ext/dnet/{dnet => }/udp.h (100%) diff --git a/SConstruct b/SConstruct index db6c7f9e5..cd22ab2cc 100644 --- a/SConstruct +++ b/SConstruct @@ -373,6 +373,9 @@ else: Export('base_dir') Export('extras_dir_list') +# the ext directory should be on the #includes path +env.Append(CPPPATH=[Dir('ext')]) + # M5_PLY is used by isa_parser.py to find the PLY package. env.Append(ENV = { 'M5_PLY' : Dir('ext/ply').abspath }) @@ -418,7 +421,6 @@ if env['BATCH']: if sys.platform == 'cygwin': # cygwin has some header file issues... env.Append(CCFLAGS=Split("-Wno-uninitialized")) -env.Append(CPPPATH=[Dir('ext/dnet')]) # Check for SWIG if not env.has_key('SWIG'): diff --git a/ext/dnet/dnet/addr.h b/ext/dnet/addr.h similarity index 100% rename from ext/dnet/dnet/addr.h rename to ext/dnet/addr.h diff --git a/ext/dnet/dnet/arp.h b/ext/dnet/arp.h similarity index 100% rename from ext/dnet/dnet/arp.h rename to ext/dnet/arp.h diff --git a/ext/dnet/dnet/blob.h b/ext/dnet/blob.h similarity index 100% rename from ext/dnet/dnet/blob.h rename to ext/dnet/blob.h diff --git a/ext/dnet/dnet/eth.h b/ext/dnet/eth.h similarity index 100% rename from ext/dnet/dnet/eth.h rename to ext/dnet/eth.h diff --git a/ext/dnet/dnet/fw.h b/ext/dnet/fw.h similarity index 100% rename from ext/dnet/dnet/fw.h rename to ext/dnet/fw.h diff --git a/ext/dnet/dnet/icmp.h b/ext/dnet/icmp.h similarity index 100% rename from ext/dnet/dnet/icmp.h rename to ext/dnet/icmp.h diff --git a/ext/dnet/dnet/intf.h b/ext/dnet/intf.h similarity index 100% rename from ext/dnet/dnet/intf.h rename to ext/dnet/intf.h diff --git a/ext/dnet/dnet/ip.h b/ext/dnet/ip.h similarity index 100% rename from ext/dnet/dnet/ip.h rename to ext/dnet/ip.h diff --git a/ext/dnet/dnet/ip6.h b/ext/dnet/ip6.h similarity index 100% rename from ext/dnet/dnet/ip6.h rename to ext/dnet/ip6.h diff --git a/ext/dnet/dnet/os.h b/ext/dnet/os.h similarity index 100% rename from ext/dnet/dnet/os.h rename to ext/dnet/os.h diff --git a/ext/dnet/dnet/rand.h b/ext/dnet/rand.h similarity index 100% rename from ext/dnet/dnet/rand.h rename to ext/dnet/rand.h diff --git a/ext/dnet/dnet/route.h b/ext/dnet/route.h similarity index 100% rename from ext/dnet/dnet/route.h rename to ext/dnet/route.h diff --git a/ext/dnet/dnet/tcp.h b/ext/dnet/tcp.h similarity index 100% rename from ext/dnet/dnet/tcp.h rename to ext/dnet/tcp.h diff --git a/ext/dnet/dnet/udp.h b/ext/dnet/udp.h similarity index 100% rename from ext/dnet/dnet/udp.h rename to ext/dnet/udp.h diff --git a/ext/gzstream/SConscript b/ext/gzstream/SConscript index 85bf95f5b..ec2939b8b 100644 --- a/ext/gzstream/SConscript +++ b/ext/gzstream/SConscript @@ -28,8 +28,6 @@ # # Authors: Nathan Binkert -import os, subprocess - Import('env') env.Library('gzstream', [File('gzstream.cc')])