Skip to content

Commit 3e66d88

Browse files
authored
Merge pull request #1 from void-linux/clean
Add .gitignore and remove systype detection
2 parents 2b8000f + 486459f commit 3e66d88

6 files changed

Lines changed: 36 additions & 216 deletions

File tree

src/.gitignore

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
*.o
2+
*.a
3+
4+
choose
5+
chpst
6+
compile
7+
direntry.h
8+
hasflock.h
9+
hasmkffo.h
10+
hassgact.h
11+
hassgprm.h
12+
hasshsgr.h
13+
haswaitp.h
14+
iopause.h
15+
load
16+
makelib
17+
reboot_system.h
18+
runit
19+
runit-init
20+
runsv
21+
runsvchdir
22+
runsvdir
23+
select.h
24+
socket.lib
25+
sv
26+
svlogd
27+
sysdeps
28+
uint64.h
29+
utmpset
30+
uw_tmp.h

src/Makefile

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -170,12 +170,6 @@ byte_diff.o: byte.h byte_diff.c compile
170170
byte_rchr.o: byte.h byte_rchr.c compile
171171
./compile byte_rchr.c
172172

173-
chkshsgr: chkshsgr.o load
174-
./load chkshsgr
175-
176-
chkshsgr.o: chkshsgr.c compile
177-
./compile chkshsgr.c
178-
179173
choose: choose.sh warn-auto.sh
180174
rm -f choose
181175
cat warn-auto.sh choose.sh \
@@ -185,7 +179,7 @@ choose: choose.sh warn-auto.sh
185179
coe.o: coe.c coe.h compile
186180
./compile coe.c
187181

188-
compile: conf-cc print-cc.sh systype warn-auto.sh
182+
compile: conf-cc print-cc.sh warn-auto.sh
189183
rm -f compile
190184
sh print-cc.sh > compile
191185
chmod 555 compile
@@ -232,9 +226,7 @@ hassgact.h: choose compile hassgact.h1 hassgact.h2 load trysgact.c
232226
hassgprm.h: choose compile hassgprm.h1 hassgprm.h2 load trysgprm.c
233227
./choose cl trysgprm hassgprm.h1 hassgprm.h2 > hassgprm.h
234228

235-
hasshsgr.h: chkshsgr choose compile hasshsgr.h1 hasshsgr.h2 load \
236-
tryshsgr.c warn-shsgr
237-
./chkshsgr || ( cat warn-shsgr; exit 1 )
229+
hasshsgr.h: choose compile hasshsgr.h1 hasshsgr.h2 load tryshsgr.c
238230
./choose clr tryshsgr hasshsgr.h1 hasshsgr.h2 > hasshsgr.h
239231

240232
haswaitp.h: choose compile haswaitp.h1 haswaitp.h2 load trywaitp.c
@@ -246,7 +238,7 @@ iopause.h: choose compile iopause.h1 iopause.h2 load trypoll.c
246238
iopause.o: compile iopause.c iopause.h select.h tai.h taia.h uint64.h
247239
./compile iopause.c
248240

249-
load: conf-ld print-ld.sh systype warn-auto.sh
241+
load: conf-ld print-ld.sh warn-auto.sh
250242
rm -f load
251243
sh print-ld.sh > load
252244
chmod 555 load
@@ -257,7 +249,7 @@ lock_ex.o: compile hasflock.h lock.h lock_ex.c
257249
lock_exnb.o: compile hasflock.h lock.h lock_exnb.c
258250
./compile lock_exnb.c
259251

260-
makelib: print-ar.sh systype warn-auto.sh
252+
makelib: print-ar.sh warn-auto.sh
261253
rm -f makelib
262254
sh print-ar.sh > makelib
263255
chmod 555 makelib
@@ -372,10 +364,10 @@ subgetopt.o: compile subgetopt.c subgetopt.h
372364
./compile subgetopt.c
373365

374366
sysdeps: compile direntry.h hasflock.h hasmkffo.h hassgact.h \
375-
hassgprm.h hasshsgr.h haswaitp.h iopause.h load select.h systype \
367+
hassgprm.h hasshsgr.h haswaitp.h iopause.h load select.h \
376368
uint64.h reboot_system.h uw_tmp.h socket.lib
377369
rm -f sysdeps
378-
cat systype compile load socket.lib >>sysdeps
370+
cat compile load socket.lib >>sysdeps
379371
grep sysdep direntry.h >>sysdeps
380372
grep sysdep haswaitp.h >>sysdeps
381373
grep sysdep hassgact.h >>sysdeps
@@ -390,9 +382,6 @@ uint64.h reboot_system.h uw_tmp.h socket.lib
390382
grep sysdep uw_tmp.h >>sysdeps
391383
cat sysdeps
392384

393-
systype: find-systype.sh trycpp.c x86cpuid.c
394-
sh find-systype.sh > systype
395-
396385
tai_now.o: compile tai.h tai_now.c uint64.h
397386
./compile tai_now.c
398387

src/chkshsgr.c

Lines changed: 0 additions & 13 deletions
This file was deleted.

src/find-systype.sh

Lines changed: 0 additions & 143 deletions
This file was deleted.

src/warn-shsgr

Lines changed: 0 additions & 3 deletions
This file was deleted.

src/x86cpuid.c

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)