Build: Place ntk-console as part of core build

This commit is contained in:
Alexander von Gluck IV 2014-09-14 11:16:41 -05:00
parent d262a621ac
commit 2627ba6350
6 changed files with 7 additions and 19 deletions

2
.gitignore vendored
View File

@ -19,3 +19,5 @@
*~
config.h
*.log
build.conf

View File

@ -1,14 +0,0 @@
C=clang
DEBUG=-g -fno-builtin -Wfatal-errors -pedantic -Wunreachable-code -Winline -Wredundant-decls -Wno-vla
CFLAGS=-Wall ${DEBUG} -std=c99
SRCBIN=Netsukuku-Console
all: ${SRCBIN}
${SRCBIN}: Netsukuku-Console.o
${C} ${LDFLAGS} ${CFLAGS} ${LIBS} $^ -o $@
.PHONY: clean
clean:
rm -f *.o ${SRCBIN}

View File

@ -1,3 +0,0 @@
#!/bin/bash
make clean
make

View File

@ -40,6 +40,7 @@ sources_ntkresolv = sources_common + Split("""andns_lib.c ntkresolv.c andns_net.
crypto.c snsd_cache.c inet.c
ll_map.c libnetlink.c
err_errno.c""")
sources_ntkconsole = Split('ntk-console.c')
libs = ['gmp', 'pthread', 'crypto', 'z']
@ -153,8 +154,9 @@ build_config_files(env = env)
ntkd = env.Program('ntkd', sources_netsukuku, LIBS = libs, CPPPATH = '.')
qspn = env.Program('qspn-empiric', sources_qspn, LIBS = libs, CPPPATH = '.')
ntkresolv = env.Program('ntk-resolv', sources_ntkresolv, LIBS = libs, CPPPATH = '.')
ntkconsole = env.Program('ntk-console', sources_ntkconsole, LIBS = libs, CPPPATH = '.', CFLAGS = '-std=c99')
Default(ntkd, ntkresolv)
Default(ntkd, ntkresolv, ntkconsole)
#
@ -171,6 +173,7 @@ idir_pid = '$destdir' + '$PID_DIR'
env.Install(idir_bin, [ntkd])
env.Install(idir_bin, [ntkresolv])
env.Install(idir_bin, [ntkconsole])
env.Alias('install', [idir_bin, idir_conf])
#Dirty hack ;( Why GetOption("install") doesn't work?

View File

@ -1,5 +1,5 @@
#include "Netsukuku-Console.h"
#include "ntk-console.h"
#include <unistd.h>