|
Lines 1-216
Link Here
|
| 1 |
--- Makefile.in.orig 2017-11-18 09:03:50 UTC |
|
|
| 2 |
+++ Makefile.in |
| 3 |
@@ -1,7 +1,7 @@ |
| 4 |
-# Makefile.in generated by automake 1.14.1 from Makefile.am. |
| 5 |
+# Makefile.in generated by automake 1.15.1 from Makefile.am. |
| 6 |
# @configure_input@ |
| 7 |
|
| 8 |
-# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
| 9 |
+# Copyright (C) 1994-2017 Free Software Foundation, Inc. |
| 10 |
|
| 11 |
# This Makefile.in is free software; the Free Software Foundation |
| 12 |
# gives unlimited permission to copy and/or distribute it, |
| 13 |
@@ -18,7 +18,17 @@ |
| 14 |
|
| 15 |
|
| 16 |
VPATH = @srcdir@ |
| 17 |
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
| 18 |
+am__is_gnu_make = { \ |
| 19 |
+ if test -z '$(MAKELEVEL)'; then \ |
| 20 |
+ false; \ |
| 21 |
+ elif test -n '$(MAKE_HOST)'; then \ |
| 22 |
+ true; \ |
| 23 |
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ |
| 24 |
+ true; \ |
| 25 |
+ else \ |
| 26 |
+ false; \ |
| 27 |
+ fi; \ |
| 28 |
+} |
| 29 |
am__make_running_with_option = \ |
| 30 |
case $${target_option-} in \ |
| 31 |
?) ;; \ |
| 32 |
@@ -351,26 +361,6 @@ check_PROGRAMS = test_common$(EXEEXT) te |
| 33 |
@BUILD_PLUGIN_WRITE_PROMETHEUS_TRUE@am__append_237 = prometheus.pb-c.c prometheus.pb-c.h |
| 34 |
@HAVE_GRPC_CPP_TRUE@@HAVE_PROTOC3_TRUE@am__append_238 = collectd.grpc.pb.cc collectd.pb.cc types.pb.cc |
| 35 |
subdir = . |
| 36 |
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ |
| 37 |
- $(top_srcdir)/configure $(am__configure_deps) \ |
| 38 |
- $(top_srcdir)/src/config.h.in \ |
| 39 |
- $(top_srcdir)/src/libcollectdclient/collectd/lcc_features.h.in \ |
| 40 |
- $(top_srcdir)/src/collectd.conf.in \ |
| 41 |
- $(top_srcdir)/src/libcollectdclient/libcollectdclient.pc.in \ |
| 42 |
- src/liboconfig/scanner.c src/liboconfig/parser.h \ |
| 43 |
- src/liboconfig/parser.c $(top_srcdir)/build-aux/depcomp \ |
| 44 |
- $(top_srcdir)/build-aux/ylwrap $(am__dist_noinst_JAVA_DIST) \ |
| 45 |
- $(dist_man_MANS) $(pkginclude_HEADERS) \ |
| 46 |
- $(top_srcdir)/build-aux/test-driver AUTHORS COPYING ChangeLog \ |
| 47 |
- README build-aux/compile build-aux/config.guess \ |
| 48 |
- build-aux/config.sub build-aux/depcomp build-aux/install-sh \ |
| 49 |
- build-aux/missing build-aux/ylwrap build-aux/ltmain.sh \ |
| 50 |
- $(top_srcdir)/build-aux/compile \ |
| 51 |
- $(top_srcdir)/build-aux/config.guess \ |
| 52 |
- $(top_srcdir)/build-aux/config.sub \ |
| 53 |
- $(top_srcdir)/build-aux/install-sh \ |
| 54 |
- $(top_srcdir)/build-aux/ltmain.sh \ |
| 55 |
- $(top_srcdir)/build-aux/missing |
| 56 |
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
| 57 |
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \ |
| 58 |
$(top_srcdir)/m4/ax_compiler_vendor.m4 \ |
| 59 |
@@ -379,6 +369,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a |
| 60 |
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac |
| 61 |
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
| 62 |
$(ACLOCAL_M4) |
| 63 |
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ |
| 64 |
+ $(am__configure_deps) $(am__dist_noinst_JAVA_DIST) \ |
| 65 |
+ $(pkginclude_HEADERS) $(am__DIST_COMMON) |
| 66 |
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ |
| 67 |
configure.lineno config.status.lineno |
| 68 |
mkinstalldirs = $(install_sh) -d |
| 69 |
@@ -2673,6 +2666,25 @@ TEST_LOGS = $(am__test_logs2:.test.log=. |
| 70 |
TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver |
| 71 |
TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ |
| 72 |
$(TEST_LOG_FLAGS) |
| 73 |
+am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \ |
| 74 |
+ $(top_srcdir)/build-aux/compile \ |
| 75 |
+ $(top_srcdir)/build-aux/config.guess \ |
| 76 |
+ $(top_srcdir)/build-aux/config.sub \ |
| 77 |
+ $(top_srcdir)/build-aux/depcomp \ |
| 78 |
+ $(top_srcdir)/build-aux/install-sh \ |
| 79 |
+ $(top_srcdir)/build-aux/ltmain.sh \ |
| 80 |
+ $(top_srcdir)/build-aux/missing \ |
| 81 |
+ $(top_srcdir)/build-aux/test-driver \ |
| 82 |
+ $(top_srcdir)/build-aux/ylwrap \ |
| 83 |
+ $(top_srcdir)/src/collectd.conf.in \ |
| 84 |
+ $(top_srcdir)/src/config.h.in \ |
| 85 |
+ $(top_srcdir)/src/libcollectdclient/collectd/lcc_features.h.in \ |
| 86 |
+ $(top_srcdir)/src/libcollectdclient/libcollectdclient.pc.in \ |
| 87 |
+ AUTHORS COPYING ChangeLog INSTALL NEWS README \ |
| 88 |
+ build-aux/compile build-aux/config.guess build-aux/config.sub \ |
| 89 |
+ build-aux/depcomp build-aux/install-sh build-aux/ltmain.sh \ |
| 90 |
+ build-aux/missing build-aux/ylwrap src/liboconfig/parser.c \ |
| 91 |
+ src/liboconfig/parser.h src/liboconfig/scanner.c |
| 92 |
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
| 93 |
distdir = $(PACKAGE)-$(VERSION) |
| 94 |
top_distdir = $(distdir) |
| 95 |
@@ -2908,6 +2920,7 @@ LOAD_PLUGIN_NETWORK = @LOAD_PLUGIN_NETWO |
| 96 |
LOAD_PLUGIN_RRDTOOL = @LOAD_PLUGIN_RRDTOOL@ |
| 97 |
LOAD_PLUGIN_SYSLOG = @LOAD_PLUGIN_SYSLOG@ |
| 98 |
LTLIBOBJS = @LTLIBOBJS@ |
| 99 |
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ |
| 100 |
LUA_CFLAGS = @LUA_CFLAGS@ |
| 101 |
LUA_LIBS = @LUA_LIBS@ |
| 102 |
MAKEINFO = @MAKEINFO@ |
| 103 |
@@ -3183,7 +3196,7 @@ AM_CPPFLAGS = \ |
| 104 |
-DPREFIX='"${prefix}"' \ |
| 105 |
-DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \ |
| 106 |
-DLOCALSTATEDIR='"${localstatedir}"' \ |
| 107 |
- -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' \ |
| 108 |
+ -DPKGLOCALSTATEDIR='"/var/db/${PACKAGE_NAME}"' \ |
| 109 |
-DPLUGINDIR='"${pkglibdir}"' \ |
| 110 |
-DPKGDATADIR='"${pkgdatadir}"' |
| 111 |
|
| 112 |
@@ -4172,7 +4185,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi |
| 113 |
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ |
| 114 |
$(am__cd) $(top_srcdir) && \ |
| 115 |
$(AUTOMAKE) --foreign Makefile |
| 116 |
-.PRECIOUS: Makefile |
| 117 |
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
| 118 |
@case '$?' in \ |
| 119 |
*config.status*) \ |
| 120 |
@@ -7114,7 +7126,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) |
| 121 |
if test -n "$$am__remaking_logs"; then \ |
| 122 |
echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ |
| 123 |
"recursion detected" >&2; \ |
| 124 |
- else \ |
| 125 |
+ elif test -n "$$redo_logs"; then \ |
| 126 |
am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ |
| 127 |
fi; \ |
| 128 |
if $(am__make_dryrun); then :; else \ |
| 129 |
@@ -7385,7 +7397,7 @@ distdir: $(DISTFILES) |
| 130 |
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ |
| 131 |
|| chmod -R a+r "$(distdir)" |
| 132 |
dist-gzip: distdir |
| 133 |
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz |
| 134 |
+ tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz |
| 135 |
$(am__post_remove_distdir) |
| 136 |
dist-bzip2: distdir |
| 137 |
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 |
| 138 |
@@ -7400,17 +7412,17 @@ dist-xz: distdir |
| 139 |
$(am__post_remove_distdir) |
| 140 |
|
| 141 |
dist-tarZ: distdir |
| 142 |
- @echo WARNING: "Support for shar distribution archives is" \ |
| 143 |
- "deprecated." >&2 |
| 144 |
+ @echo WARNING: "Support for distribution archives compressed with" \ |
| 145 |
+ "legacy program 'compress' is deprecated." >&2 |
| 146 |
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2 |
| 147 |
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z |
| 148 |
$(am__post_remove_distdir) |
| 149 |
|
| 150 |
dist-shar: distdir |
| 151 |
- @echo WARNING: "Support for distribution archives compressed with" \ |
| 152 |
- "legacy program 'compress' is deprecated." >&2 |
| 153 |
+ @echo WARNING: "Support for shar distribution archives is" \ |
| 154 |
+ "deprecated." >&2 |
| 155 |
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2 |
| 156 |
- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz |
| 157 |
+ shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz |
| 158 |
$(am__post_remove_distdir) |
| 159 |
|
| 160 |
dist-zip: distdir |
| 161 |
@@ -7428,7 +7440,7 @@ dist dist-all: |
| 162 |
distcheck: dist |
| 163 |
case '$(DIST_ARCHIVES)' in \ |
| 164 |
*.tar.gz*) \ |
| 165 |
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ |
| 166 |
+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ |
| 167 |
*.tar.bz2*) \ |
| 168 |
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ |
| 169 |
*.tar.lz*) \ |
| 170 |
@@ -7438,23 +7450,23 @@ distcheck: dist |
| 171 |
*.tar.Z*) \ |
| 172 |
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ |
| 173 |
*.shar.gz*) \ |
| 174 |
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ |
| 175 |
+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ |
| 176 |
*.zip*) \ |
| 177 |
unzip $(distdir).zip ;;\ |
| 178 |
esac |
| 179 |
chmod -R a-w $(distdir) |
| 180 |
chmod u+w $(distdir) |
| 181 |
- mkdir $(distdir)/_build $(distdir)/_inst |
| 182 |
+ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst |
| 183 |
chmod a-w $(distdir) |
| 184 |
test -d $(distdir)/_build || exit 0; \ |
| 185 |
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ |
| 186 |
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ |
| 187 |
&& am__cwd=`pwd` \ |
| 188 |
- && $(am__cd) $(distdir)/_build \ |
| 189 |
- && ../configure \ |
| 190 |
+ && $(am__cd) $(distdir)/_build/sub \ |
| 191 |
+ && ../../configure \ |
| 192 |
$(AM_DISTCHECK_CONFIGURE_FLAGS) \ |
| 193 |
$(DISTCHECK_CONFIGURE_FLAGS) \ |
| 194 |
- --srcdir=.. --prefix="$$dc_install_base" \ |
| 195 |
+ --srcdir=../.. --prefix="$$dc_install_base" \ |
| 196 |
&& $(MAKE) $(AM_MAKEFLAGS) \ |
| 197 |
&& $(MAKE) $(AM_MAKEFLAGS) dvi \ |
| 198 |
&& $(MAKE) $(AM_MAKEFLAGS) check \ |
| 199 |
@@ -7686,6 +7698,8 @@ uninstall-man: uninstall-man1 uninstall- |
| 200 |
uninstall-pkgincludeHEADERS uninstall-pkglibLTLIBRARIES \ |
| 201 |
uninstall-sbinPROGRAMS |
| 202 |
|
| 203 |
+.PRECIOUS: Makefile |
| 204 |
+ |
| 205 |
|
| 206 |
.pod.1: |
| 207 |
$(AM_V_POD2MAN_C)pod2man --release=$(VERSION) --center=$(PACKAGE) $< \ |
| 208 |
@@ -7721,7 +7735,7 @@ uninstall-man: uninstall-man1 uninstall- |
| 209 |
|
| 210 |
install-exec-hook: |
| 211 |
$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run |
| 212 |
- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/$(PACKAGE_NAME) |
| 213 |
+ $(mkinstalldirs) $(DESTDIR)/var/db/$(PACKAGE_NAME) |
| 214 |
$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log |
| 215 |
$(mkinstalldirs) $(DESTDIR)$(sysconfdir) |
| 216 |
if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \ |