Skip to content

Commit 2b9aabb

Browse files
committed
[net] Consolidate elkscmd/inet/* directories into inet/cmds
1 parent 9e6f145 commit 2b9aabb

File tree

23 files changed

+52
-212
lines changed

23 files changed

+52
-212
lines changed

elkscmd/inet/Makefile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,10 @@ include $(BASEDIR)/Makefile-rules
99
# All subdirectories to build & clean
1010

1111
SUBDIRS = \
12-
httpd \
13-
nettools \
14-
telnet \
12+
cmds \
13+
ftp \
1514
telnetd \
1615
tinyirc \
17-
urlget \
18-
ftp \
19-
netcat \
2016
# EOL
2117

2218
all:

elkscmd/inet/cmds/.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
arp
2+
httpd
3+
netcat
4+
netstat
5+
nslookup
6+
telnet
7+
urlget

elkscmd/inet/cmds/Makefile

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
BASEDIR=../..
2+
3+
include $(BASEDIR)/Makefile-rules
4+
5+
###############################################################################
6+
7+
LOCALFLAGS=-I$(ELKSCMD_DIR)
8+
9+
###############################################################################
10+
11+
PRGS = arp httpd netcat netstat nslookup telnet urlget
12+
13+
all: $(PRGS)
14+
15+
install: $(PRGS)
16+
$(INSTALL) $(PRGS) $(DESTDIR)/bin
17+
$(INSTALL) -d $(DESTDIR)/var/www
18+
$(INSTALL) sample_index.html $(DESTDIR)/var/www/index.html
19+
# $(INSTALL) resolv.cfg $(DESTDIR)/etc
20+
21+
arp: arp.o $(TINYPRINTF)
22+
$(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS)
23+
24+
httpd: httpd.o $(TINYPRINTF)
25+
$(LD) $(LDFLAGS) -maout-heap=256 -maout-stack=2048 -o $@ $^ $(LDLIBS)
26+
27+
netcat: netcat.o
28+
$(LD) $(LDFLAGS) -maout-heap=128 -maout-stack=1024 -o $@ $^ $(LDLIBS)
29+
30+
netstat: netstat.o $(TINYPRINTF)
31+
$(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS)
32+
33+
nslookup: nslookup.o
34+
$(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS)
35+
36+
telnet: telnet.o $(TINYPRINTF)
37+
$(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS)
38+
39+
urlget: urlget.o $(TINYPRINTF)
40+
$(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS)
41+
42+
clean:
43+
$(RM) *.o $(PRGS)

0 commit comments

Comments
 (0)