| 1 |
--- src/Makefile.in.orig 2009-12-27 16:19:06.000000000 +0900 |
| 2 |
+++ src/Makefile.in 2010-01-03 00:25:56.093987293 +0900 |
| 3 |
@@ -34,8 +34,8 @@ |
| 4 |
POST_UNINSTALL = : |
| 5 |
build_triplet = @build@ |
| 6 |
host_triplet = @host@ |
| 7 |
-bin_PROGRAMS = fuser$(EXEEXT) killall$(EXEEXT) pstree$(EXEEXT) \ |
| 8 |
- prtstat$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \ |
| 9 |
+bin_PROGRAMS = killall$(EXEEXT) pstree$(EXEEXT) \ |
| 10 |
+ $(am__EXEEXT_1) $(am__EXEEXT_2) \ |
| 11 |
$(am__EXEEXT_3) |
| 12 |
@WANT_PEEKFD_I386_TRUE@am__append_1 = peekfd |
| 13 |
@WANT_PEEKFD_I386_TRUE@am__append_2 = -DI386 |
| 14 |
@@ -81,10 +81,10 @@ |
| 15 |
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) |
| 16 |
CCLD = $(CC) |
| 17 |
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ |
| 18 |
-SOURCES = $(fuser_SOURCES) $(killall_SOURCES) $(peekfd_SOURCES) \ |
| 19 |
- $(prtstat_SOURCES) $(pstree_SOURCES) |
| 20 |
-DIST_SOURCES = $(fuser_SOURCES) $(killall_SOURCES) $(peekfd_SOURCES) \ |
| 21 |
- $(prtstat_SOURCES) $(pstree_SOURCES) |
| 22 |
+SOURCES = $(killall_SOURCES) \ |
| 23 |
+ $(pstree_SOURCES) |
| 24 |
+DIST_SOURCES = $(killall_SOURCES) \ |
| 25 |
+ $(pstree_SOURCES) |
| 26 |
ETAGS = etags |
| 27 |
CTAGS = ctags |
| 28 |
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
| 29 |
@@ -208,10 +208,10 @@ |
| 30 |
$(am__append_4) $(am__append_6) |
| 31 |
fuser_SOURCES = fuser.c comm.h signals.c signals.h i18n.h fuser.h |
| 32 |
killall_SOURCES = killall.c comm.h signals.c signals.h i18n.h |
| 33 |
-killall_LDADD = @SELINUX_LIB@ |
| 34 |
+killall_LDADD = |
| 35 |
peekfd_SOURCES = peekfd.c |
| 36 |
pstree_SOURCES = pstree.c comm.h i18n.h |
| 37 |
-pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@ |
| 38 |
+pstree_LDADD = @TERMCAP_LIB@ |
| 39 |
prtstat_SOURCES = prtstat.c prtstat.h |
| 40 |
BUILT_SOURCES = signames.h |
| 41 |
EXTRA_DIST = signames.c |
| 42 |
@@ -537,13 +537,20 @@ |
| 43 |
|
| 44 |
signames.h: signames.c Makefile |
| 45 |
export LC_ALL=C ; \ |
| 46 |
- @CPP@ -dM $< |\ |
| 47 |
- tr -s '\t ' ' ' | sort -n -k 3 | sed \ |
| 48 |
- 's:#define SIG\([A-Z]\+[0-9]*\) \([0-9]\+\) *\(\|/\*.*\)$$:{\ \2,"\1" },:p;d' | \ |
| 49 |
- grep -v '[0-9][0-9][0-9]' >signames.h || \ |
| 50 |
- { rm -f signames.h; exit 1; } |
| 51 |
- grep '^{ 1,"HUP" },$$' signames.h >/dev/null || \ |
| 52 |
- { rm -f signames.h; exit 1; } |
| 53 |
+ @CPP@ -dM $< | {\ |
| 54 |
+ signames=`kill -l | tr a-z A-Z`; \ |
| 55 |
+ while read define name value; do \ |
| 56 |
+ [ "$$define" = '#define' ] || continue; \ |
| 57 |
+ case "$$value" in \ |
| 58 |
+ *[!0-9]*) continue; \ |
| 59 |
+ esac; \ |
| 60 |
+ for signame in $$signames; do \ |
| 61 |
+ if [ "$$name" = "SIG$$signame" ]; then \ |
| 62 |
+ echo "{ $$value, \"$$signame\" },"; \ |
| 63 |
+ fi; \ |
| 64 |
+ done; \ |
| 65 |
+ done; \ |
| 66 |
+ } | sort -n -k 2 > signames.h |
| 67 |
|
| 68 |
install-exec-hook: |
| 69 |
cd $(DESTDIR)$(bindir) && \ |
