Start whacking Makefiles

svn path=/branches/tk685/; revision=5758

1 files changed, 3 insertions, 84 deletions

diff --git a/ca/Makefile.in b/ca/Makefile.in
index d36a3163..0764edc1 100644
--- a/ca/Makefile.in
+++ b/ca/Makefile.in
@@ -33,58 +33,12 @@ APACHE_VERSION			= @APACHE_VERSION@
 WSGI_PYTHON_EGG_CACHE_DIR	= @WSGI_PYTHON_EGG_CACHE_DIR@
 WSGI_PYTHON_EGG_CACHE_USER	= @WSGI_PYTHON_EGG_CACHE_USER@
 
-RPKID_INSTALL_TARGETS	= @RPKID_INSTALL_TARGETS@
-
-SETUP_PY_INSTALL_LAYOUT = @SETUP_PY_INSTALL_LAYOUT@
-
-SETUP_PY_ROOT = `${PYTHON} -c 'import sys; print "--root " + sys.argv[1] if sys.argv[1] else ""' '${DESTDIR}'`
-
-POW_SO = rpki/POW/_POW.so
-
-all:: rpki/autoconf.py setup_autoconf.py rpki/relaxng.py myrpki.rng rpki/sql_schemas.py ${POW_SO} build/stamp
-
-.FORCE:
-
-${POW_SO}: .FORCE setup_autoconf.py
-	${PYTHON} setup.py build_ext --inplace
-
-build/stamp: .FORCE setup_autoconf.py
-	${PYTHON} setup.py build
-	touch $@
+CA_INSTALL_TARGETS	= @CA_INSTALL_TARGETS@
 
 clean::
-	rm -rf ${POW_SO} build dist
-
-RNGS = left-right-schema.rng up-down-schema.rng publication-schema.rng myrpki.rng router-certificate-schema.rng
-
-rpki/relaxng.py: ${abs_top_srcdir}/buildtools/make-relaxng.py ${RNGS}
-	${PYTHON} ${abs_top_srcdir}/buildtools/make-relaxng.py ${RNGS} >$@.tmp
-	mv $@.tmp $@
-
-left-right-schema.rng: left-right-schema.rnc
-	${TRANG} left-right-schema.rnc left-right-schema.rng
-
-up-down-schema.rng: up-down-schema.rnc
-	${TRANG} up-down-schema.rnc up-down-schema.rng
-
-publication-schema.rng: publication-schema.rnc
-	${TRANG} publication-schema.rnc publication-schema.rng
-
-myrpki.rng: myrpki.rnc
-	${TRANG} myrpki.rnc myrpki.rng
-
-router-certificate-schema.rng: router-certificate-schema.rnc
-	${TRANG} router-certificate-schema.rnc router-certificate-schema.rng
-
-rpki/sql_schemas.py: ${abs_top_srcdir}/buildtools/make-sql-schemas.py rpkid.sql pubd.sql
-	${PYTHON} ${abs_top_srcdir}/buildtools/make-sql-schemas.py >$@.tmp
-	mv $@.tmp $@
-
-clean::
-	find . -type f -name '*.py[co]' -delete
 	cd tests; $(MAKE) $@
 
-install:: ${RPKID_INSTALL_TARGETS}
+install:: ${CA_INSTALL_TARGETS}
 
 install-always:: all
 	${PYTHON} setup.py install ${SETUP_PY_ROOT} ${SETUP_PY_INSTALL_LAYOUT} --record installed
@@ -171,7 +125,7 @@ distclean:: clean docclean
 
 all:: examples/rpki.conf
 
-examples/rpki.conf: rpki/autoconf.py rpki-confgen rpki-confgen.xml
+examples/rpki.conf: ${abs_top_srcdir}/rpki/autoconf.py rpki-confgen rpki-confgen.xml
 	${PYTHON} rpki-confgen \
 		--read-xml rpki-confgen.xml \
 		--autoconf \
@@ -185,41 +139,6 @@ examples/rpki.conf: rpki/autoconf.py rpki-confgen rpki-confgen.xml
 clean::
 	rm -f examples/rpki.conf
 
-rpki/autoconf.py: Makefile
-	@echo 'Generating $@';							\
-	(echo '# Automatically generated.  DO NOT EDIT.';			\
-	 echo ;									\
-	 echo 'bindir	      = "${bindir}"';					\
-	 echo 'datarootdir    = "${datarootdir}"';				\
-	 echo 'localstatedir  = "${localstatedir}"';				\
-	 echo 'sbindir	      = "${sbindir}"';					\
-	 echo 'sharedstatedir = "${sharedstatedir}"';				\
-	 echo 'sysconfdir     = "${sysconfdir}"';				\
-	 echo 'libexecdir     = "${libexecdir}"';				\
-	 echo ;									\
-	 echo 'WSGI_DAEMON_PROCESS	    = "${WSGI_DAEMON_PROCESS}"';	\
-	 echo 'WSGI_PROCESS_GROUP	    = "${WSGI_PROCESS_GROUP}"';		\
-	 echo 'RCYNIC_HTML_DIR		    = "${RCYNIC_HTML_DIR}"';		\
-	 echo 'APACHE_VERSION		    = "${APACHE_VERSION}"';		\
-	 echo 'WSGI_PYTHON_EGG_CACHE_DIR    = "${WSGI_PYTHON_EGG_CACHE_DIR}"';	\
-	 echo 'WSGI_PYTHON_EGG_CACHE_USER   = "${WSGI_PYTHON_EGG_CACHE_USER}"';	\
-	) > $@
-
-clean::
-	rm -f rpki/autoconf.py
-
-setup_autoconf.py: rpki/autoconf.py
-	@echo 'Generating $@';					\
-	(cat rpki/autoconf.py;					\
-	 echo ;							\
-	 echo 'CFLAGS         = """${CFLAGS}"""';               \
-	 echo 'LDFLAGS        = """${LDFLAGS}"""';              \
-	 echo 'LIBS           = """${LIBS}"""';                 \
-	) > $@
-
-clean::
-	rm -f setup_autoconf.py setup_autoconf.pyc
-
 install-postconf: \
 	install-user install-egg-cache install-conf install-apache install-mysql install-django install-bpki install-cron