---
netlegacy.py | 13 ++-----------
testsuites/telnetd01/wscript | 5 +++++
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/netlegacy.py b/netlegacy.py
index ddd1db3..327d7cc 100644
--- a/netlegacy.py
+++ b/netlegacy.py
@@ -31,8 +31,7 @@ import os
source_files = []
include_files = {}
-exclude_dirs = ['pppd', 'nfsclient', 'testsuites', 'librpc/include', 'bsps',
- 'telnetd']
+exclude_dirs = ['pppd', 'nfsclient', 'testsuites', 'librpc/include', 'bsps']
exclude_headers = ['rtems-bsd-user-space.h', 'rtems-bsd-kernel-space.h']
for root, dirs, files in os.walk("."):
@@ -61,8 +60,6 @@ def build(bld):
bsp = bld.env.RTEMS_ARCH_BSP.split('-')[-1]
pppd_source = [os.path.join('pppd', s)
for s in os.listdir('pppd') if s[-2:] == '.c']
- telnetd_source = [os.path.join('telnetd', s)
- for s in os.listdir('telnetd') if s[-2:] == '.c']
nfs_source = []
for root, dirs, files in os.walk('nfsclient'):
for name in files:
@@ -120,12 +117,6 @@ def build(bld):
use='networking',
source=pppd_source)
- bld.stlib(target='telnetd',
- features='c',
- includes=ip,
- use='networking',
- source=telnetd_source)
-
bld.stlib(target='nfs',
features='c',
includes=ip,
@@ -133,7 +124,7 @@ def build(bld):
source=nfs_source)
bld.install_files(os.path.join('${PREFIX}', arch_lib_path),
- ["libnetworking.a", 'libpppd.a', 'libtelnetd.a',
'libnfs.a'])
+ ["libnetworking.a", 'libpppd.a', 'libnfs.a'])
bld.install_files(os.path.join('${PREFIX}', arch_lib_path,
'include', 'libchip'),
install_file_list('bsps', 'include', 'libchip'))
diff --git a/testsuites/telnetd01/wscript b/testsuites/telnetd01/wscript
index 782c0f6..dc18737 100644
--- a/testsuites/telnetd01/wscript
+++ b/testsuites/telnetd01/wscript
@@ -38,6 +38,11 @@ def configure(conf):
def build(bld):
+ arch_lib_path = rtems.arch_bsp_lib_path(bld.env.RTEMS_VERSION,
+ bld.env.RTEMS_ARCH_BSP)
+ lib_path = os.path.join(bld.env.PREFIX, arch_lib_path)
+ bld.read_stlib('telnetd', paths=[lib_path])
+
bld.program(target='telnetd01.exe',
features='c cprogram',
cflags=['-O2', '-g'],
--
2.26.2
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
