Convert rapidjson to autotools

So that it properly handles silent rules,
make distclean etc.

diff --git a/Makefile.am b/Makefile.am
index 57b8d9ee045841aba8d5106a407dca0a6e31c425..c0c5bb55a4cfb388910f64f1bd8204607b8688ed 100644 (file)
--- 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 2e29078f63e3bab5a22cb666b228d38736f9eff8..ae58bd5c90da02f2f6b55bc0a29213d105771dd6 100644 (file)
--- 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 d7ca3c99399a84f262ca56ce268523032b4ed40d..5458462ef9914efb8cf7e9972267d217f6456842 100644 (file)
--- 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 (file)
index 0000000..b336cc7
--- /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 (file)
index f9a6942..0000000
--- 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 (file)
index 0000000..175b7bf
--- /dev/null
+++ b/pdns/ext/rapidjson/Makefile.am
@@ -0,0 +1,2 @@
+EXTRA_DIST = license.txt
+noinst_HEADERS = include/rapidjson