1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
|
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Mon, 26 Dec 2016 11:51:26 +0100
Subject: Drop some tools
---
Makefile.am | 2 +-
doc/Makefile.am | 18 +-----------------
sadmin/Makefile.am | 4 ++--
sdevel/Makefile.am | 12 ++----------
smm/Makefile.am | 9 ++-------
suser/Makefile.am | 12 ++----------
6 files changed, 10 insertions(+), 47 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 6acdd77..d2bd616 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
# -*- Makefile -*-
AUTOMAKE_OPTIONS = foreign subdir-objects
-SUBDIRS = data doc kbd sadmin sdevel smath smm suser
+SUBDIRS = doc sadmin sdevel smath smm suser
tmpdir := $(shell mktemp -dtu)
packer = xz
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 7615ad8..b0b08e9 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -9,28 +9,16 @@ dist_man_MANS = \
clock_info.1 \
clt2bdf.1 \
clt2pbm.1 \
- cwdiff.1 \
declone.1 \
diff2php.1 \
- extract_d3pkg.1 \
- extract_dxhog.1 \
- extract_f3pod.1 \
- extract_qupak.1 \
fd0ssh.1 \
fnt2bdf.1 \
- fxterm.1 \
- git-author-stat.1 \
- git-forest.1 \
- git-revert-stats.1 \
- git-track.1 \
hcdplay.1 \
hxtools.7 \
ldif-duplicate-attrs.1 \
logontime.8 \
mailsplit.1 \
- man2html.1 \
mod2opus.1 \
- hxnetload.8 \
ofl.1 \
pegrep.1 \
peicon.1 \
@@ -46,11 +34,7 @@ dist_man_MANS = \
spec-beautifier.1 \
ssa2srt.1 \
stxdb.1 \
- sysinfo.1 \
- tailhex.1 \
utmp_register.8 \
vcsaview.8 \
vfontas.1 \
- wktimer.1 \
- xcp.1 \
- xfs_irecover.8
+ wktimer.1
diff --git a/sadmin/Makefile.am b/sadmin/Makefile.am
index 7905782..c8ddcaf 100644
--- a/sadmin/Makefile.am
+++ b/sadmin/Makefile.am
@@ -11,14 +11,14 @@ dist_bin_SCRIPTS = \
pmap_dirty \
su1
-pkglibexec_PROGRAMS = \
+bin_PROGRAMS += \
fd0ssh \
proc_iomem_count \
proc_stat_parse \
psthreads \
utmp_register
-dist_pkglibexec_SCRIPTS = \
+dist_bin_SCRIPTS += \
logontime \
ldif-duplicate-attrs \
ldif-leading-spaces \
diff --git a/sdevel/Makefile.am b/sdevel/Makefile.am
index 6127af9..15be43d 100644
--- a/sdevel/Makefile.am
+++ b/sdevel/Makefile.am
@@ -9,22 +9,14 @@ bin_PROGRAMS = \
dist_bin_SCRIPTS = \
checkbrack \
- cwdiff \
- git-author-stat \
- git-forest \
- git-track \
- man2html \
spec-beautifier
-pkglibexec_PROGRAMS = \
+bin_PROGRAMS += \
cctypeinfo \
peicon
-dist_pkglibexec_SCRIPTS = \
+dist_bin_SCRIPTS += \
diff2php \
- doxygen-kerneldoc-filter \
- git-blame-stats \
- git-revert-stats \
paddrspacesize \
proc_stat_signal_decode \
sourcefuncsize
diff --git a/smm/Makefile.am b/smm/Makefile.am
index ec025ce..948f652 100644
--- a/smm/Makefile.am
+++ b/smm/Makefile.am
@@ -11,21 +11,16 @@ endif
dist_bin_SCRIPTS = aumeta gpsh mkvappend ssa2srt
-pkglibexec_PROGRAMS = \
+bin_PROGRAMS += \
bsvplay \
clt2pbm \
pcmdiff \
qplay \
vfontas
-dist_pkglibexec_SCRIPTS = \
- extract_d3pkg \
- extract_dxhog \
- extract_f3pod \
- extract_qupak \
+dist_bin_SCRIPTS += \
fnt2bdf \
mod2opus \
- shared.pm \
stxdb
bsvplay_SOURCES = bsvplay.c pcspkr_pcm.c
diff --git a/suser/Makefile.am b/suser/Makefile.am
index 7a21012..8e07c33 100644
--- a/suser/Makefile.am
+++ b/suser/Makefile.am
@@ -5,22 +5,14 @@ AM_CPPFLAGS = ${regular_CPPFLAGS} ${libHX_CFLAGS} ${libmount_CFLAGS} \
AM_CFLAGS = ${regular_CFLAGS}
bin_PROGRAMS = \
- declone \
- sysinfo \
- tailhex \
- xcp
+ declone
dist_bin_SCRIPTS = \
- fxterm \
pegrep pesubst qpdecode \
rot13 \
qtar \
wktimer
-dist_pkglibexec_SCRIPTS = \
+dist_bin_SCRIPTS += \
mailsplit \
rezip
-
-sysinfo_LDADD = ${libHX_LIBS} ${libmount_LIBS} ${libpci_LIBS} ${libxcb_LIBS}
-tailhex_LDADD = ${libHX_LIBS}
-xcp_LDADD = ${libHX_LIBS}
|
