Skip to content

Commit bd4ace3

Browse files
committed
Raising version to DAPS 2.0~beta8
git-svn-id: svn+ssh://svn.code.sf.net/p/daps/svn/trunk/daps@4150 2c1a2506-8097-4b87-b405-3e90b480097b
1 parent cfd4360 commit bd4ace3

File tree

9 files changed

+619
-556
lines changed

9 files changed

+619
-556
lines changed

Makefile.in

Lines changed: 130 additions & 141 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Makefile.in generated by automake 1.12.1 from Makefile.am.
1+
# Makefile.in generated by automake 1.13.4 from Makefile.am.
22
# @configure_input@
33

4-
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
4+
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
55

66
# This Makefile.in is free software; the Free Software Foundation
77
# gives unlimited permission to copy and/or distribute it,
@@ -27,23 +27,51 @@
2727

2828

2929
VPATH = @srcdir@
30-
am__make_dryrun = \
31-
{ \
32-
am__dry=no; \
30+
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
31+
am__make_running_with_option = \
32+
case $${target_option-} in \
33+
?) ;; \
34+
*) echo "am__make_running_with_option: internal error: invalid" \
35+
"target option '$${target_option-}' specified" >&2; \
36+
exit 1;; \
37+
esac; \
38+
has_opt=no; \
39+
sane_makeflags=$$MAKEFLAGS; \
40+
if $(am__is_gnu_make); then \
41+
sane_makeflags=$$MFLAGS; \
42+
else \
3343
case $$MAKEFLAGS in \
3444
*\\[\ \ ]*) \
35-
echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
36-
| grep '^AM OK$$' >/dev/null || am__dry=yes;; \
37-
*) \
38-
for am__flg in $$MAKEFLAGS; do \
39-
case $$am__flg in \
40-
*=*|--*) ;; \
41-
*n*) am__dry=yes; break;; \
42-
esac; \
43-
done;; \
45+
bs=\\; \
46+
sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
47+
| sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
4448
esac; \
45-
test $$am__dry = yes; \
46-
}
49+
fi; \
50+
skip_next=no; \
51+
strip_trailopt () \
52+
{ \
53+
flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
54+
}; \
55+
for flg in $$sane_makeflags; do \
56+
test $$skip_next = yes && { skip_next=no; continue; }; \
57+
case $$flg in \
58+
*=*|--*) continue;; \
59+
-*I) strip_trailopt 'I'; skip_next=yes;; \
60+
-*I?*) strip_trailopt 'I';; \
61+
-*O) strip_trailopt 'O'; skip_next=yes;; \
62+
-*O?*) strip_trailopt 'O';; \
63+
-*l) strip_trailopt 'l'; skip_next=yes;; \
64+
-*l?*) strip_trailopt 'l';; \
65+
-[dEDm]) skip_next=yes;; \
66+
-[JT]) skip_next=yes;; \
67+
esac; \
68+
case $$flg in \
69+
*$$target_option*) has_opt=yes; break;; \
70+
esac; \
71+
done; \
72+
test $$has_opt = yes
73+
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
74+
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
4775
pkgdatadir = $(datadir)/@PACKAGE@
4876
pkgincludedir = $(includedir)/@PACKAGE@
4977
pkglibdir = $(libdir)/@PACKAGE@
@@ -61,20 +89,20 @@ NORMAL_UNINSTALL = :
6189
PRE_UNINSTALL = :
6290
POST_UNINSTALL = :
6391
subdir = .
64-
DIST_COMMON = README $(am__configure_deps) \
65-
$(am__dist_catalog_DATA_DIST) $(dist_bin_SCRIPTS) \
92+
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
93+
$(top_srcdir)/configure $(am__configure_deps) \
94+
$(dist_bin_SCRIPTS) $(dist_dapslibexec_SCRIPTS) \
95+
$(dist_man1_MANS) $(am__dist_catalog_DATA_DIST) \
6696
$(dist_dapsconf_DATA) $(dist_dapslib_DATA) \
67-
$(dist_dapslibexec_SCRIPTS) $(dist_dapsmake_DATA) \
68-
$(dist_doc_DATA) $(dist_emacssite_DATA) $(dist_fopconf_DATA) \
69-
$(dist_hyphen_DATA) $(dist_man1_MANS) $(dist_template_DATA) \
97+
$(dist_dapsmake_DATA) $(dist_doc_DATA) $(dist_emacssite_DATA) \
98+
$(dist_fopconf_DATA) $(dist_hyphen_DATA) $(dist_template_DATA) \
7099
$(dist_ttfonts_DATA) $(dist_xepconf_DATA) \
71100
$(dist_xsltcommon_DATA) $(dist_xsltcontrib_DATA) \
72101
$(dist_xsltdesktop_DATA) $(dist_xsltepub_DATA) \
73102
$(dist_xsltindex_DATA) $(dist_xsltmallard_DATA) \
74103
$(dist_xsltman_DATA) $(dist_xsltprofiling_DATA) \
75-
$(dist_xsltyelp_DATA) $(srcdir)/Makefile.am \
76-
$(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \
77-
ChangeLog INSTALL NEWS TODO install-sh missing
104+
$(dist_xsltyelp_DATA) AUTHORS COPYING ChangeLog INSTALL NEWS \
105+
README TODO install-sh missing
78106
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
79107
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_python_module.m4 \
80108
$(top_srcdir)/configure.ac
@@ -125,15 +153,28 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dapslibexecdir)" \
125153
"$(DESTDIR)$(xsltmandir)" "$(DESTDIR)$(xsltprofilingdir)" \
126154
"$(DESTDIR)$(xsltyelpdir)" "$(DESTDIR)$(dapsconfdir)"
127155
SCRIPTS = $(dist_bin_SCRIPTS) $(dist_dapslibexec_SCRIPTS)
156+
AM_V_P = $(am__v_P_@AM_V@)
157+
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
158+
am__v_P_0 = false
159+
am__v_P_1 = :
160+
AM_V_GEN = $(am__v_GEN_@AM_V@)
161+
am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
162+
am__v_GEN_0 = @echo " GEN " $@;
163+
am__v_GEN_1 =
164+
AM_V_at = $(am__v_at_@AM_V@)
165+
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
166+
am__v_at_0 = @
167+
am__v_at_1 =
128168
SOURCES =
129169
DIST_SOURCES =
130-
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
131-
html-recursive info-recursive install-data-recursive \
132-
install-dvi-recursive install-exec-recursive \
133-
install-html-recursive install-info-recursive \
134-
install-pdf-recursive install-ps-recursive install-recursive \
135-
installcheck-recursive installdirs-recursive pdf-recursive \
136-
ps-recursive uninstall-recursive
170+
RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
171+
ctags-recursive dvi-recursive html-recursive info-recursive \
172+
install-data-recursive install-dvi-recursive \
173+
install-exec-recursive install-html-recursive \
174+
install-info-recursive install-pdf-recursive \
175+
install-ps-recursive install-recursive installcheck-recursive \
176+
installdirs-recursive pdf-recursive ps-recursive \
177+
tags-recursive uninstall-recursive
137178
am__can_run_installinfo = \
138179
case $$AM_UPDATE_INFO_DIR in \
139180
n|no|NO) false;; \
@@ -154,9 +195,29 @@ DATA = $(dist_catalog_DATA) $(dist_dapsconf_DATA) $(dist_dapslib_DATA) \
154195
$(dist_xsltyelp_DATA) $(nodist_dapsconf_DATA)
155196
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
156197
distclean-recursive maintainer-clean-recursive
157-
AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
158-
$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
198+
am__recursive_targets = \
199+
$(RECURSIVE_TARGETS) \
200+
$(RECURSIVE_CLEAN_TARGETS) \
201+
$(am__extra_recursive_targets)
202+
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
159203
cscope distdir dist dist-all distcheck
204+
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
205+
# Read a list of newline-separated strings from the standard input,
206+
# and print each of them once, without duplicates. Input order is
207+
# *not* preserved.
208+
am__uniquify_input = $(AWK) '\
209+
BEGIN { nonempty = 0; } \
210+
{ items[$$0] = 1; nonempty = 1; } \
211+
END { if (nonempty) { for (i in items) print i; }; } \
212+
'
213+
# Make sure the list of sources is unique. This is necessary because,
214+
# e.g., the same source file might be shared among _SOURCES variables
215+
# for different programs/libraries.
216+
am__define_uniq_tagged_files = \
217+
list='$(am__tagged_files)'; \
218+
unique=`for i in $$list; do \
219+
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
220+
done | $(am__uniquify_input)`
160221
ETAGS = etags
161222
CTAGS = ctags
162223
CSCOPE = cscope
@@ -205,6 +266,7 @@ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
205266
distcleancheck_listfiles = find . -type f -print
206267
ACLOCAL = @ACLOCAL@
207268
AMTAR = @AMTAR@
269+
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
208270
AUTOCONF = @AUTOCONF@
209271
AUTOHEADER = @AUTOHEADER@
210272
AUTOMAKE = @AUTOMAKE@
@@ -1032,17 +1094,20 @@ uninstall-nodist_dapsconfDATA:
10321094
# (1) if the variable is set in 'config.status', edit 'config.status'
10331095
# (which will cause the Makefiles to be regenerated when you run 'make');
10341096
# (2) otherwise, pass the desired values on the 'make' command line.
1035-
$(RECURSIVE_TARGETS):
1036-
@fail= failcom='exit 1'; \
1037-
for f in x $$MAKEFLAGS; do \
1038-
case $$f in \
1039-
*=* | --[!k]*);; \
1040-
*k*) failcom='fail=yes';; \
1041-
esac; \
1042-
done; \
1097+
$(am__recursive_targets):
1098+
@fail=; \
1099+
if $(am__make_keepgoing); then \
1100+
failcom='fail=yes'; \
1101+
else \
1102+
failcom='exit 1'; \
1103+
fi; \
10431104
dot_seen=no; \
10441105
target=`echo $@ | sed s/-recursive//`; \
1045-
list='$(SUBDIRS)'; for subdir in $$list; do \
1106+
case "$@" in \
1107+
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
1108+
*) list='$(SUBDIRS)' ;; \
1109+
esac; \
1110+
for subdir in $$list; do \
10461111
echo "Making $$target in $$subdir"; \
10471112
if test "$$subdir" = "."; then \
10481113
dot_seen=yes; \
@@ -1057,61 +1122,12 @@ $(RECURSIVE_TARGETS):
10571122
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
10581123
fi; test -z "$$fail"
10591124

1060-
$(RECURSIVE_CLEAN_TARGETS):
1061-
@fail= failcom='exit 1'; \
1062-
for f in x $$MAKEFLAGS; do \
1063-
case $$f in \
1064-
*=* | --[!k]*);; \
1065-
*k*) failcom='fail=yes';; \
1066-
esac; \
1067-
done; \
1068-
dot_seen=no; \
1069-
case "$@" in \
1070-
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
1071-
*) list='$(SUBDIRS)' ;; \
1072-
esac; \
1073-
rev=''; for subdir in $$list; do \
1074-
if test "$$subdir" = "."; then :; else \
1075-
rev="$$subdir $$rev"; \
1076-
fi; \
1077-
done; \
1078-
rev="$$rev ."; \
1079-
target=`echo $@ | sed s/-recursive//`; \
1080-
for subdir in $$rev; do \
1081-
echo "Making $$target in $$subdir"; \
1082-
if test "$$subdir" = "."; then \
1083-
local_target="$$target-am"; \
1084-
else \
1085-
local_target="$$target"; \
1086-
fi; \
1087-
($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
1088-
|| eval $$failcom; \
1089-
done && test -z "$$fail"
1090-
tags-recursive:
1091-
list='$(SUBDIRS)'; for subdir in $$list; do \
1092-
test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
1093-
done
1094-
ctags-recursive:
1095-
list='$(SUBDIRS)'; for subdir in $$list; do \
1096-
test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
1097-
done
1098-
cscopelist-recursive:
1099-
list='$(SUBDIRS)'; for subdir in $$list; do \
1100-
test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
1101-
done
1125+
ID: $(am__tagged_files)
1126+
$(am__define_uniq_tagged_files); mkid -fID $$unique
1127+
tags: tags-recursive
1128+
TAGS: tags
11021129

1103-
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
1104-
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
1105-
unique=`for i in $$list; do \
1106-
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1107-
done | \
1108-
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
1109-
END { if (nonempty) { for (i in files) print i; }; }'`; \
1110-
mkid -fID $$unique
1111-
tags: TAGS
1112-
1113-
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
1114-
$(TAGS_FILES) $(LISP)
1130+
tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
11151131
set x; \
11161132
here=`pwd`; \
11171133
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -1127,12 +1143,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
11271143
set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
11281144
fi; \
11291145
done; \
1130-
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
1131-
unique=`for i in $$list; do \
1132-
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1133-
done | \
1134-
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
1135-
END { if (nonempty) { for (i in files) print i; }; }'`; \
1146+
$(am__define_uniq_tagged_files); \
11361147
shift; \
11371148
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
11381149
test -n "$$unique" || unique=$$empty_fix; \
@@ -1144,15 +1155,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
11441155
$$unique; \
11451156
fi; \
11461157
fi
1147-
ctags: CTAGS
1148-
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
1149-
$(TAGS_FILES) $(LISP)
1150-
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
1151-
unique=`for i in $$list; do \
1152-
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1153-
done | \
1154-
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
1155-
END { if (nonempty) { for (i in files) print i; }; }'`; \
1158+
ctags: ctags-recursive
1159+
1160+
CTAGS: ctags
1161+
ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
1162+
$(am__define_uniq_tagged_files); \
11561163
test -z "$(CTAGS_ARGS)$$unique" \
11571164
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
11581165
$$unique
@@ -1161,18 +1168,16 @@ GTAGS:
11611168
here=`$(am__cd) $(top_builddir) && pwd` \
11621169
&& $(am__cd) $(top_srcdir) \
11631170
&& gtags -i $(GTAGS_ARGS) "$$here"
1164-
11651171
cscope: cscope.files
11661172
test ! -s cscope.files \
11671173
|| $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
1168-
11691174
clean-cscope:
11701175
-rm -f cscope.files
1176+
cscope.files: clean-cscope cscopelist
1177+
cscopelist: cscopelist-recursive
11711178

1172-
cscope.files: clean-cscope cscopelist-recursive cscopelist
1173-
1174-
cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
1175-
list='$(SOURCES) $(HEADERS) $(LISP)'; \
1179+
cscopelist-am: $(am__tagged_files)
1180+
list='$(am__tagged_files)'; \
11761181
case "$(srcdir)" in \
11771182
[\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
11781183
*) sdir=$(subdir)/$(srcdir) ;; \
@@ -1190,19 +1195,6 @@ distclean-tags:
11901195
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
11911196

11921197
distdir: $(DISTFILES)
1193-
@list='$(MANS)'; if test -n "$$list"; then \
1194-
list=`for p in $$list; do \
1195-
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
1196-
if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
1197-
if test -n "$$list" && \
1198-
grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
1199-
echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \
1200-
grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \
1201-
echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \
1202-
echo " typically 'make maintainer-clean' will remove them" >&2; \
1203-
exit 1; \
1204-
else :; fi; \
1205-
else :; fi
12061198
$(am__remove_distdir)
12071199
test -d "$(distdir)" || mkdir "$(distdir)"
12081200
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -1318,9 +1310,9 @@ distcheck: dist
13181310
*.zip*) \
13191311
unzip $(distdir).zip ;;\
13201312
esac
1321-
chmod -R a-w $(distdir); chmod a+w $(distdir)
1322-
mkdir $(distdir)/_build
1323-
mkdir $(distdir)/_inst
1313+
chmod -R a-w $(distdir)
1314+
chmod u+w $(distdir)
1315+
mkdir $(distdir)/_build $(distdir)/_inst
13241316
chmod a-w $(distdir)
13251317
test -d $(distdir)/_build || exit 0; \
13261318
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
@@ -1515,14 +1507,11 @@ uninstall-am: uninstall-dist_binSCRIPTS uninstall-dist_catalogDATA \
15151507

15161508
uninstall-man: uninstall-man1
15171509

1518-
.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \
1519-
cscopelist-recursive ctags-recursive install-am install-strip \
1520-
tags-recursive
1510+
.MAKE: $(am__recursive_targets) install-am install-strip
15211511

1522-
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
1523-
all all-am all-local am--refresh check check-am clean \
1524-
clean-cscope clean-generic clean-local cscope cscopelist \
1525-
cscopelist-recursive ctags ctags-recursive dist dist-all \
1512+
.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \
1513+
am--refresh check check-am clean clean-cscope clean-generic \
1514+
clean-local cscope cscopelist-am ctags ctags-am dist dist-all \
15261515
dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ dist-xz \
15271516
dist-zip distcheck distclean distclean-generic distclean-tags \
15281517
distcleancheck distdir distuninstallcheck dvi dvi-am html \
@@ -1545,7 +1534,7 @@ uninstall-man: uninstall-man1
15451534
install-ps install-ps-am install-strip installcheck \
15461535
installcheck-am installdirs installdirs-am maintainer-clean \
15471536
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
1548-
pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
1537+
pdf-am ps ps-am tags tags-am uninstall uninstall-am \
15491538
uninstall-dist_binSCRIPTS uninstall-dist_catalogDATA \
15501539
uninstall-dist_dapsconfDATA uninstall-dist_dapslibDATA \
15511540
uninstall-dist_dapslibexecSCRIPTS uninstall-dist_dapsmakeDATA \

0 commit comments

Comments
 (0)