Codebase list readosm / 21dee5c
Merge tag 'upstream/1.0.0e' Upstream version 1.0.0e Bas Couwenberg 8 years ago
9 changed file(s) with 148 addition(s) and 92 deletion(s). Raw diff Collapse all Expand all
1212 lcov --directory src --capture --initial --output-file readosm_cov.info
1313
1414 coverage::
15 lcov --directory src --output-file readosm_cov.info --capture
16 genhtml -o covresults readosm_cov.info
15 lcov --rc lcov_branch_coverage=1 --directory src --output-file readosm_cov.info --capture
16 genhtml --rc lcov_branch_coverage=1 -o covresults readosm_cov.info
1717
1818 MOSTLYCLEANFILES = readosm_cov.info
0 # Makefile.in generated by automake 1.14.1 from Makefile.am.
0 # Makefile.in generated by automake 1.15 from Makefile.am.
11 # @configure_input@
22
3 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
3 # Copyright (C) 1994-2014 Free Software Foundation, Inc.
44
55 # This Makefile.in is free software; the Free Software Foundation
66 # gives unlimited permission to copy and/or distribute it,
1414 @SET_MAKE@
1515
1616 VPATH = @srcdir@
17 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
17 am__is_gnu_make = { \
18 if test -z '$(MAKELEVEL)'; then \
19 false; \
20 elif test -n '$(MAKE_HOST)'; then \
21 true; \
22 elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
23 true; \
24 else \
25 false; \
26 fi; \
27 }
1828 am__make_running_with_option = \
1929 case $${target_option-} in \
2030 ?) ;; \
7888 build_triplet = @build@
7989 host_triplet = @host@
8090 subdir = .
81 DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
82 $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
83 $(top_srcdir)/configure $(am__configure_deps) \
84 $(srcdir)/config.h.in $(srcdir)/Doxyfile.in \
85 $(srcdir)/readosm.pc.in COPYING compile config.guess \
86 config.sub depcomp install-sh missing ltmain.sh
8791 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
8892 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
8993 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
9195 $(top_srcdir)/configure.ac
9296 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9397 $(ACLOCAL_M4)
98 DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
99 $(am__configure_deps) $(am__DIST_COMMON)
94100 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
95101 configure.lineno config.status.lineno
96102 mkinstalldirs = $(install_sh) -d
183189 CTAGS = ctags
184190 CSCOPE = cscope
185191 DIST_SUBDIRS = $(SUBDIRS)
192 am__DIST_COMMON = $(srcdir)/Doxyfile.in $(srcdir)/Makefile.in \
193 $(srcdir)/config.h.in $(srcdir)/readosm.pc.in AUTHORS COPYING \
194 ChangeLog INSTALL NEWS README compile config.guess config.sub \
195 depcomp install-sh ltmain.sh missing
186196 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
187197 distdir = $(PACKAGE)-$(VERSION)
188198 top_distdir = $(distdir)
372382 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
373383 $(am__cd) $(top_srcdir) && \
374384 $(AUTOMAKE) --gnu Makefile
375 .PRECIOUS: Makefile
376385 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
377386 @case '$?' in \
378387 *config.status*) \
628637 $(am__post_remove_distdir)
629638
630639 dist-tarZ: distdir
631 @echo WARNING: "Support for shar distribution archives is" \
632 "deprecated." >&2
640 @echo WARNING: "Support for distribution archives compressed with" \
641 "legacy program 'compress' is deprecated." >&2
633642 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
634643 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
635644 $(am__post_remove_distdir)
636645
637646 dist-shar: distdir
638 @echo WARNING: "Support for distribution archives compressed with" \
639 "legacy program 'compress' is deprecated." >&2
647 @echo WARNING: "Support for shar distribution archives is" \
648 "deprecated." >&2
640649 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
641650 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
642651 $(am__post_remove_distdir)
671680 esac
672681 chmod -R a-w $(distdir)
673682 chmod u+w $(distdir)
674 mkdir $(distdir)/_build $(distdir)/_inst
683 mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
675684 chmod a-w $(distdir)
676685 test -d $(distdir)/_build || exit 0; \
677686 dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
678687 && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
679688 && am__cwd=`pwd` \
680 && $(am__cd) $(distdir)/_build \
681 && ../configure \
689 && $(am__cd) $(distdir)/_build/sub \
690 && ../../configure \
682691 $(AM_DISTCHECK_CONFIGURE_FLAGS) \
683692 $(DISTCHECK_CONFIGURE_FLAGS) \
684 --srcdir=.. --prefix="$$dc_install_base" \
693 --srcdir=../.. --prefix="$$dc_install_base" \
685694 && $(MAKE) $(AM_MAKEFLAGS) \
686695 && $(MAKE) $(AM_MAKEFLAGS) dvi \
687696 && $(MAKE) $(AM_MAKEFLAGS) check \
862871 mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
863872 uninstall-am uninstall-pkgconfigDATA
864873
874 .PRECIOUS: Makefile
875
865876
866877 coverage-init:
867878 lcov --directory src --capture --initial --output-file readosm_cov.info
868879
869880 coverage::
870 lcov --directory src --output-file readosm_cov.info --capture
871 genhtml -o covresults readosm_cov.info
881 lcov --rc lcov_branch_coverage=1 --directory src --output-file readosm_cov.info --capture
882 genhtml --rc lcov_branch_coverage=1 -o covresults readosm_cov.info
872883
873884 # Tell versions [3.59,3.63) of GNU make to not export all variables.
874885 # Otherwise a system limit (for SysV at least) may be exceeded.
0 # generated automatically by aclocal 1.14.1 -*- Autoconf -*-
1
2 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
0 # generated automatically by aclocal 1.15 -*- Autoconf -*-
1
2 # Copyright (C) 1996-2014 Free Software Foundation, Inc.
33
44 # This file is free software; the Free Software Foundation
55 # gives unlimited permission to copy and/or distribute it,
1919 If you have problems, you may need to regenerate the build system entirely.
2020 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
2121
22 # Copyright (C) 2002-2013 Free Software Foundation, Inc.
22 # Copyright (C) 2002-2014 Free Software Foundation, Inc.
2323 #
2424 # This file is free software; the Free Software Foundation
2525 # gives unlimited permission to copy and/or distribute it,
3131 # generated from the m4 files accompanying Automake X.Y.
3232 # (This private macro should not be called outside this file.)
3333 AC_DEFUN([AM_AUTOMAKE_VERSION],
34 [am__api_version='1.14'
34 [am__api_version='1.15'
3535 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
3636 dnl require some minimum version. Point them to the right macro.
37 m4_if([$1], [1.14.1], [],
37 m4_if([$1], [1.15], [],
3838 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
3939 ])
4040
5050 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
5151 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
5252 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
53 [AM_AUTOMAKE_VERSION([1.14.1])dnl
53 [AM_AUTOMAKE_VERSION([1.15])dnl
5454 m4_ifndef([AC_AUTOCONF_VERSION],
5555 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
5656 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
5757
5858 # AM_AUX_DIR_EXPAND -*- Autoconf -*-
5959
60 # Copyright (C) 2001-2013 Free Software Foundation, Inc.
60 # Copyright (C) 2001-2014 Free Software Foundation, Inc.
6161 #
6262 # This file is free software; the Free Software Foundation
6363 # gives unlimited permission to copy and/or distribute it,
102102 # configured tree to be moved without reconfiguration.
103103
104104 AC_DEFUN([AM_AUX_DIR_EXPAND],
105 [dnl Rely on autoconf to set up CDPATH properly.
106 AC_PREREQ([2.50])dnl
107 # expand $ac_aux_dir to an absolute path
108 am_aux_dir=`cd $ac_aux_dir && pwd`
105 [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
106 # Expand $ac_aux_dir to an absolute path.
107 am_aux_dir=`cd "$ac_aux_dir" && pwd`
109108 ])
110109
111110 # AM_CONDITIONAL -*- Autoconf -*-
112111
113 # Copyright (C) 1997-2013 Free Software Foundation, Inc.
112 # Copyright (C) 1997-2014 Free Software Foundation, Inc.
114113 #
115114 # This file is free software; the Free Software Foundation
116115 # gives unlimited permission to copy and/or distribute it,
141140 Usually this means the macro was only invoked conditionally.]])
142141 fi])])
143142
144 # Copyright (C) 1999-2013 Free Software Foundation, Inc.
143 # Copyright (C) 1999-2014 Free Software Foundation, Inc.
145144 #
146145 # This file is free software; the Free Software Foundation
147146 # gives unlimited permission to copy and/or distribute it,
332331
333332 # Generate code to set up dependency tracking. -*- Autoconf -*-
334333
335 # Copyright (C) 1999-2013 Free Software Foundation, Inc.
334 # Copyright (C) 1999-2014 Free Software Foundation, Inc.
336335 #
337336 # This file is free software; the Free Software Foundation
338337 # gives unlimited permission to copy and/or distribute it,
408407
409408 # Do all the work for Automake. -*- Autoconf -*-
410409
411 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
410 # Copyright (C) 1996-2014 Free Software Foundation, Inc.
412411 #
413412 # This file is free software; the Free Software Foundation
414413 # gives unlimited permission to copy and/or distribute it,
498497 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
499498 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
500499 AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
501 # We need awk for the "check" target. The system "awk" is bad on
502 # some platforms.
500 # We need awk for the "check" target (and possibly the TAP driver). The
501 # system "awk" is bad on some platforms.
503502 AC_REQUIRE([AC_PROG_AWK])dnl
504503 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
505504 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
572571 END
573572 AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
574573 fi
575 fi])
574 fi
575 dnl The trailing newline in this macro's definition is deliberate, for
576 dnl backward compatibility and to allow trailing 'dnl'-style comments
577 dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
578 ])
576579
577580 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
578581 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
601604 done
602605 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
603606
604 # Copyright (C) 2001-2013 Free Software Foundation, Inc.
607 # Copyright (C) 2001-2014 Free Software Foundation, Inc.
605608 #
606609 # This file is free software; the Free Software Foundation
607610 # gives unlimited permission to copy and/or distribute it,
612615 # Define $install_sh.
613616 AC_DEFUN([AM_PROG_INSTALL_SH],
614617 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
615 if test x"${install_sh}" != xset; then
618 if test x"${install_sh+set}" != xset; then
616619 case $am_aux_dir in
617620 *\ * | *\ *)
618621 install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
622625 fi
623626 AC_SUBST([install_sh])])
624627
625 # Copyright (C) 2003-2013 Free Software Foundation, Inc.
628 # Copyright (C) 2003-2014 Free Software Foundation, Inc.
626629 #
627630 # This file is free software; the Free Software Foundation
628631 # gives unlimited permission to copy and/or distribute it,
644647 # Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
645648 # From Jim Meyering
646649
647 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
650 # Copyright (C) 1996-2014 Free Software Foundation, Inc.
648651 #
649652 # This file is free software; the Free Software Foundation
650653 # gives unlimited permission to copy and/or distribute it,
679682
680683 # Check to see how 'make' treats includes. -*- Autoconf -*-
681684
682 # Copyright (C) 2001-2013 Free Software Foundation, Inc.
685 # Copyright (C) 2001-2014 Free Software Foundation, Inc.
683686 #
684687 # This file is free software; the Free Software Foundation
685688 # gives unlimited permission to copy and/or distribute it,
729732
730733 # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
731734
732 # Copyright (C) 1997-2013 Free Software Foundation, Inc.
735 # Copyright (C) 1997-2014 Free Software Foundation, Inc.
733736 #
734737 # This file is free software; the Free Software Foundation
735738 # gives unlimited permission to copy and/or distribute it,
770773 # Obsolete and "removed" macros, that must however still report explicit
771774 # error messages when used, to smooth transition.
772775 #
773 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
776 # Copyright (C) 1996-2014 Free Software Foundation, Inc.
774777 #
775778 # This file is free software; the Free Software Foundation
776779 # gives unlimited permission to copy and/or distribute it,
797800
798801 # Helper functions for option handling. -*- Autoconf -*-
799802
800 # Copyright (C) 2001-2013 Free Software Foundation, Inc.
803 # Copyright (C) 2001-2014 Free Software Foundation, Inc.
801804 #
802805 # This file is free software; the Free Software Foundation
803806 # gives unlimited permission to copy and/or distribute it,
826829 AC_DEFUN([_AM_IF_OPTION],
827830 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
828831
829 # Copyright (C) 1999-2013 Free Software Foundation, Inc.
832 # Copyright (C) 1999-2014 Free Software Foundation, Inc.
830833 #
831834 # This file is free software; the Free Software Foundation
832835 # gives unlimited permission to copy and/or distribute it,
873876 # For backward compatibility.
874877 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
875878
876 # Copyright (C) 2001-2013 Free Software Foundation, Inc.
879 # Copyright (C) 2001-2014 Free Software Foundation, Inc.
877880 #
878881 # This file is free software; the Free Software Foundation
879882 # gives unlimited permission to copy and/or distribute it,
892895
893896 # Check to make sure that the build environment is sane. -*- Autoconf -*-
894897
895 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
898 # Copyright (C) 1996-2014 Free Software Foundation, Inc.
896899 #
897900 # This file is free software; the Free Software Foundation
898901 # gives unlimited permission to copy and/or distribute it,
973976 rm -f conftest.file
974977 ])
975978
976 # Copyright (C) 2009-2013 Free Software Foundation, Inc.
979 # Copyright (C) 2009-2014 Free Software Foundation, Inc.
977980 #
978981 # This file is free software; the Free Software Foundation
979982 # gives unlimited permission to copy and/or distribute it,
10331036 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
10341037 ])
10351038
1036 # Copyright (C) 2001-2013 Free Software Foundation, Inc.
1039 # Copyright (C) 2001-2014 Free Software Foundation, Inc.
10371040 #
10381041 # This file is free software; the Free Software Foundation
10391042 # gives unlimited permission to copy and/or distribute it,
10611064 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
10621065 AC_SUBST([INSTALL_STRIP_PROGRAM])])
10631066
1064 # Copyright (C) 2006-2013 Free Software Foundation, Inc.
1067 # Copyright (C) 2006-2014 Free Software Foundation, Inc.
10651068 #
10661069 # This file is free software; the Free Software Foundation
10671070 # gives unlimited permission to copy and/or distribute it,
10801083
10811084 # Check how to create a tarball. -*- Autoconf -*-
10821085
1083 # Copyright (C) 2004-2013 Free Software Foundation, Inc.
1086 # Copyright (C) 2004-2014 Free Software Foundation, Inc.
10841087 #
10851088 # This file is free software; the Free Software Foundation
10861089 # gives unlimited permission to copy and/or distribute it,
00 #! /bin/sh
11 # Guess values for system-dependent variables and create Makefiles.
2 # Generated by GNU Autoconf 2.69 for readosm 1.0.0d.
2 # Generated by GNU Autoconf 2.69 for readosm 1.0.0e.
33 #
44 # Report bugs to <a.furieri@lqt.it>.
55 #
589589 # Identity of this package.
590590 PACKAGE_NAME='readosm'
591591 PACKAGE_TARNAME='readosm'
592 PACKAGE_VERSION='1.0.0d'
593 PACKAGE_STRING='readosm 1.0.0d'
592 PACKAGE_VERSION='1.0.0e'
593 PACKAGE_STRING='readosm 1.0.0e'
594594 PACKAGE_BUGREPORT='a.furieri@lqt.it'
595595 PACKAGE_URL=''
596596
13251325 # Omit some internal or obsolete options to make the list less imposing.
13261326 # This message is too long to be a string in the A/UX 3.1 sh.
13271327 cat <<_ACEOF
1328 \`configure' configures readosm 1.0.0d to adapt to many kinds of systems.
1328 \`configure' configures readosm 1.0.0e to adapt to many kinds of systems.
13291329
13301330 Usage: $0 [OPTION]... [VAR=VALUE]...
13311331
13951395
13961396 if test -n "$ac_init_help"; then
13971397 case $ac_init_help in
1398 short | recursive ) echo "Configuration of readosm 1.0.0d:";;
1398 short | recursive ) echo "Configuration of readosm 1.0.0e:";;
13991399 esac
14001400 cat <<\_ACEOF
14011401
15071507 test -n "$ac_init_help" && exit $ac_status
15081508 if $ac_init_version; then
15091509 cat <<\_ACEOF
1510 readosm configure 1.0.0d
1510 readosm configure 1.0.0e
15111511 generated by GNU Autoconf 2.69
15121512
15131513 Copyright (C) 2012 Free Software Foundation, Inc.
20512051 This file contains any messages produced by compilers while
20522052 running configure, to aid debugging if configure makes a mistake.
20532053
2054 It was created by readosm $as_me 1.0.0d, which was
2054 It was created by readosm $as_me 1.0.0e, which was
20552055 generated by GNU Autoconf 2.69. Invocation command line was
20562056
20572057 $ $0 $@
24362436
24372437
24382438
2439 am__api_version='1.14'
2439 am__api_version='1.15'
24402440
24412441 # Find a good install program. We prefer a C program (faster),
24422442 # so one script is as good as another. But avoid the broken or
26082608 ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
26092609 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
26102610
2611 # expand $ac_aux_dir to an absolute path
2612 am_aux_dir=`cd $ac_aux_dir && pwd`
2611 # Expand $ac_aux_dir to an absolute path.
2612 am_aux_dir=`cd "$ac_aux_dir" && pwd`
26132613
26142614 if test x"${MISSING+set}" != xset; then
26152615 case $am_aux_dir in
26282628 $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
26292629 fi
26302630
2631 if test x"${install_sh}" != xset; then
2631 if test x"${install_sh+set}" != xset; then
26322632 case $am_aux_dir in
26332633 *\ * | *\ *)
26342634 install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
29222922
29232923 # Define the identity of the package.
29242924 PACKAGE='readosm'
2925 VERSION='1.0.0d'
2925 VERSION='1.0.0e'
29262926
29272927
29282928 cat >>confdefs.h <<_ACEOF
29562956 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
29572957 mkdir_p='$(MKDIR_P)'
29582958
2959 # We need awk for the "check" target. The system "awk" is bad on
2960 # some platforms.
2959 # We need awk for the "check" target (and possibly the TAP driver). The
2960 # system "awk" is bad on some platforms.
29612961 # Always define AMTAR for backward compatibility. Yes, it's still used
29622962 # in the wild :-( We should find a proper way to deprecate it ...
29632963 AMTAR='$${TAR-tar}'
30143014 as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
30153015 fi
30163016 fi
3017
30173018
30183019 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
30193020 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
1767417675 # report actual input values of CONFIG_FILES etc. instead of their
1767517676 # values after options handling.
1767617677 ac_log="
17677 This file was extended by readosm $as_me 1.0.0d, which was
17678 This file was extended by readosm $as_me 1.0.0e, which was
1767817679 generated by GNU Autoconf 2.69. Invocation command line was
1767917680
1768017681 CONFIG_FILES = $CONFIG_FILES
1774017741 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1774117742 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1774217743 ac_cs_version="\\
17743 readosm config.status 1.0.0d
17744 readosm config.status 1.0.0e
1774417745 configured by $0, generated by GNU Autoconf 2.69,
1774517746 with options \\"\$ac_cs_config\\"
1774617747
11 # Process this file with autoconf to produce a configure script.
22
33 AC_PREREQ(2.61)
4 AC_INIT(readosm, 1.0.0d, a.furieri@lqt.it)
4 AC_INIT(readosm, 1.0.0e, a.furieri@lqt.it)
55 AC_LANG(C)
66 AC_CONFIG_AUX_DIR([.])
77 AC_CONFIG_MACRO_DIR([m4])
0 # Makefile.in generated by automake 1.14.1 from Makefile.am.
0 # Makefile.in generated by automake 1.15 from Makefile.am.
11 # @configure_input@
22
3 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
3 # Copyright (C) 1994-2014 Free Software Foundation, Inc.
44
55 # This Makefile.in is free software; the Free Software Foundation
66 # gives unlimited permission to copy and/or distribute it,
1414 @SET_MAKE@
1515
1616 VPATH = @srcdir@
17 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
17 am__is_gnu_make = { \
18 if test -z '$(MAKELEVEL)'; then \
19 false; \
20 elif test -n '$(MAKE_HOST)'; then \
21 true; \
22 elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
23 true; \
24 else \
25 false; \
26 fi; \
27 }
1828 am__make_running_with_option = \
1929 case $${target_option-} in \
2030 ?) ;; \
8090 noinst_PROGRAMS = test_osm1$(EXEEXT) test_osm2$(EXEEXT) \
8191 test_osm3$(EXEEXT)
8292 subdir = examples
83 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
84 $(top_srcdir)/depcomp
8593 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
8694 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
8795 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
8997 $(top_srcdir)/configure.ac
9098 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9199 $(ACLOCAL_M4)
100 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
92101 mkinstalldirs = $(install_sh) -d
93102 CONFIG_HEADER = $(top_builddir)/config.h
94103 CONFIG_CLEAN_FILES =
167176 done | $(am__uniquify_input)`
168177 ETAGS = etags
169178 CTAGS = ctags
179 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
170180 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
171181 ACLOCAL = @ACLOCAL@
172182 AMTAR = @AMTAR@
309319 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/Makefile'; \
310320 $(am__cd) $(top_srcdir) && \
311321 $(AUTOMAKE) --gnu examples/Makefile
312 .PRECIOUS: Makefile
313322 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
314323 @case '$?' in \
315324 *config.status*) \
590599 mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
591600 tags tags-am uninstall uninstall-am
592601
602 .PRECIOUS: Makefile
603
593604
594605 # Tell versions [3.59,3.63) of GNU make to not export all variables.
595606 # Otherwise a system limit (for SysV at least) may be exceeded.
0 # Makefile.in generated by automake 1.14.1 from Makefile.am.
0 # Makefile.in generated by automake 1.15 from Makefile.am.
11 # @configure_input@
22
3 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
3 # Copyright (C) 1994-2014 Free Software Foundation, Inc.
44
55 # This Makefile.in is free software; the Free Software Foundation
66 # gives unlimited permission to copy and/or distribute it,
1414 @SET_MAKE@
1515
1616 VPATH = @srcdir@
17 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
17 am__is_gnu_make = { \
18 if test -z '$(MAKELEVEL)'; then \
19 false; \
20 elif test -n '$(MAKE_HOST)'; then \
21 true; \
22 elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
23 true; \
24 else \
25 false; \
26 fi; \
27 }
1828 am__make_running_with_option = \
1929 case $${target_option-} in \
2030 ?) ;; \
7888 build_triplet = @build@
7989 host_triplet = @host@
8090 subdir = headers
81 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
82 $(include_HEADERS) $(noinst_HEADERS)
8391 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
8492 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
8593 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
8795 $(top_srcdir)/configure.ac
8896 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
8997 $(ACLOCAL_M4)
98 DIST_COMMON = $(srcdir)/Makefile.am $(include_HEADERS) \
99 $(noinst_HEADERS) $(am__DIST_COMMON)
90100 mkinstalldirs = $(install_sh) -d
91101 CONFIG_HEADER = $(top_builddir)/config.h
92102 CONFIG_CLEAN_FILES =
158168 done | $(am__uniquify_input)`
159169 ETAGS = etags
160170 CTAGS = ctags
171 am__DIST_COMMON = $(srcdir)/Makefile.in
161172 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
162173 ACLOCAL = @ACLOCAL@
163174 AMTAR = @AMTAR@
297308 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu headers/Makefile'; \
298309 $(am__cd) $(top_srcdir) && \
299310 $(AUTOMAKE) --gnu headers/Makefile
300 .PRECIOUS: Makefile
301311 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
302312 @case '$?' in \
303313 *config.status*) \
544554 ps ps-am tags tags-am uninstall uninstall-am \
545555 uninstall-includeHEADERS
546556
557 .PRECIOUS: Makefile
558
547559
548560 # Tell versions [3.59,3.63) of GNU make to not export all variables.
549561 # Otherwise a system limit (for SysV at least) may be exceeded.
0 # Makefile.in generated by automake 1.14.1 from Makefile.am.
0 # Makefile.in generated by automake 1.15 from Makefile.am.
11 # @configure_input@
22
3 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
3 # Copyright (C) 1994-2014 Free Software Foundation, Inc.
44
55 # This Makefile.in is free software; the Free Software Foundation
66 # gives unlimited permission to copy and/or distribute it,
1414 @SET_MAKE@
1515
1616 VPATH = @srcdir@
17 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
17 am__is_gnu_make = { \
18 if test -z '$(MAKELEVEL)'; then \
19 false; \
20 elif test -n '$(MAKE_HOST)'; then \
21 true; \
22 elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
23 true; \
24 else \
25 false; \
26 fi; \
27 }
1828 am__make_running_with_option = \
1929 case $${target_option-} in \
2030 ?) ;; \
7888 build_triplet = @build@
7989 host_triplet = @host@
8090 subdir = src
81 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
82 $(top_srcdir)/depcomp
8391 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
8492 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
8593 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
8795 $(top_srcdir)/configure.ac
8896 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
8997 $(ACLOCAL_M4)
98 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
9099 mkinstalldirs = $(install_sh) -d
91100 CONFIG_HEADER = $(top_builddir)/config.h
92101 CONFIG_CLEAN_FILES =
192201 done | $(am__uniquify_input)`
193202 ETAGS = etags
194203 CTAGS = ctags
204 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
195205 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
196206 ACLOCAL = @ACLOCAL@
197207 AMTAR = @AMTAR@
336346 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
337347 $(am__cd) $(top_srcdir) && \
338348 $(AUTOMAKE) --gnu src/Makefile
339 .PRECIOUS: Makefile
340349 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
341350 @case '$?' in \
342351 *config.status*) \
666675 mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
667676 tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES
668677
678 .PRECIOUS: Makefile
679
669680
670681 # Tell versions [3.59,3.63) of GNU make to not export all variables.
671682 # Otherwise a system limit (for SysV at least) may be exceeded.
21012101 long long delta = 0;
21022102 for (i = 0; i < packed_roles.count; i++)
21032103 {
2104 int xtype = READOSM_UNDEFINED;
21042105 int i_role = *(packed_roles.values + i);
21052106 readosm_string *s_role = *(strings->strings + i_role);
21062107 int type = *(packed_types.values + i);
21072108 delta += *(packed_refs.values + i);
2108 append_member_to_relation (relation, type, delta,
2109 if (type == 0)
2110 xtype = READOSM_MEMBER_NODE;
2111 else if (type == 1)
2112 xtype = READOSM_MEMBER_WAY;
2113 else if (type == 2)
2114 xtype = READOSM_MEMBER_RELATION;
2115 append_member_to_relation (relation, xtype, delta,
21092116 s_role->string);
21102117 }
21112118 }