make: In ndn-cpp-config.h, to avoid polluting the global name space, generate NDN_CPP_HAVE_BOOST_FUNCTION etc. instead of HAVE_BOOST_FUNCTION, etc.
diff --git a/Makefile.in b/Makefile.in
index 74f31d9..6a27ded 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -99,7 +99,7 @@
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/ndn-cpp/ndn-cpp-config.h
+CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -227,7 +227,7 @@
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
am__v_at_1 =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/ndn-cpp
+DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
@@ -594,7 +594,8 @@
bin_test_publish_async_SOURCES = tests/test-publish-async.cpp
bin_test_publish_async_LDADD = libndn-cpp.la
dist_noinst_SCRIPTS = autogen.sh
-all: all-am
+all: config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-am
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -634,20 +635,20 @@
$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
$(am__aclocal_m4_deps):
-ndn-cpp/ndn-cpp-config.h: ndn-cpp/stamp-h1
- @test -f $@ || rm -f ndn-cpp/stamp-h1
- @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) ndn-cpp/stamp-h1
+config.h: stamp-h1
+ @test -f $@ || rm -f stamp-h1
+ @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
-ndn-cpp/stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
- @rm -f ndn-cpp/stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status ndn-cpp/ndn-cpp-config.h
+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+ @rm -f stamp-h1
+ cd $(top_builddir) && $(SHELL) ./config.status config.h
$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
($(am__cd) $(top_srcdir) && $(AUTOHEADER))
- rm -f ndn-cpp/stamp-h1
+ rm -f stamp-h1
touch $@
distclean-hdr:
- -rm -f ndn-cpp/ndn-cpp-config.h ndn-cpp/stamp-h1
+ -rm -f config.h stamp-h1
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@@ -1343,7 +1344,7 @@
exit 1; } >&2
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS)
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) config.h
install-binPROGRAMS: install-libLTLIBRARIES
installdirs:
@@ -1481,7 +1482,7 @@
uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIBRARIES
-.MAKE: install-am install-strip
+.MAKE: all install-am install-strip
.PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am clean \
clean-binPROGRAMS clean-cscope clean-generic \