Start whacking Makefiles

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

8 files changed, 57 insertions, 343 deletions

diff --git a/rp/utils/Makefile.in b/rp/utils/Makefile.in
index c89fdff5..03c041a4 100644
--- a/rp/utils/Makefile.in
+++ b/rp/utils/Makefile.in
@@ -1,9 +1,62 @@
 # $Id$
 
-SUBDIRS = uri print_rpki_manifest print_roa hashdir find_roa scan_roas scan_routercerts
+CFLAGS		= @CFLAGS@
+LDFLAGS		= @LDFLAGS@
+LIBS		= @LIBS@
 
-all clean test distclean install deinstall uninstall::
-	@for i in ${SUBDIRS}; do echo "Making $@ in $$i"; (cd $$i && ${MAKE} $@); done
+INSTALL		= @INSTALL@ -m 555 
 
-distclean::
+prefix		= @prefix@
+exec_prefix	= @exec_prefix@
+datarootdir	= @datarootdir@
+datadir		= @datadir@
+localstatedir	= @localstatedir@
+sharedstatedir	= @sharedstatedir@
+sysconfdir	= @sysconfdir@
+bindir		= @bindir@
+sbindir		= @sbindir@
+libexecdir	= @libexecdir@
+libdir		= @libdir@
+
+abs_top_srcdir	 = @abs_top_srcdir@
+abs_top_builddir = @abs_top_builddir@
+
+BINS		= find_roa hashdir print_rpki_manifest print_roa scan_roas uri
+
+SCRIPTS		= scan_routercerts
+
+all: ${BINS}
+
+clean:
+	rm -rf ${BINS} *.o *.dSYM
+
+test:
+	@true
+
+install: all
+	if test -d ${DESTDIR}${bindir} ; then :; else ${INSTALL} -d ${DESTDIR}${bindir}; fi
+	${INSTALL} ${BINS} ${SCRIPTS} ${DESTDIR}${bindir}
+
+deinstall uninstall:
+	for i in ${BINS} ${SCRIPTS}; do rm -f ${DESTDIR}${bindir}/$$i; done
+
+distclean: clean
 	rm -f Makefile
+
+find_roa: find_roa.c
+	${CC} ${CFLAGS} -o $@ find_roa.c ${LDFLAGS} ${LIBS}
+
+hashdir: hashdir.c
+	${CC} ${CFLAGS} -o $@ hashdir.c ${LDFLAGS} ${LIBS}
+
+print_roa: print_roa.c
+	${CC} ${CFLAGS} -o $@ print_roa.c ${LDFLAGS} ${LIBS}
+
+print_rpki_manifest: print_rpki_manifest.c
+	${CC} ${CFLAGS} -o $@ print_rpki_manifest.c ${LDFLAGS} ${LIBS}
+
+scan_roas: scan_roas.c
+	${CC} ${CFLAGS} -o $@ scan_roas.c ${LDFLAGS} ${LIBS}
+
+uri: uri.c
+	${CC} ${CFLAGS} -o $@ uri.c ${LDFLAGS} ${LIBS}
diff --git a/rp/utils/find_roa/Makefile.in b/rp/utils/find_roa/Makefile.in
deleted file mode 100644
index 36c68e01..00000000
--- a/rp/utils/find_roa/Makefile.in
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id$
-
-NAME = find_roa
-
-BIN = ${NAME}
-SRC = ${NAME}.c
-OBJ = ${NAME}.o
-
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-
-INSTALL		= @INSTALL@ -m 555 
-
-prefix		= @prefix@
-exec_prefix	= @exec_prefix@
-datarootdir	= @datarootdir@
-datadir		= @datadir@
-localstatedir	= @localstatedir@
-sharedstatedir	= @sharedstatedir@
-sysconfdir	= @sysconfdir@
-bindir		= @bindir@
-sbindir		= @sbindir@
-libexecdir	= @libexecdir@
-libdir		= @libdir@
-
-abs_top_srcdir	 = @abs_top_srcdir@
-abs_top_builddir = @abs_top_builddir@
-
-all: ${BIN}
-
-clean:
-	rm -rf ${BIN} ${OBJ} ${BIN}.dSYM
-
-${BIN}: ${SRC}
-	${CC} ${CFLAGS} -o $@ ${SRC} ${LDFLAGS} ${LIBS}
-
-
-ROA_DIR = ${abs_top_builddir}/rcynic/rcynic-data/authenticated
-
-TEST_ARGS = ${ROA_DIR} 10.3.0.44 10.2.0.6 10.0.0.0/24
-
-test: ${BIN}
-#	if test -d ${ROA_DIR}; then ./${BIN} ${TEST_ARGS} ; else :; fi
-	if test -d ${ROA_DIR}; then sh ./test_roa.sh ${TEST_ARGS} ; else :; fi
-
-install: all
-	if test -d ${DESTDIR}${bindir} ; then :; else ${INSTALL} -d ${DESTDIR}${bindir}; fi
-	${INSTALL} ${BIN} ${DESTDIR}${bindir}
-
-deinstall uninstall:
-	rm -f ${DESTDIR}${bindir}/${BIN}
-
-distclean: clean
-	rm -rf hashed-pem-dir
-	rm -f Makefile
diff --git a/rp/utils/hashdir/Makefile.in b/rp/utils/hashdir/Makefile.in
deleted file mode 100644
index c0cf448a..00000000
--- a/rp/utils/hashdir/Makefile.in
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id$
-
-NAME = hashdir
-
-BIN = ${NAME}
-SRC = ${NAME}.c
-OBJ = ${NAME}.o
-
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-
-INSTALL		= @INSTALL@ -m 555 
-
-prefix		= @prefix@
-exec_prefix	= @exec_prefix@
-datarootdir	= @datarootdir@
-datadir		= @datadir@
-localstatedir	= @localstatedir@
-sharedstatedir	= @sharedstatedir@
-sysconfdir	= @sysconfdir@
-bindir		= @bindir@
-sbindir		= @sbindir@
-libexecdir	= @libexecdir@
-libdir		= @libdir@
-
-abs_top_srcdir	 = @abs_top_srcdir@
-abs_top_builddir = @abs_top_builddir@
-
-all: ${BIN}
-
-clean::
-	rm -rf ${BIN} ${OBJ} ${BIN}.dSYM
-
-${BIN}: ${SRC}
-	${CC} ${CFLAGS} -o $@ ${SRC} ${LDFLAGS} ${LIBS}
-
-INPUT  = ${abs_top_builddir}/rcynic/rcynic-data/authenticated
-OUTPUT = hashed-pem-dir
-
-test: ${BIN}
-	if test -d ${INPUT}; then rm -rf ${OUTPUT} && mkdir ${OUTPUT} && ./hashdir ${INPUT} ${OUTPUT}; else :; fi
-
-clean::
-	rm -rf ${OUTPUT}
-
-install: all
-	if test -d ${DESTDIR}${bindir} ; then :; else ${INSTALL} -d ${DESTDIR}${bindir}; fi
-	${INSTALL} ${BIN} ${DESTDIR}${bindir}
-
-deinstall uninstall:
-	rm -f ${DESTDIR}${bindir}/${BIN}
-
-distclean: clean
-	rm -f Makefile
diff --git a/rp/utils/print_roa/Makefile.in b/rp/utils/print_roa/Makefile.in
deleted file mode 100644
index 5999b351..00000000
--- a/rp/utils/print_roa/Makefile.in
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id$
-
-NAME = print_roa
-
-BIN = ${NAME}
-SRC = ${NAME}.c
-OBJ = ${NAME}.o
-
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-
-INSTALL		= @INSTALL@ -m 555 
-
-prefix		= @prefix@
-exec_prefix	= @exec_prefix@
-datarootdir	= @datarootdir@
-datadir		= @datadir@
-localstatedir	= @localstatedir@
-sharedstatedir	= @sharedstatedir@
-sysconfdir	= @sysconfdir@
-bindir		= @bindir@
-sbindir		= @sbindir@
-libexecdir	= @libexecdir@
-libdir		= @libdir@
-
-abs_top_srcdir	 = @abs_top_srcdir@
-abs_top_builddir = @abs_top_builddir@
-
-all: ${BIN}
-
-clean:
-	rm -rf ${BIN} ${OBJ} ${BIN}.dSYM
-
-${BIN}: ${SRC}
-	${CC} ${CFLAGS} -o $@ ${SRC} ${LDFLAGS} ${LIBS}
-
-ROA_DIR = ${abs_top_builddir}/rpkid/tests/smoketest.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 ./${BIN} {} \; ; else :; fi
-
-install: all
-	if test -d ${DESTDIR}${bindir} ; then :; else ${INSTALL} -d ${DESTDIR}${bindir}; fi
-	${INSTALL} ${BIN} ${DESTDIR}${bindir}
-
-deinstall uninstall:
-	rm -f ${DESTDIR}${bindir}/${BIN}
-
-distclean: clean
-	rm -f Makefile
diff --git a/rp/utils/print_rpki_manifest/Makefile.in b/rp/utils/print_rpki_manifest/Makefile.in
deleted file mode 100644
index 22f1b16b..00000000
--- a/rp/utils/print_rpki_manifest/Makefile.in
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id$
-
-NAME = print_rpki_manifest
-
-BIN = ${NAME}
-SRC = ${NAME}.c
-OBJ = ${NAME}.o
-
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-
-INSTALL		= @INSTALL@ -m 555 
-
-prefix		= @prefix@
-exec_prefix	= @exec_prefix@
-datarootdir	= @datarootdir@
-datadir		= @datadir@
-localstatedir	= @localstatedir@
-sharedstatedir	= @sharedstatedir@
-sysconfdir	= @sysconfdir@
-bindir		= @bindir@
-sbindir		= @sbindir@
-libexecdir	= @libexecdir@
-libdir		= @libdir@
-
-abs_top_srcdir	 = @abs_top_srcdir@
-abs_top_builddir = @abs_top_builddir@
-
-all: ${BIN}
-
-clean:
-	rm -rf ${BIN} ${OBJ} ${BIN}.dSYM
-
-${BIN}: ${SRC}
-	${CC} ${CFLAGS} -o $@ ${SRC} ${LDFLAGS} ${LIBS}
-
-MANIFEST_DIR = ${abs_top_builddir}/rpkid/tests/smoketest.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 ./${BIN} {} \; ; else :; fi
-
-install: all
-	if test -d ${DESTDIR}${bindir} ; then :; else ${INSTALL} -d ${DESTDIR}${bindir}; fi
-	${INSTALL} ${BIN} ${DESTDIR}${bindir}
-
-deinstall uninstall:
-	rm -f ${DESTDIR}${bindir}/${BIN}
-
-distclean: clean
-	rm -f Makefile
diff --git a/rp/utils/scan_roas/Makefile.in b/rp/utils/scan_roas/Makefile.in
deleted file mode 100644
index 7707969c..00000000
--- a/rp/utils/scan_roas/Makefile.in
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id$
-
-NAME = scan_roas
-
-BIN = ${NAME}
-SRC = ${NAME}.c
-OBJ = ${NAME}.o
-
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-
-INSTALL		= @INSTALL@ -m 555 
-
-prefix		= @prefix@
-exec_prefix	= @exec_prefix@
-datarootdir	= @datarootdir@
-datadir		= @datadir@
-localstatedir	= @localstatedir@
-sharedstatedir	= @sharedstatedir@
-sysconfdir	= @sysconfdir@
-bindir		= @bindir@
-sbindir		= @sbindir@
-libexecdir	= @libexecdir@
-libdir		= @libdir@
-
-abs_top_srcdir	 = @abs_top_srcdir@
-abs_top_builddir = @abs_top_builddir@
-
-all: ${BIN}
-
-clean:
-	rm -rf ${BIN} ${OBJ} ${BIN}.dSYM
-
-${BIN}: ${SRC}
-	${CC} ${CFLAGS} -o $@ ${SRC} ${LDFLAGS} ${LIBS}
-
-ROA_DIR = ${abs_top_builddir}/rpkid/tests/smoketest.dir/publication
-
-test: all
-	-date -u +'now:            %Y%m%d%H%M%SZ'
-	if test -d ${ROA_DIR}; then  ./${BIN} ${ROA_DIR} ; else :; fi
-
-install: all
-	if test -d ${DESTDIR}${bindir} ; then :; else ${INSTALL} -d ${DESTDIR}${bindir}; fi
-	${INSTALL} ${BIN} ${DESTDIR}${bindir}
-
-deinstall uninstall:
-	rm -f ${DESTDIR}${bindir}/${BIN}
-
-distclean: clean
-	rm -f Makefile
diff --git a/rp/utils/scan_routercerts/Makefile.in b/rp/utils/scan_routercerts/Makefile.in
deleted file mode 100644
index 715d1325..00000000
--- a/rp/utils/scan_routercerts/Makefile.in
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id$
-
-NAME = scan_routercerts
-
-BIN = ${NAME}
-
-INSTALL		= @INSTALL@ -m 555 
-
-prefix		= @prefix@
-exec_prefix	= @exec_prefix@
-datarootdir	= @datarootdir@
-datadir		= @datadir@
-localstatedir	= @localstatedir@
-sharedstatedir	= @sharedstatedir@
-sysconfdir	= @sysconfdir@
-bindir		= @bindir@
-sbindir		= @sbindir@
-libexecdir	= @libexecdir@
-libdir		= @libdir@
-
-abs_top_srcdir	 = @abs_top_srcdir@
-abs_top_builddir = @abs_top_builddir@
-
-all clean:
-	@true
-
-ROUTERCERT_DIR = ${abs_top_builddir}/rpkid/tests/smoketest.dir/publication
-
-test: all
-	-date -u +'now:            %Y%m%d%H%M%SZ'
-	if test -d ${ROUTERCERT_DIR}; then ./${BIN} ; else :; fi
-
-install: all
-	if test -d ${DESTDIR}${bindir} ; then :; else ${INSTALL} -d ${DESTDIR}${bindir}; fi
-	${INSTALL} ${BIN} ${DESTDIR}${bindir}
-
-deinstall uninstall:
-	rm -f ${DESTDIR}${bindir}/${BIN}
-
-distclean: clean
-	rm -f Makefile
diff --git a/rp/utils/uri/Makefile.in b/rp/utils/uri/Makefile.in
deleted file mode 100644
index fc545060..00000000
--- a/rp/utils/uri/Makefile.in
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id$
-
-NAME = uri
-
-BIN = ${NAME}
-SRC = ${NAME}.c
-OBJ = ${NAME}.o
-
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-
-abs_top_srcdir	 = @abs_top_srcdir@
-abs_top_builddir = @abs_top_builddir@
-
-all: ${BIN}
-
-clean:
-	rm -rf ${BIN} ${OBJ} ${BIN}.dSYM
-
-${BIN}: ${SRC}
-	${CC} ${CFLAGS} -o $@ ${SRC} ${LDFLAGS} ${LIBS}
-
-test:
-	@true
-
-install deinstall uninstall:
-	@true
-
-distclean: clean
-	rm -f Makefile