| 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 |
| 1 |
> |
--- src/Makefile.in.orig 2010-04-08 05:41:34.000000000 -0700 |
| 2 |
> |
+++ src/Makefile.in 2010-05-18 21:30:06.746914197 -0700 |
| 3 |
|
@@ -34,8 +34,8 @@ |
| 4 |
|
POST_UNINSTALL = : |
| 5 |
|
build_triplet = @build@ |
| 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 @@ |
| 29 |
> |
@@ -290,19 +290,19 @@ |
| 30 |
> |
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) |
| 31 |
> |
fuser$(EXEEXT): $(fuser_OBJECTS) $(fuser_DEPENDENCIES) |
| 32 |
> |
@rm -f fuser$(EXEEXT) |
| 33 |
> |
- $(LINK) $(fuser_OBJECTS) $(fuser_LDADD) $(LIBS) |
| 34 |
> |
+ $(LINK) $(fuser_OBJECTS) $(fuser_LDADD) $(LIBS) $(INTLLIBS) |
| 35 |
> |
killall$(EXEEXT): $(killall_OBJECTS) $(killall_DEPENDENCIES) |
| 36 |
> |
@rm -f killall$(EXEEXT) |
| 37 |
> |
- $(LINK) $(killall_OBJECTS) $(killall_LDADD) $(LIBS) |
| 38 |
> |
+ $(LINK) $(killall_OBJECTS) $(killall_LDADD) $(LIBS) $(INTLLIBS) |
| 39 |
> |
peekfd$(EXEEXT): $(peekfd_OBJECTS) $(peekfd_DEPENDENCIES) |
| 40 |
> |
@rm -f peekfd$(EXEEXT) |
| 41 |
> |
- $(LINK) $(peekfd_OBJECTS) $(peekfd_LDADD) $(LIBS) |
| 42 |
> |
+ $(LINK) $(peekfd_OBJECTS) $(peekfd_LDADD) $(LIBS) $(INTLLIBS) |
| 43 |
> |
prtstat$(EXEEXT): $(prtstat_OBJECTS) $(prtstat_DEPENDENCIES) |
| 44 |
> |
@rm -f prtstat$(EXEEXT) |
| 45 |
> |
- $(LINK) $(prtstat_OBJECTS) $(prtstat_LDADD) $(LIBS) |
| 46 |
> |
+ $(LINK) $(prtstat_OBJECTS) $(prtstat_LDADD) $(LIBS) $(INTLLIBS) |
| 47 |
> |
pstree$(EXEEXT): $(pstree_OBJECTS) $(pstree_DEPENDENCIES) |
| 48 |
> |
@rm -f pstree$(EXEEXT) |
| 49 |
> |
- $(LINK) $(pstree_OBJECTS) $(pstree_LDADD) $(LIBS) |
| 50 |
> |
+ $(LINK) $(pstree_OBJECTS) $(pstree_LDADD) $(LIBS) $(INTLLIBS) |
| 51 |
|
|
| 52 |
+ |
mostlyclean-compile: |
| 53 |
+ |
-rm -f *.$(OBJEXT) |
| 54 |
+ |
@@ -538,7 +538,7 @@ |
| 55 |
|
signames.h: signames.c Makefile |
| 56 |
|
export LC_ALL=C ; \ |
| 57 |
< |
- @CPP@ -dM $< |\ |
| 57 |
> |
@CPP@ -dM $< |\ |
| 58 |
|
- tr -s '\t ' ' ' | sort -n -k 3 | sed \ |
| 59 |
< |
- 's:#define SIG\([A-Z]\+[0-9]*\) \([0-9]\+\) *\(\|/\*.*\)$$:{\ \2,"\1" },:p;d' | \ |
| 60 |
< |
- grep -v '[0-9][0-9][0-9]' >signames.h || \ |
| 61 |
< |
- { rm -f signames.h; exit 1; } |
| 62 |
< |
- 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) && \ |
| 59 |
> |
+ tr -s '\t ' ' ' | sort -n -k 3 | gsed \ |
| 60 |
> |
's:#define SIG\([A-Z]\+[0-9]*\) \([0-9]\+\) *\(\|/\*.*\)$$:{\ \2,"\1" },:p;d' | \ |
| 61 |
> |
grep -v '[0-9][0-9][0-9]' >signames.h || \ |
| 62 |
> |
{ rm -f signames.h; exit 1; } |
