Skip to content

Commit 137f0a7

Browse files
Serge Lamikhov-CenterSerge Lamikhov-Center
Serge Lamikhov-Center
authored and
Serge Lamikhov-Center
committedMay 16, 2013
Release 2.2
·
Release_3.2Release_2.2
1 parent ed600e6 commit 137f0a7

File tree

9 files changed

+130
-277
lines changed

9 files changed

+130
-277
lines changed
 

‎Makefile.in

+11-33
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Makefile.in generated by automake 1.11.6 from Makefile.am.
1+
# Makefile.in generated by automake 1.11.3 from Makefile.am.
22
# @configure_input@
33

44
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,23 +16,6 @@
1616
@SET_MAKE@
1717

1818
VPATH = @srcdir@
19-
am__make_dryrun = \
20-
{ \
21-
am__dry=no; \
22-
case $$MAKEFLAGS in \
23-
*\\[\ \ ]*) \
24-
echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
25-
| grep '^AM OK$$' >/dev/null || am__dry=yes;; \
26-
*) \
27-
for am__flg in $$MAKEFLAGS; do \
28-
case $$am__flg in \
29-
*=*|--*) ;; \
30-
*n*) am__dry=yes; break;; \
31-
esac; \
32-
done;; \
33-
esac; \
34-
test $$am__dry = yes; \
35-
}
3619
pkgdatadir = $(datadir)/@PACKAGE@
3720
pkgincludedir = $(includedir)/@PACKAGE@
3821
pkglibdir = $(libdir)/@PACKAGE@
@@ -72,11 +55,6 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
7255
install-pdf-recursive install-ps-recursive install-recursive \
7356
installcheck-recursive installdirs-recursive pdf-recursive \
7457
ps-recursive uninstall-recursive
75-
am__can_run_installinfo = \
76-
case $$AM_UPDATE_INFO_DIR in \
77-
n|no|NO) false;; \
78-
*) (install-info --version) >/dev/null 2>&1;; \
79-
esac
8058
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
8159
am__vpath_adj = case $$p in \
8260
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -285,18 +263,15 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
285263
$(am__aclocal_m4_deps):
286264
install-nobase_includeHEADERS: $(nobase_include_HEADERS)
287265
@$(NORMAL_INSTALL)
266+
test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
288267
@list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \
289-
if test -n "$$list"; then \
290-
echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
291-
$(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
292-
fi; \
293268
$(am__nobase_list) | while read dir files; do \
294269
xfiles=; for file in $$files; do \
295270
if test -f "$$file"; then xfiles="$$xfiles $$file"; \
296271
else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
297272
test -z "$$xfiles" || { \
298273
test "x$$dir" = x. || { \
299-
echo " $(MKDIR_P) '$(DESTDIR)$(includedir)/$$dir'"; \
274+
echo "$(MKDIR_P) '$(DESTDIR)$(includedir)/$$dir'"; \
300275
$(MKDIR_P) "$(DESTDIR)$(includedir)/$$dir"; }; \
301276
echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(includedir)/$$dir'"; \
302277
$(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(includedir)/$$dir" || exit $$?; }; \
@@ -477,10 +452,13 @@ distdir: $(DISTFILES)
477452
done
478453
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
479454
if test "$$subdir" = .; then :; else \
480-
$(am__make_dryrun) \
481-
|| test -d "$(distdir)/$$subdir" \
482-
|| $(MKDIR_P) "$(distdir)/$$subdir" \
483-
|| exit 1; \
455+
test -d "$(distdir)/$$subdir" \
456+
|| $(MKDIR_P) "$(distdir)/$$subdir" \
457+
|| exit 1; \
458+
fi; \
459+
done
460+
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
461+
if test "$$subdir" = .; then :; else \
484462
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
485463
$(am__relativize); \
486464
new_distdir=$$reldir; \
@@ -569,7 +547,7 @@ distcheck: dist
569547
*.zip*) \
570548
unzip $(distdir).zip ;;\
571549
esac
572-
chmod -R a-w $(distdir); chmod u+w $(distdir)
550+
chmod -R a-w $(distdir); chmod a+w $(distdir)
573551
mkdir $(distdir)/_build
574552
mkdir $(distdir)/_inst
575553
chmod a-w $(distdir)

‎aclocal.m4

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
1+
# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
22

33
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
44
# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
@@ -14,8 +14,8 @@
1414

1515
m4_ifndef([AC_AUTOCONF_VERSION],
1616
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
17-
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
18-
[m4_warning([this file was generated for autoconf 2.69.
17+
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
18+
[m4_warning([this file was generated for autoconf 2.68.
1919
You have another version of autoconf. It may work, but is not guaranteed to.
2020
If you have problems, you may need to regenerate the build system entirely.
2121
To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -38,7 +38,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
3838
[am__api_version='1.11'
3939
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
4040
dnl require some minimum version. Point them to the right macro.
41-
m4_if([$1], [1.11.6], [],
41+
m4_if([$1], [1.11.3], [],
4242
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
4343
])
4444

@@ -54,7 +54,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
5454
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
5555
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
5656
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
57-
[AM_AUTOMAKE_VERSION([1.11.6])dnl
57+
[AM_AUTOMAKE_VERSION([1.11.3])dnl
5858
m4_ifndef([AC_AUTOCONF_VERSION],
5959
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
6060
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

‎configure

+97-103
Large diffs are not rendered by default.

‎configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
AC_INIT([ELFIO], [2.1])
1+
AC_INIT([ELFIO], [2.2])
22
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
33
AC_PROG_CXX
44
AC_CONFIG_FILES([

‎examples/Makefile.in

+8-27
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Makefile.in generated by automake 1.11.6 from Makefile.am.
1+
# Makefile.in generated by automake 1.11.3 from Makefile.am.
22
# @configure_input@
33

44
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15,23 +15,6 @@
1515

1616
@SET_MAKE@
1717
VPATH = @srcdir@
18-
am__make_dryrun = \
19-
{ \
20-
am__dry=no; \
21-
case $$MAKEFLAGS in \
22-
*\\[\ \ ]*) \
23-
echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
24-
| grep '^AM OK$$' >/dev/null || am__dry=yes;; \
25-
*) \
26-
for am__flg in $$MAKEFLAGS; do \
27-
case $$am__flg in \
28-
*=*|--*) ;; \
29-
*n*) am__dry=yes; break;; \
30-
esac; \
31-
done;; \
32-
esac; \
33-
test $$am__dry = yes; \
34-
}
3518
pkgdatadir = $(datadir)/@PACKAGE@
3619
pkgincludedir = $(includedir)/@PACKAGE@
3720
pkglibdir = $(libdir)/@PACKAGE@
@@ -66,11 +49,6 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
6649
install-pdf-recursive install-ps-recursive install-recursive \
6750
installcheck-recursive installdirs-recursive pdf-recursive \
6851
ps-recursive uninstall-recursive
69-
am__can_run_installinfo = \
70-
case $$AM_UPDATE_INFO_DIR in \
71-
n|no|NO) false;; \
72-
*) (install-info --version) >/dev/null 2>&1;; \
73-
esac
7452
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
7553
distclean-recursive maintainer-clean-recursive
7654
AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -390,10 +368,13 @@ distdir: $(DISTFILES)
390368
done
391369
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
392370
if test "$$subdir" = .; then :; else \
393-
$(am__make_dryrun) \
394-
|| test -d "$(distdir)/$$subdir" \
395-
|| $(MKDIR_P) "$(distdir)/$$subdir" \
396-
|| exit 1; \
371+
test -d "$(distdir)/$$subdir" \
372+
|| $(MKDIR_P) "$(distdir)/$$subdir" \
373+
|| exit 1; \
374+
fi; \
375+
done
376+
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
377+
if test "$$subdir" = .; then :; else \
397378
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
398379
$(am__relativize); \
399380
new_distdir=$$reldir; \

‎examples/elfdump/Makefile.in

+2-27
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Makefile.in generated by automake 1.11.6 from Makefile.am.
1+
# Makefile.in generated by automake 1.11.3 from Makefile.am.
22
# @configure_input@
33

44
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,23 +16,6 @@
1616
@SET_MAKE@
1717

1818
VPATH = @srcdir@
19-
am__make_dryrun = \
20-
{ \
21-
am__dry=no; \
22-
case $$MAKEFLAGS in \
23-
*\\[\ \ ]*) \
24-
echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
25-
| grep '^AM OK$$' >/dev/null || am__dry=yes;; \
26-
*) \
27-
for am__flg in $$MAKEFLAGS; do \
28-
case $$am__flg in \
29-
*=*|--*) ;; \
30-
*n*) am__dry=yes; break;; \
31-
esac; \
32-
done;; \
33-
esac; \
34-
test $$am__dry = yes; \
35-
}
3619
pkgdatadir = $(datadir)/@PACKAGE@
3720
pkgincludedir = $(includedir)/@PACKAGE@
3821
pkglibdir = $(libdir)/@PACKAGE@
@@ -75,11 +58,6 @@ CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
7558
-o $@
7659
SOURCES = $(elfdump_SOURCES)
7760
DIST_SOURCES = $(elfdump_SOURCES)
78-
am__can_run_installinfo = \
79-
case $$AM_UPDATE_INFO_DIR in \
80-
n|no|NO) false;; \
81-
*) (install-info --version) >/dev/null 2>&1;; \
82-
esac
8361
ETAGS = etags
8462
CTAGS = ctags
8563
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -205,11 +183,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
205183
$(am__aclocal_m4_deps):
206184
install-binPROGRAMS: $(bin_PROGRAMS)
207185
@$(NORMAL_INSTALL)
186+
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
208187
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
209-
if test -n "$$list"; then \
210-
echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
211-
$(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
212-
fi; \
213188
for p in $$list; do echo "$$p $$p"; done | \
214189
sed 's/$(EXEEXT)$$//' | \
215190
while read p p1; do if test -f $$p; \

‎examples/tutorial/Makefile.in

+2-27
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Makefile.in generated by automake 1.11.6 from Makefile.am.
1+
# Makefile.in generated by automake 1.11.3 from Makefile.am.
22
# @configure_input@
33

44
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,23 +16,6 @@
1616
@SET_MAKE@
1717

1818
VPATH = @srcdir@
19-
am__make_dryrun = \
20-
{ \
21-
am__dry=no; \
22-
case $$MAKEFLAGS in \
23-
*\\[\ \ ]*) \
24-
echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
25-
| grep '^AM OK$$' >/dev/null || am__dry=yes;; \
26-
*) \
27-
for am__flg in $$MAKEFLAGS; do \
28-
case $$am__flg in \
29-
*=*|--*) ;; \
30-
*n*) am__dry=yes; break;; \
31-
esac; \
32-
done;; \
33-
esac; \
34-
test $$am__dry = yes; \
35-
}
3619
pkgdatadir = $(datadir)/@PACKAGE@
3720
pkgincludedir = $(includedir)/@PACKAGE@
3821
pkglibdir = $(libdir)/@PACKAGE@
@@ -75,11 +58,6 @@ CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
7558
-o $@
7659
SOURCES = $(tutorial_SOURCES)
7760
DIST_SOURCES = $(tutorial_SOURCES)
78-
am__can_run_installinfo = \
79-
case $$AM_UPDATE_INFO_DIR in \
80-
n|no|NO) false;; \
81-
*) (install-info --version) >/dev/null 2>&1;; \
82-
esac
8361
ETAGS = etags
8462
CTAGS = ctags
8563
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -204,11 +182,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
204182
$(am__aclocal_m4_deps):
205183
install-binPROGRAMS: $(bin_PROGRAMS)
206184
@$(NORMAL_INSTALL)
185+
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
207186
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
208-
if test -n "$$list"; then \
209-
echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
210-
$(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
211-
fi; \
212187
for p in $$list; do echo "$$p $$p"; done | \
213188
sed 's/$(EXEEXT)$$//' | \
214189
while read p p1; do if test -f $$p; \

‎examples/write_obj/Makefile.in

+2-27
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Makefile.in generated by automake 1.11.6 from Makefile.am.
1+
# Makefile.in generated by automake 1.11.3 from Makefile.am.
22
# @configure_input@
33

44
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,23 +16,6 @@
1616
@SET_MAKE@
1717

1818
VPATH = @srcdir@
19-
am__make_dryrun = \
20-
{ \
21-
am__dry=no; \
22-
case $$MAKEFLAGS in \
23-
*\\[\ \ ]*) \
24-
echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
25-
| grep '^AM OK$$' >/dev/null || am__dry=yes;; \
26-
*) \
27-
for am__flg in $$MAKEFLAGS; do \
28-
case $$am__flg in \
29-
*=*|--*) ;; \
30-
*n*) am__dry=yes; break;; \
31-
esac; \
32-
done;; \
33-
esac; \
34-
test $$am__dry = yes; \
35-
}
3619
pkgdatadir = $(datadir)/@PACKAGE@
3720
pkgincludedir = $(includedir)/@PACKAGE@
3821
pkglibdir = $(libdir)/@PACKAGE@
@@ -75,11 +58,6 @@ CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
7558
-o $@
7659
SOURCES = $(write_obj_SOURCES)
7760
DIST_SOURCES = $(write_obj_SOURCES)
78-
am__can_run_installinfo = \
79-
case $$AM_UPDATE_INFO_DIR in \
80-
n|no|NO) false;; \
81-
*) (install-info --version) >/dev/null 2>&1;; \
82-
esac
8361
ETAGS = etags
8462
CTAGS = ctags
8563
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -204,11 +182,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
204182
$(am__aclocal_m4_deps):
205183
install-binPROGRAMS: $(bin_PROGRAMS)
206184
@$(NORMAL_INSTALL)
185+
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
207186
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
208-
if test -n "$$list"; then \
209-
echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
210-
$(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
211-
fi; \
212187
for p in $$list; do echo "$$p $$p"; done | \
213188
sed 's/$(EXEEXT)$$//' | \
214189
while read p p1; do if test -f $$p; \

‎examples/writer/Makefile.in

+2-27
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Makefile.in generated by automake 1.11.6 from Makefile.am.
1+
# Makefile.in generated by automake 1.11.3 from Makefile.am.
22
# @configure_input@
33

44
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,23 +16,6 @@
1616
@SET_MAKE@
1717

1818
VPATH = @srcdir@
19-
am__make_dryrun = \
20-
{ \
21-
am__dry=no; \
22-
case $$MAKEFLAGS in \
23-
*\\[\ \ ]*) \
24-
echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
25-
| grep '^AM OK$$' >/dev/null || am__dry=yes;; \
26-
*) \
27-
for am__flg in $$MAKEFLAGS; do \
28-
case $$am__flg in \
29-
*=*|--*) ;; \
30-
*n*) am__dry=yes; break;; \
31-
esac; \
32-
done;; \
33-
esac; \
34-
test $$am__dry = yes; \
35-
}
3619
pkgdatadir = $(datadir)/@PACKAGE@
3720
pkgincludedir = $(includedir)/@PACKAGE@
3821
pkglibdir = $(libdir)/@PACKAGE@
@@ -75,11 +58,6 @@ CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
7558
-o $@
7659
SOURCES = $(writer_SOURCES)
7760
DIST_SOURCES = $(writer_SOURCES)
78-
am__can_run_installinfo = \
79-
case $$AM_UPDATE_INFO_DIR in \
80-
n|no|NO) false;; \
81-
*) (install-info --version) >/dev/null 2>&1;; \
82-
esac
8361
ETAGS = etags
8462
CTAGS = ctags
8563
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -204,11 +182,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
204182
$(am__aclocal_m4_deps):
205183
install-binPROGRAMS: $(bin_PROGRAMS)
206184
@$(NORMAL_INSTALL)
185+
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
207186
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
208-
if test -n "$$list"; then \
209-
echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
210-
$(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
211-
fi; \
212187
for p in $$list; do echo "$$p $$p"; done | \
213188
sed 's/$(EXEEXT)$$//' | \
214189
while read p p1; do if test -f $$p; \

0 commit comments

Comments
 (0)
Please sign in to comment.