Start whacking Makefiles

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

1 files changed, 31 insertions, 42 deletions

diff --git a/configure b/configure
index 4a512935..711ec03d 100755
--- a/configure
+++ b/configure
@@ -582,7 +582,7 @@ PACKAGE_STRING='rpkitools 1.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
-ac_unique_file="rcynic/rcynic.c"
+ac_unique_file="rp/rcynic/rcynic.c"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -629,7 +629,7 @@ TOP_LEVEL_SUBDIRS
 WSGI_PYTHON_EGG_CACHE_USER
 WSGI_PYTHON_EGG_CACHE_DIR
 SETUP_PY_INSTALL_LAYOUT
-RPKID_INSTALL_TARGETS
+CA_INSTALL_TARGETS
 RTR_ORIGIN_INSTALL_TARGETS
 RCYNIC_INSTALL_TARGETS
 RCYNIC_HTML_DIR
@@ -714,7 +714,7 @@ PATH_SEPARATOR
 SHELL'
 ac_subst_files='RCYNIC_MAKE_RULES
 RTR_ORIGIN_MAKE_RULES
-RPKID_MAKE_RULES'
+CA_MAKE_RULES'
 ac_user_opts='
 enable_option_checking
 with_system_openssl
@@ -4571,28 +4571,28 @@ $as_echo "$enable_target_installation" >&6; }
 # rcynic jail setup is complicated enough that it's simplest to have
 # different rule sets for different platforms.  Icky, but....
 # rpki-rtr isn't as complicated, but has similar issues, same hack.
-# rpkid isn't as complicated either, but same hack.
+# ca isn't as complicated either, but same hack.
 
 case $host_os in
 	darwin*)
-		RCYNIC_MAKE_RULES='rcynic/rules.darwin.mk'
-		RTR_ORIGIN_MAKE_RULES='rtr-origin/rules.darwin.mk'
-		RPKID_MAKE_RULES='rpkid/rules.darwin.mk'
+		RCYNIC_MAKE_RULES='rp/rcynic/rules.darwin.mk'
+		RTR_ORIGIN_MAKE_RULES='rp/rtr-origin/rules.darwin.mk'
+		CA_MAKE_RULES='ca/rules.darwin.mk'
 		;;
 	freebsd*)
-		RCYNIC_MAKE_RULES='rcynic/rules.freebsd.mk'
-		RTR_ORIGIN_MAKE_RULES='rtr-origin/rules.freebsd.mk'
-		RPKID_MAKE_RULES='rpkid/rules.freebsd.mk'
+		RCYNIC_MAKE_RULES='rp/rcynic/rules.freebsd.mk'
+		RTR_ORIGIN_MAKE_RULES='rp/rtr-origin/rules.freebsd.mk'
+		CA_MAKE_RULES='ca/rules.freebsd.mk'
 		;;
 	linux*)
-		RCYNIC_MAKE_RULES='rcynic/rules.linux.mk'
-		RTR_ORIGIN_MAKE_RULES='rtr-origin/rules.linux.mk'
-		RPKID_MAKE_RULES='rpkid/rules.linux.mk'
+		RCYNIC_MAKE_RULES='rp/rcynic/rules.linux.mk'
+		RTR_ORIGIN_MAKE_RULES='rp/rtr-origin/rules.linux.mk'
+		CA_MAKE_RULES='ca/rules.linux.mk'
 		;;
 	*)
-		RCYNIC_MAKE_RULES='rcynic/rules.unknown.mk'
-		RTR_ORIGIN_MAKE_RULES='rtr-origin/rules.unknown.mk'
-		RPKID_MAKE_RULES='rpkid/rules.unknown.mk'
+		RCYNIC_MAKE_RULES='rp/rcynic/rules.unknown.mk'
+		RTR_ORIGIN_MAKE_RULES='rp/rtr-origin/rules.unknown.mk'
+		CA_MAKE_RULES='ca/rules.unknown.mk'
 		;;
 esac
 
@@ -4629,7 +4629,7 @@ esac
 
 RCYNIC_INSTALL_TARGETS='install-always'
 RTR_ORIGIN_INSTALL_TARGETS='install-always'
-RPKID_INSTALL_TARGETS='install-always'
+CA_INSTALL_TARGETS='install-always'
 
 if test $use_rcynic_jail = yes
 then
@@ -4640,7 +4640,7 @@ if test $enable_target_installation = yes
 then
 	RCYNIC_INSTALL_TARGETS="$RCYNIC_INSTALL_TARGETS install-postconf"
 	RTR_ORIGIN_INSTALL_TARGETS="$RTR_ORIGIN_INSTALL_TARGETS install-postconf"
-	RPKID_INSTALL_TARGETS="$RPKID_INSTALL_TARGETS install-postconf"
+	CA_INSTALL_TARGETS="$CA_INSTALL_TARGETS install-postconf"
 fi
 
 
@@ -4992,20 +4992,14 @@ fi
 
 			      TOP_LEVEL_SUBDIRS="h"
 test $build_openssl  = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS openssl"
-test $build_rp_tools = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS rcynic utils rtr-origin"
-test $build_ca_tools = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS rpkid"
+test $build_rp_tools = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS rp"
+test $build_ca_tools = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS ca"
 
 
 
-ac_config_files="$ac_config_files Makefile h/Makefile"
+ac_config_files="$ac_config_files Makefile h/Makefile schemas/Makefile"
 
 
-if test "X$RCYNIC_STATIC_RSYNC" != "X"
-then
-	ac_config_files="$ac_config_files rcynic/static-rsync/Makefile"
-
-fi
-
 # OpenSSL has its own build system that bears no relationship to
 # anything but itself, and our use of it is a bit weird, so this is a
 # BFMI (Brute Force and Massive Ignorance) job.
@@ -5062,13 +5056,13 @@ fi
 
 if test $build_rp_tools = yes
 then
-	ac_config_files="$ac_config_files rcynic/Makefile utils/Makefile utils/find_roa/Makefile utils/hashdir/Makefile utils/print_rpki_manifest/Makefile utils/print_roa/Makefile utils/scan_roas/Makefile utils/scan_routercerts/Makefile utils/uri/Makefile rtr-origin/Makefile"
+	ac_config_files="$ac_config_files rp/Makefile rp/rcynic/Makefile rp/rcynic/static-rsync/Makefile rp/utils/Makefile rp/rtr-origin/Makefile"
 
 fi
 
 if test $build_ca_tools = yes
 then
-	ac_config_files="$ac_config_files rpkid/Makefile rpkid/tests/Makefile"
+	ac_config_files="$ac_config_files ca/Makefile ca/tests/Makefile"
 
 fi
 
@@ -5809,21 +5803,16 @@ do
   case $ac_config_target in
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "h/Makefile") CONFIG_FILES="$CONFIG_FILES h/Makefile" ;;
-    "rcynic/static-rsync/Makefile") CONFIG_FILES="$CONFIG_FILES rcynic/static-rsync/Makefile" ;;
+    "schemas/Makefile") CONFIG_FILES="$CONFIG_FILES schemas/Makefile" ;;
     "openssl/Makefile") CONFIG_FILES="$CONFIG_FILES openssl/Makefile" ;;
     "openssl/tests/Makefile") CONFIG_FILES="$CONFIG_FILES openssl/tests/Makefile" ;;
-    "rcynic/Makefile") CONFIG_FILES="$CONFIG_FILES rcynic/Makefile" ;;
-    "utils/Makefile") CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;;
-    "utils/find_roa/Makefile") CONFIG_FILES="$CONFIG_FILES utils/find_roa/Makefile" ;;
-    "utils/hashdir/Makefile") CONFIG_FILES="$CONFIG_FILES utils/hashdir/Makefile" ;;
-    "utils/print_rpki_manifest/Makefile") CONFIG_FILES="$CONFIG_FILES utils/print_rpki_manifest/Makefile" ;;
-    "utils/print_roa/Makefile") CONFIG_FILES="$CONFIG_FILES utils/print_roa/Makefile" ;;
-    "utils/scan_roas/Makefile") CONFIG_FILES="$CONFIG_FILES utils/scan_roas/Makefile" ;;
-    "utils/scan_routercerts/Makefile") CONFIG_FILES="$CONFIG_FILES utils/scan_routercerts/Makefile" ;;
-    "utils/uri/Makefile") CONFIG_FILES="$CONFIG_FILES utils/uri/Makefile" ;;
-    "rtr-origin/Makefile") CONFIG_FILES="$CONFIG_FILES rtr-origin/Makefile" ;;
-    "rpkid/Makefile") CONFIG_FILES="$CONFIG_FILES rpkid/Makefile" ;;
-    "rpkid/tests/Makefile") CONFIG_FILES="$CONFIG_FILES rpkid/tests/Makefile" ;;
+    "rp/Makefile") CONFIG_FILES="$CONFIG_FILES rp/Makefile" ;;
+    "rp/rcynic/Makefile") CONFIG_FILES="$CONFIG_FILES rp/rcynic/Makefile" ;;
+    "rp/rcynic/static-rsync/Makefile") CONFIG_FILES="$CONFIG_FILES rp/rcynic/static-rsync/Makefile" ;;
+    "rp/utils/Makefile") CONFIG_FILES="$CONFIG_FILES rp/utils/Makefile" ;;
+    "rp/rtr-origin/Makefile") CONFIG_FILES="$CONFIG_FILES rp/rtr-origin/Makefile" ;;
+    "ca/Makefile") CONFIG_FILES="$CONFIG_FILES ca/Makefile" ;;
+    "ca/tests/Makefile") CONFIG_FILES="$CONFIG_FILES ca/tests/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac