Get rid of "installation-manifest" Makefile target silliness.

svn path=/branches/tk377/; revision=4974

18 files changed, 10 insertions, 89 deletions

diff --git a/Makefile.in b/Makefile.in
index b66e8b3b..8ed0a8b3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -19,13 +19,5 @@ export:
 	tar czf subvert-rpki.hactrn.net-$$(date +%Y.%m.%d).tar.gz subvert-rpki.hactrn.net
 	rm -rf subvert-rpki.hactrn.net
 
-installation-manifest: Makefile
-	cp /dev/null ${abs_top_builddir}/installation-manifest
-	@for i in ${SUBDIRS}; do echo "Making $@ in $$i"; (cd $$i && ${MAKE} installation-manifest); done
-	sort -u -o ${abs_top_builddir}/installation-manifest ${abs_top_builddir}/installation-manifest
-
-clean::
-	rm -f installation-manifest
-
 distclean clean::
 	rm -rf build autom4te.cache
diff --git a/buildtools/build-freebsd-ca-port.py b/buildtools/build-freebsd-ca-port.py
index 033bcc9b..daafd3f4 100644
--- a/buildtools/build-freebsd-ca-port.py
+++ b/buildtools/build-freebsd-ca-port.py
@@ -137,6 +137,11 @@ subprocess.check_call(("make", "configure", "DISTDIR=" + os.getcwd(),
                        "USE_GNOME=", "NO_DEPENDS=yes"),
                       cwd = base)
 
+raise NotImplementedError
+
+# "make installation-manifest" was a silly idea, and is no longer in
+# the Makefiles.  This script needs rewriting.
+
 print "Running make installation-manifest"
 
 subprocess.check_call(("make", "installation-manifest"),
diff --git a/h/Makefile.in b/h/Makefile.in
index 6202d6d7..d976661b 100644
--- a/h/Makefile.in
+++ b/h/Makefile.in
@@ -17,7 +17,7 @@ rpki/sk_roa.h: rpki/roa.h
 clean:
 	rm -f *.h.tmp
 
-test install deinstall uninstall installation-manifest:
+test install deinstall uninstall:
 	@true
 
 distclean: clean
diff --git a/openssl/Makefile.in b/openssl/Makefile.in
index 72bba460..f7bb6b5b 100644
--- a/openssl/Makefile.in
+++ b/openssl/Makefile.in
@@ -74,6 +74,3 @@ sandblast:
 
 test: all
 	cd tests; ${MAKE} $@
-
-installation-manifest:
-	@true
diff --git a/rcynic/Makefile.in b/rcynic/Makefile.in
index 89e89fec..ee45fea7 100644
--- a/rcynic/Makefile.in
+++ b/rcynic/Makefile.in
@@ -61,9 +61,6 @@ install: ${BIN} installation-scripts/install.sh
 uninstall deinstall:
 	cd installation-scripts; host_os="${host_os}"; DESTDIR="${DESTDIR}"; . ./deinstall.sh
 
-installation-manifest:
-	cd installation-scripts; host_os="${host_os}"; abs_top_builddir="${abs_top_builddir}"; . ./manifest.sh
-
 distclean: clean
 	cd static-rsync; ${MAKE} $@
 	rm -f Makefile
diff --git a/rcynic/defstack.h b/rcynic/defstack.h
index 97490878..370c8129 100644
--- a/rcynic/defstack.h
+++ b/rcynic/defstack.h
@@ -1,6 +1,6 @@
 /*
  * Automatically generated, do not edit.
- * Generator $Id: defstack.py 4725 2012-09-19 21:28:34Z sra $
+ * Generator $Id: defstack.py 4878 2012-11-15 22:13:53Z sra $
  */
 
 #ifndef __RCYNIC_C__DEFSTACK_H__
diff --git a/rcynic/installation-scripts/deinstall.sh b/rcynic/installation-scripts/deinstall.sh
index d94d7ed8..635c5acc 100644
--- a/rcynic/installation-scripts/deinstall.sh
+++ b/rcynic/installation-scripts/deinstall.sh
@@ -2,4 +2,3 @@
 # $Id$
 
 echo Sorry, automated deinstallation of rcynic is not implemented yet
-#exit 1
diff --git a/rcynic/installation-scripts/manifest.sh b/rcynic/installation-scripts/manifest.sh
deleted file mode 100644
index 26872b1a..00000000
--- a/rcynic/installation-scripts/manifest.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh -
-# $Id$
-
-echo >>${abs_top_builddir}/installation-manifest D %%RCYNICJAILDIR%%
-echo >>${abs_top_builddir}/installation-manifest D %%RCYNICJAILDIR%%/bin
-echo >>${abs_top_builddir}/installation-manifest D %%RCYNICJAILDIR%%/dev
-echo >>${abs_top_builddir}/installation-manifest D %%RCYNICJAILDIR%%/etc
-echo >>${abs_top_builddir}/installation-manifest D %%RCYNICJAILDIR%%/etc/trust-anchors
-echo >>${abs_top_builddir}/installation-manifest D %%RCYNICJAILDIR%%/var
-echo >>${abs_top_builddir}/installation-manifest D %%RCYNICJAILDIR%%/data
-
-echo >>${abs_top_builddir}/installation-manifest F %%RCYNICJAILDIR%%/bin/rcynic
-echo >>${abs_top_builddir}/installation-manifest F %%RCYNICJAILDIR%%/bin/rsync
-echo >>${abs_top_builddir}/installation-manifest F %%RCYNICJAILDIR%%/bin/rcynic-html
-
-# Not sure what to do about %%RCYNICJAILDIR%%/${libdir}/* on Linux, as we
-# don't know what goes there until we compute the transitive closure
-# of ldd dependencies.  Ick.  Ignore for now.
-
-case "${host_os}" in
-freebsd*)	echo >>${abs_top_builddir}/installation-manifest F %%RCDIR%%/rcynic;;
-darwin*)	echo >>${abs_top_builddir}/installation-manifest F /Library/StartupItems/RCynic;;
-esac
diff --git a/rpkid/Makefile.in b/rpkid/Makefile.in
index 90af04ad..1ec9cc4b 100644
--- a/rpkid/Makefile.in
+++ b/rpkid/Makefile.in
@@ -124,19 +124,6 @@ uninstall deinstall::
 distclean::
 	rm -f installed
 
-installation-manifest::
-	echo >>${abs_top_builddir}/installation-manifest D %%PYTHON_SITELIBDIR%%/rpki/POW
-	echo >>${abs_top_builddir}/installation-manifest F %%PYTHON_SITELIBDIR%%/${POW_SO}
-	for i in ${SCRIPTS}; do echo >>${abs_top_builddir}/installation-manifest F %%SBINDIR%%/`echo $$i | sed 's=.*/==g'`; done
-	for i in ${AUX_SCRIPTS}; do echo >>${abs_top_builddir}/installation-manifest F %%LIBEXECDIR%%/`echo $$i | sed 's=.*/==g'`; done
-	find rpki -name .svn -prune -o -name TODO -prune -o -type f -print  | awk '\
-		{print "F %%PYTHON_SITELIBDIR%%/" $$0} \
-		/\.py$$/ {print "F %%PYTHON_SITELIBDIR%%/" $$0 "c"} \
-		' >>${abs_top_builddir}/installation-manifest
-	find rpki -name .svn -prune -o -type d -print | awk '\
-		{print "D %%PYTHON_SITELIBDIR%%/" $$0} \
-		' >>${abs_top_builddir}/installation-manifest
-
 dont-run-trang:
 	touch *.rng
 
@@ -205,7 +192,7 @@ distclean:: clean docclean
 	cd tests; ${MAKE} $@
 	rm -f TAGS Makefile
 
-all install clean test distclean deinstall uninstall installation-manifest::
+all install clean test distclean deinstall uninstall::
 	@for i in ${SUBDIRS}; do echo "Making $@ in $$i"; (cd $$i && ${MAKE} $@); done
 
 # Scripts
diff --git a/rpkid/portal-gui/Makefile.in b/rpkid/portal-gui/Makefile.in
index e9af1cbe..0a6e90da 100644
--- a/rpkid/portal-gui/Makefile.in
+++ b/rpkid/portal-gui/Makefile.in
@@ -59,20 +59,5 @@ deinstall uninstall:
 	rm -rf $(INSTDIR)/media $(INSTDIR)/wsgi
 	rm -rf $(SYSCONFDIR)/apache.conf $(SYSCONFDIR)/settings.py $(SYSCONFDIR)/settings.pyc
 
-installation-manifest:
-	echo >>${abs_top_builddir}/installation-manifest D %%SYSCONFDIR%%/rpki
-	echo >>${abs_top_builddir}/installation-manifest D %%DATAROOTDIR%%/rpki
-	echo >>${abs_top_builddir}/installation-manifest D %%DATAROOTDIR%%/rpki/wsgi
-	echo >>${abs_top_builddir}/installation-manifest D %%DATAROOTDIR%%/rpki/media
-	echo >>${abs_top_builddir}/installation-manifest D %%DATAROOTDIR%%/rpki/media/css
-	echo >>${abs_top_builddir}/installation-manifest D %%DATAROOTDIR%%/rpki/media/img
-	echo >>${abs_top_builddir}/installation-manifest D %%DATAROOTDIR%%/rpki/media/js
-	echo >>${abs_top_builddir}/installation-manifest F %%SYSCONFDIR%%/rpki/apache.conf
-	echo >>${abs_top_builddir}/installation-manifest F %%SYSCONFDIR%%/rpki/settings.py
-	echo >>${abs_top_builddir}/installation-manifest F %%DATAROOTDIR%%/rpki/wsgi/rpki.wsgi
-	find $(srcdir)/../rpki/gui/app/static/css $(srcdir)/../rpki/gui/app/static/js $(srcdir)/../rpki/gui/app/static/img \
-		-name .svn -prune -o -type f -print | \
-		sed 's=$(srcdir)/../rpki/gui/app/static=F %%DATAROOTDIR%%/rpki/media=' >>${abs_top_builddir}/installation-manifest
-
 test:
 	@true
diff --git a/rtr-origin/Makefile.in b/rtr-origin/Makefile.in
index 80ff2b50..8a50e528 100644
--- a/rtr-origin/Makefile.in
+++ b/rtr-origin/Makefile.in
@@ -34,9 +34,6 @@ install: all
 deinstall uninstall:
 	rm -f ${DESTDIR}${bindir}/${BIN}
 
-installation-manifest:
-	echo >>${abs_top_builddir}/installation-manifest F %%BINDIR%%/${BIN}
-
 distclean: clean
 	rm -rf current sockets *.ax *.ix.*
 	rm -f Makefile
diff --git a/utils/Makefile.in b/utils/Makefile.in
index 7f59f132..11c8d17b 100644
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -2,7 +2,7 @@
 
 SUBDIRS = uri print_rpki_manifest print_roa hashdir find_roa scan_roas
 
-all clean test distclean install deinstall uninstall installation-manifest::
+all clean test distclean install deinstall uninstall::
 	@for i in ${SUBDIRS}; do echo "Making $@ in $$i"; (cd $$i && ${MAKE} $@); done
 
 distclean::
diff --git a/utils/find_roa/Makefile.in b/utils/find_roa/Makefile.in
index b1b8eb83..36c68e01 100644
--- a/utils/find_roa/Makefile.in
+++ b/utils/find_roa/Makefile.in
@@ -51,9 +51,6 @@ install: all
 deinstall uninstall:
 	rm -f ${DESTDIR}${bindir}/${BIN}
 
-installation-manifest:
-	echo >>${abs_top_builddir}/installation-manifest F %%BINDIR%%/${BIN}
-
 distclean: clean
 	rm -rf hashed-pem-dir
 	rm -f Makefile
diff --git a/utils/hashdir/Makefile.in b/utils/hashdir/Makefile.in
index 66b2cc25..c0cf448a 100644
--- a/utils/hashdir/Makefile.in
+++ b/utils/hashdir/Makefile.in
@@ -48,9 +48,6 @@ install: all
 	if test -d ${DESTDIR}${bindir} ; then :; else ${INSTALL} -d ${DESTDIR}${bindir}; fi
 	${INSTALL} ${BIN} ${DESTDIR}${bindir}
 
-installation-manifest:
-	echo >>${abs_top_builddir}/installation-manifest F %%BINDIR%%/${BIN}
-
 deinstall uninstall:
 	rm -f ${DESTDIR}${bindir}/${BIN}
 
diff --git a/utils/print_roa/Makefile.in b/utils/print_roa/Makefile.in
index 9bb83bc2..5999b351 100644
--- a/utils/print_roa/Makefile.in
+++ b/utils/print_roa/Makefile.in
@@ -48,8 +48,5 @@ install: all
 deinstall uninstall:
 	rm -f ${DESTDIR}${bindir}/${BIN}
 
-installation-manifest:
-	echo >>${abs_top_builddir}/installation-manifest F %%BINDIR%%/${BIN}
-
 distclean: clean
 	rm -f Makefile
diff --git a/utils/print_rpki_manifest/Makefile.in b/utils/print_rpki_manifest/Makefile.in
index 513afa34..22f1b16b 100644
--- a/utils/print_rpki_manifest/Makefile.in
+++ b/utils/print_rpki_manifest/Makefile.in
@@ -48,8 +48,5 @@ install: all
 deinstall uninstall:
 	rm -f ${DESTDIR}${bindir}/${BIN}
 
-installation-manifest:
-	echo >>${abs_top_builddir}/installation-manifest F %%BINDIR%%/${BIN}
-
 distclean: clean
 	rm -f Makefile
diff --git a/utils/scan_roas/Makefile.in b/utils/scan_roas/Makefile.in
index f61ebd3c..3d86532d 100644
--- a/utils/scan_roas/Makefile.in
+++ b/utils/scan_roas/Makefile.in
@@ -48,8 +48,5 @@ install: all
 deinstall uninstall:
 	rm -f ${DESTDIR}${bindir}/${BIN}
 
-installation-manifest:
-	echo >>${abs_top_builddir}/installation-manifest F %%BINDIR%%/${BIN}
-
 distclean: clean
 	rm -f Makefile
diff --git a/utils/uri/Makefile.in b/utils/uri/Makefile.in
index 79ffe3d0..fc545060 100644
--- a/utils/uri/Makefile.in
+++ b/utils/uri/Makefile.in
@@ -24,7 +24,7 @@ ${BIN}: ${SRC}
 test:
 	@true
 
-install deinstall uninstall installation-manifest:
+install deinstall uninstall:
 	@true
 
 distclean: clean