Browse Source

Build: Place ntk-console as part of core build

Alexander von Gluck IV 9 years ago
parent
commit
2627ba6350
6 changed files with 7 additions and 19 deletions
  1. 2
    0
      .gitignore
  2. 0
    14
      src/Ntk-Console/Makefile
  3. 0
    3
      src/Ntk-Console/Ntk-Console-Compile.sh
  4. 4
    1
      src/SConscript
  5. 1
    1
      src/ntk-console.c
  6. 0
    0
      src/ntk-console.h

+ 2
- 0
.gitignore View File

@@ -19,3 +19,5 @@
19 19
 *~
20 20
 
21 21
 config.h
22
+*.log
23
+build.conf

+ 0
- 14
src/Ntk-Console/Makefile View File

@@ -1,14 +0,0 @@
1
-C=clang
2
-DEBUG=-g -fno-builtin -Wfatal-errors -pedantic -Wunreachable-code -Winline -Wredundant-decls -Wno-vla
3
-CFLAGS=-Wall ${DEBUG} -std=c99
4
-SRCBIN=Netsukuku-Console
5
-
6
-all: ${SRCBIN}
7
-
8
-${SRCBIN}: Netsukuku-Console.o
9
-	${C} ${LDFLAGS} ${CFLAGS} ${LIBS} $^ -o $@
10
-
11
-.PHONY: clean
12
-
13
-clean:
14
-	rm -f *.o ${SRCBIN}

+ 0
- 3
src/Ntk-Console/Ntk-Console-Compile.sh View File

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

+ 4
- 1
src/SConscript View File

@@ -40,6 +40,7 @@ sources_ntkresolv = sources_common + Split("""andns_lib.c ntkresolv.c andns_net.
40 40
 					      crypto.c snsd_cache.c inet.c
41 41
 					      ll_map.c libnetlink.c
42 42
 					      err_errno.c""") 
43
+sources_ntkconsole = Split('ntk-console.c')
43 44
 
44 45
 libs = ['gmp', 'pthread', 'crypto', 'z']
45 46
 
@@ -153,8 +154,9 @@ build_config_files(env = env)
153 154
 ntkd 	= env.Program('ntkd', sources_netsukuku, LIBS = libs, CPPPATH = '.')
154 155
 qspn    = env.Program('qspn-empiric', sources_qspn, LIBS = libs, CPPPATH = '.')
155 156
 ntkresolv = env.Program('ntk-resolv', sources_ntkresolv, LIBS = libs, CPPPATH = '.')
157
+ntkconsole = env.Program('ntk-console', sources_ntkconsole, LIBS = libs, CPPPATH = '.', CFLAGS = '-std=c99')
156 158
 
157
-Default(ntkd, ntkresolv)
159
+Default(ntkd, ntkresolv, ntkconsole)
158 160
 
159 161
 
160 162
 #
@@ -171,6 +173,7 @@ idir_pid    = '$destdir' + '$PID_DIR'
171 173
 
172 174
 env.Install(idir_bin, [ntkd])
173 175
 env.Install(idir_bin, [ntkresolv])
176
+env.Install(idir_bin, [ntkconsole])
174 177
 env.Alias('install', [idir_bin, idir_conf])
175 178
 
176 179
 #Dirty hack ;( Why GetOption("install") doesn't work?

src/Ntk-Console/Netsukuku-Console.c → src/ntk-console.c View File

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

src/Ntk-Console/Netsukuku-Console.h → src/ntk-console.h View File


Loading…
Cancel
Save