From d0371c7d0147806d47e253b946c1feca8a5f57ca Mon Sep 17 00:00:00 2001 From: Ruben Kerkhof Date: Sun, 20 Jul 2014 17:09:30 +0200 Subject: [PATCH] Convert rapidjson to autotools So that it properly handles silent rules, make distclean etc. --- Makefile.am | 3 +-- configure.ac | 1 + pdns/ext/Makefile.am | 2 +- pdns/ext/rapidjson/.gitignore | 2 ++ pdns/ext/rapidjson/Makefile | 19 ------------------- pdns/ext/rapidjson/Makefile.am | 2 ++ 6 files changed, 7 insertions(+), 22 deletions(-) create mode 100644 pdns/ext/rapidjson/.gitignore delete mode 100644 pdns/ext/rapidjson/Makefile create mode 100644 pdns/ext/rapidjson/Makefile.am diff --git a/Makefile.am b/Makefile.am index 57b8d9ee04..c0c5bb55a4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,11 +1,10 @@ SUBDIRS=modules codedocs @programdescend@ -DIST_SUBDIRS=modules codedocs pdns pdns/ext/rapidjson +DIST_SUBDIRS=modules codedocs pdns EXTRA_DIST=README INSTALL NOTICE debian-pdns pdns.spec \ codedocs/doxygen.conf contrib/powerdns.solaris.init.d \ contrib/systemd-pdns.service contrib/systemd-pdns-recursor.service \ bootstrap build-scripts/semistaticg++ pdns/docs/dnstcpbench.1 \ build-scripts/redhat/pdns-server-test.spec \ -pdns/ext/rapidjson/Makefile \ pdns/named.conf.parsertest regression-tests/zones/unit.test ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index 2e29078f63..ae58bd5c90 100644 --- a/configure.ac +++ b/configure.ac @@ -342,6 +342,7 @@ AC_CONFIG_FILES([ pdns/ext/yahttp/yahttp/Makefile pdns/ext/polarssl-1.3.2/Makefile pdns/ext/polarssl-1.3.2/library/Makefile + pdns/ext/rapidjson/Makefile modules/bindbackend/Makefile modules/db2backend/Makefile modules/geobackend/Makefile diff --git a/pdns/ext/Makefile.am b/pdns/ext/Makefile.am index d7ca3c9939..5458462ef9 100644 --- a/pdns/ext/Makefile.am +++ b/pdns/ext/Makefile.am @@ -1 +1 @@ -SUBDIRS=$(POLARSSL_SUBDIR) yahttp +SUBDIRS=$(POLARSSL_SUBDIR) yahttp rapidjson diff --git a/pdns/ext/rapidjson/.gitignore b/pdns/ext/rapidjson/.gitignore new file mode 100644 index 0000000000..b336cc7cec --- /dev/null +++ b/pdns/ext/rapidjson/.gitignore @@ -0,0 +1,2 @@ +/Makefile +/Makefile.in diff --git a/pdns/ext/rapidjson/Makefile b/pdns/ext/rapidjson/Makefile deleted file mode 100644 index f9a69425f1..0000000000 --- a/pdns/ext/rapidjson/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -.SILENT: - -all: - -install: - -uninstall: - -distclean: clean - -clean: - -check: - -distdir: - mkdir -p $(distdir)/include/rapidjson/internal - cp license.txt $(distdir) - cp include/rapidjson/*.h $(distdir)/include/rapidjson - cp include/rapidjson/internal/*.h $(distdir)/include/rapidjson/internal diff --git a/pdns/ext/rapidjson/Makefile.am b/pdns/ext/rapidjson/Makefile.am new file mode 100644 index 0000000000..175b7bf2f7 --- /dev/null +++ b/pdns/ext/rapidjson/Makefile.am @@ -0,0 +1,2 @@ +EXTRA_DIST = license.txt +noinst_HEADERS = include/rapidjson -- 2.47.2