diff options
| author | Michael Elkins <melkins@tislabs.com> | 2011-03-03 01:05:26 +0000 |
|---|---|---|
| committer | Michael Elkins <melkins@tislabs.com> | 2011-03-03 01:05:26 +0000 |
| commit | 1bf351fbcf68a81cac1f8ce7c0e0e155eb6093cb (patch) | |
| tree | 62090db6f8f301fea7cf4e1b10c09b46086999cd | |
| parent | 93328022a47ae7ac7a24b48d934ac430d99d8905 (diff) | |
add $SUBDIRS to $top/rpkid/Makefile.in and add portal-gui when django is detected by the configure script
svn path=/configure; revision=3710
| -rwxr-xr-x | configure | 7 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | rpkid/Makefile.in | 10 |
3 files changed, 20 insertions, 3 deletions
@@ -601,6 +601,7 @@ PYWRAP_CMD PYWRAP OPENSSL_SO_GLOB OPENSSL_CONFIG_COMMAND +RPKID_SUBDIRS TOP_LEVEL_SUBDIRS PYTHON SORT @@ -4155,6 +4156,12 @@ test $build_python = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS rpkid" +# Conditionally build subsets of the rpkid tools + RPKID_SUBDIRS="" +test $build_django = yes && RPKID_SUBDIRS="$RPKID_SUBDIRS portal-gui" + + + ac_config_files="$ac_config_files Makefile rcynic/Makefile rcynic/static-rsync/Makefile utils/Makefile utils/find_roa/Makefile utils/hashdir/Makefile utils/print_rpki_manifest/Makefile utils/print_roa/Makefile utils/uri/Makefile" diff --git a/configure.ac b/configure.ac index 21ff7873..ccbaaf01 100644 --- a/configure.ac +++ b/configure.ac @@ -231,6 +231,12 @@ test $build_python = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS rpkid" AC_SUBST(TOP_LEVEL_SUBDIRS) +# Conditionally build subsets of the rpkid tools + RPKID_SUBDIRS="" +test $build_django = yes && RPKID_SUBDIRS="$RPKID_SUBDIRS portal-gui" + +AC_SUBST(RPKID_SUBDIRS) + AC_CONFIG_FILES([Makefile rcynic/Makefile rcynic/static-rsync/Makefile diff --git a/rpkid/Makefile.in b/rpkid/Makefile.in index b6801cf9..6b135c6b 100644 --- a/rpkid/Makefile.in +++ b/rpkid/Makefile.in @@ -1,5 +1,6 @@ # $Id$ +SUBDIRS = @RPKID_SUBDIRS@ PYTHON = @PYTHON@ PYWRAP = @PYWRAP@ PYWRAP_CMD = @PYWRAP_CMD@ @@ -46,7 +47,7 @@ SCRIPTS = rpki-sql-backup rpki-sql-setup rpki-start-servers irbe_cli irdbd myrpk AUX_SCRIPTS = portal-gui/scripts/rpkigui-list-resources -all: ${POW_SO} rpki/relaxng.py myrpki.rng ${SCRIPTS} ${AUX_SCRIPTS} rpki/gui/settings.py rpki/gui/app/settings.py +all:: ${POW_SO} rpki/relaxng.py myrpki.rng ${SCRIPTS} ${AUX_SCRIPTS} rpki/gui/settings.py rpki/gui/app/settings.py ${POW_SO}: ext/POW.c setup.py ${SETUP_PY} build_ext --inplace @@ -81,10 +82,10 @@ clean:: cd tests; $(MAKE) $@ rm -f ${SCRIPTS} ${AUX_SCRIPTS} rpki/gui/settings.py -install: +install:: ${SETUP_PY} install --record installed -uninstall deinstall: +uninstall deinstall:: xargs rm -fv <installed distclean:: @@ -173,6 +174,9 @@ distclean:: clean docclean cd tests; ${MAKE} $@ rm -f TAGS rpki/__doc__.py Makefile +all install clean test distclean deinstall uninstall:: + @for i in ${SUBDIRS}; do echo "Making $@ in $$i"; (cd $$i && ${MAKE} $@); done + COMPILE_COMMON = \ export AC_PYTHON_INTERPRETER; \ if test -r $@; then chmod u+w $@; else :; fi; \ |