Reorganize

svn path=/utils/Makefile; revision=1968

7 files changed, 54 insertions, 7 deletions

diff --git a/utils/Makefile b/utils/Makefile
index 9bc99598..07f45dff 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -1,6 +1,6 @@
 # $Id$
 
-SUBDIRS = uri manifest roa hashdir
+SUBDIRS = uri print_manifest print_roa hashdir find_roa
 
 all clean test:
 	@for i in ${SUBDIRS}; do echo "Making $@ in $$i"; (cd $$i && ${MAKE} $@); done
diff --git a/utils/find_roa/Makefile b/utils/find_roa/Makefile
new file mode 100644
index 00000000..7d47e9b6
--- /dev/null
+++ b/utils/find_roa/Makefile
@@ -0,0 +1,24 @@
+# $Id$
+
+OPENSSL_DIR = ../../openssl/openssl
+
+CFLAGS = -g -I${OPENSSL_DIR}/include
+
+# -H -Wl,-t
+
+NAME = find_roa
+
+BIN = ${NAME}
+OBJ = ${NAME}.o
+LIB = ${OPENSSL_DIR}/libcrypto.a
+
+all: ${BIN}
+
+clean:
+	rm -f ${BIN} ${OBJ}
+
+${BIN}: ${OBJ} ${LIB} Makefile
+	${CC} -g -o $@ ${OBJ} ${LIB}
+
+test:
+	@true
diff --git a/utils/find_roa/find_roa.c b/utils/find_roa/find_roa.c
new file mode 100644
index 00000000..10297296
--- /dev/null
+++ b/utils/find_roa/find_roa.c
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2006--2008  American Registry for Internet Numbers ("ARIN")
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ARIN DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ARIN BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* $Id$ */
+
+int main (int argc, char *argv[]) { return 1; }
diff --git a/utils/manifest/Makefile b/utils/print_manifest/Makefile
index 348487f8..17b0667a 100644
--- a/utils/manifest/Makefile
+++ b/utils/print_manifest/Makefile
@@ -6,8 +6,10 @@ CFLAGS = -g -I${OPENSSL_DIR}/include
 
 # -H -Wl,-t
 
-BIN = manifest
-OBJ = manifest.o
+NAME = print_manifest
+
+BIN = ${NAME}
+OBJ = ${NAME}.o
 LIB = ${OPENSSL_DIR}/libcrypto.a
 
 all: ${BIN}
@@ -22,4 +24,4 @@ MANIFEST_DIR = ../../rpkid/testbed.dir/publication
 
 test: all
 	-date -u +'now:            %Y%m%d%H%M%SZ'
-	if test -d ${MANIFEST_DIR}; then find ${MANIFEST_DIR} -type f -name '*.mnf' -print -exec ./manifest {} \; ; else :; fi
+	if test -d ${MANIFEST_DIR}; then find ${MANIFEST_DIR} -type f -name '*.mnf' -print -exec ./${BIN} {} \; ; else :; fi
diff --git a/utils/manifest/manifest.c b/utils/print_manifest/print_manifest.c
index be24a2f0..be24a2f0 100644
--- a/utils/manifest/manifest.c
+++ b/utils/print_manifest/print_manifest.c
diff --git a/utils/roa/Makefile b/utils/print_roa/Makefile
index b69c4862..6f1e71a6 100644
--- a/utils/roa/Makefile
+++ b/utils/print_roa/Makefile
@@ -6,8 +6,10 @@ CFLAGS = -g -I${OPENSSL_DIR}/include
 
 # -H -Wl,-t
 
-BIN = roa
-OBJ = roa.o
+NAME = print_roa
+
+BIN = ${NAME}
+OBJ = ${NAME}.o
 LIB = ${OPENSSL_DIR}/libcrypto.a
 
 all: ${BIN}
@@ -22,4 +24,4 @@ ROA_DIR = ../../rpkid/testbed.dir/publication
 
 test: all
 	-date -u +'now:            %Y%m%d%H%M%SZ'
-	if test -d ${ROA_DIR}; then find ${ROA_DIR} -type f -name '*.roa' -print -exec ./roa {} \; ; else :; fi
+	if test -d ${ROA_DIR}; then find ${ROA_DIR} -type f -name '*.roa' -print -exec ./${BIN} {} \; ; else :; fi
diff --git a/utils/roa/roa.c b/utils/print_roa/print_roa.c
index 5d43c36e..5d43c36e 100644
--- a/utils/roa/roa.c
+++ b/utils/print_roa/print_roa.c