From 73e5d62ba08c2eda82be9d5e5ebc6a817850e9cc Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Tue, 28 Dec 2010 20:39:45 +0000 Subject: More autoconf. svn path=/configure; revision=3579 --- configure | 110 ++++++++++++++++----------------------- configure.ac | 105 +++++++++++++++---------------------- utils/Makefile | 9 ---- utils/Makefile.in | 9 ++++ utils/find_roa/Makefile | 27 ---------- utils/find_roa/Makefile.in | 27 ++++++++++ utils/hashdir/Makefile | 28 ---------- utils/hashdir/Makefile.in | 28 ++++++++++ utils/print_manifest/Makefile | 27 ---------- utils/print_manifest/Makefile.in | 27 ++++++++++ utils/print_roa/Makefile | 27 ---------- utils/print_roa/Makefile.in | 27 ++++++++++ utils/uri/Makefile | 22 -------- utils/uri/Makefile.in | 22 ++++++++ 14 files changed, 228 insertions(+), 267 deletions(-) delete mode 100644 utils/Makefile create mode 100644 utils/Makefile.in delete mode 100644 utils/find_roa/Makefile create mode 100644 utils/find_roa/Makefile.in delete mode 100644 utils/hashdir/Makefile create mode 100644 utils/hashdir/Makefile.in delete mode 100644 utils/print_manifest/Makefile create mode 100644 utils/print_manifest/Makefile.in delete mode 100644 utils/print_roa/Makefile create mode 100644 utils/print_roa/Makefile.in delete mode 100644 utils/uri/Makefile create mode 100644 utils/uri/Makefile.in diff --git a/configure b/configure index a28610fa..f810887a 100755 --- a/configure +++ b/configure @@ -696,11 +696,11 @@ CPP GREP EGREP LD_STATIC_FLAG -OPENSSL_CONFIG_COMMAND XSLTPROC AWK PYTHON TOP_LEVEL_SUBDIRS +OPENSSL_CONFIG_COMMAND PYWRAP LIBOBJS LTLIBOBJS' @@ -3894,27 +3894,6 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ LDFLAGS="$old_LDFLAGS" unset old_LDFLAGS -# OpenSSL has its own build system that bears no relationship to -# anything but itself. On at least one platform, OpenSSL's opinion on -# the right thing to do is so completely at odds with everything else -# that the resulting libraries require special compilation options for -# any program that wants to use them. Feh. - -{ $as_echo "$as_me:$LINENO: checking what configuration target to use when building OpenSSL" >&5 -$as_echo_n "checking what configuration target to use when building OpenSSL... " >&6; } -OPENSSL_CONFIG_COMMAND='./config' -case $host in -i*86-apple-darwin*) - if test "$ac_cv_sizeof_long" = 8 - then - OPENSSL_CONFIG_COMMAND='./Configure darwin64-x86_64-cc' - fi - ;; -esac - -{ $as_echo "$as_me:$LINENO: result: $OPENSSL_CONFIG_COMMAND" >&5 -$as_echo "$OPENSSL_CONFIG_COMMAND" >&6; } - # Extract the first word of "xsltproc", so it can be a program name with args. set dummy xsltproc; ac_word=$2 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -4511,48 +4490,49 @@ $as_echo "$as_me: error: Need Python sources to build extension module, either i { (exit 1); exit 1; }; } fi -# Maze of Python-related tests is complicated. -# -# - If we don't have Python at all, we can't run any of the Python -# tools and probably should not even attempt to configure them. -# -# - If the system Python executable was linked against OpenSSL -and- -# we had to build our own copy of OpenSSL (because the system copy -# wasn't good enough), we need to build pywrap and configure scripts -# to use it. -# -# - Otherwise (we have python and it's not linked against the wrong -# version of OpenSSL), we can use the system Python executable and -# don't need pywrap. -# -# - Unless we're punting on Python entirely, we need to build POW, -# either against the system OpenSSL or against our own copy. -# -# - If we're building either POW or pywrap, we need Python.h. -# -# If any of this fails, we need to tell the user and give useful hint -# on what to do next (doc reference, whatever). +# Figure out which parts of this package we have to build. + + TOP_LEVEL_SUBDIRS="" +test $build_openssl = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS openssl" + TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS rcynic utils" +test $build_pywrap = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS pywrap" +test $build_python = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS pow rpkid" + -TOP_LEVEL_SUBDIRS="" + +ac_config_files="$ac_config_files Makefile rcynic/Makefile utils/Makefile utils/find_roa/Makefile utils/hashdir/Makefile utils/print_manifest/Makefile utils/print_roa/Makefile utils/uri/Makefile" + + +# OpenSSL has its own build system that bears no relationship to +# anything but itself. On at least one platform, OpenSSL's opinion on +# the right thing to do is so completely at odds with everything else +# that the resulting libraries require special compilation options for +# any program that wants to use them. Feh. +# +# Don't bother with this unless we're building our own OpenSSL. if test $build_openssl = yes then - TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS openssl" -fi + ac_config_files="$ac_config_files openssl/Makefile" -TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS rcynic utils" -if test $build_pywrap = yes -then - TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS pywrap" -fi + { $as_echo "$as_me:$LINENO: checking what configuration target to use when building OpenSSL" >&5 +$as_echo_n "checking what configuration target to use when building OpenSSL... " >&6; } + OPENSSL_CONFIG_COMMAND='./config' + case $host in + i*86-apple-darwin*) + if test "$ac_cv_sizeof_long" = 8 + then + OPENSSL_CONFIG_COMMAND='./Configure darwin64-x86_64-cc' + fi + ;; + esac -if test $build_python = yes -then - TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS pow rpkid" + { $as_echo "$as_me:$LINENO: result: $OPENSSL_CONFIG_COMMAND" >&5 +$as_echo "$OPENSSL_CONFIG_COMMAND" >&6; } fi - +# Sort out which interpreter POW-using Python programs should use. if test $build_pywrap = yes then @@ -4600,12 +4580,8 @@ then fi -# This isn't the complete list of Makefiles (let alone setup.py, etc -# files) in this tree, just the ones we're customizing today. At some -# point I should do a pass through the rest of the tree, making clever -# use of abs_top_builddir, etc. - -ac_config_files="$ac_config_files Makefile openssl/Makefile rcynic/Makefile rpkid/rpki/__doc__.py" +# This should go away once its content has migrated from Doxygen into DocBook. +ac_config_files="$ac_config_files rpkid/rpki/__doc__.py" cat >confcache <<\_ACEOF @@ -5210,6 +5186,15 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "rcynic/show.sh") CONFIG_FILES="$CONFIG_FILES rcynic/show.sh" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES 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_manifest/Makefile") CONFIG_FILES="$CONFIG_FILES utils/print_manifest/Makefile" ;; + "utils/print_roa/Makefile") CONFIG_FILES="$CONFIG_FILES utils/print_roa/Makefile" ;; + "utils/uri/Makefile") CONFIG_FILES="$CONFIG_FILES utils/uri/Makefile" ;; + "openssl/Makefile") CONFIG_FILES="$CONFIG_FILES openssl/Makefile" ;; "rpkid/backup-sql") CONFIG_FILES="$CONFIG_FILES rpkid/backup-sql:buildtools/python-header:rpkid/backup-sql.py" ;; "rpkid/sql-setup") CONFIG_FILES="$CONFIG_FILES rpkid/sql-setup:buildtools/python-header:rpkid/sql-setup.py" ;; "rpkid/start-servers") CONFIG_FILES="$CONFIG_FILES rpkid/start-servers:buildtools/python-header:rpkid/start-servers.py" ;; @@ -5224,9 +5209,6 @@ do "rpkid/tests/smoketest") CONFIG_FILES="$CONFIG_FILES rpkid/tests/smoketest:buildtools/pywrap-header:rpkid/tests/smoketest.py" ;; "rpkid/tests/yamltest") CONFIG_FILES="$CONFIG_FILES rpkid/tests/yamltest:buildtools/pywrap-header:rpkid/tests/yamltest.py" ;; "rpkid/tests/testpoke") CONFIG_FILES="$CONFIG_FILES rpkid/tests/testpoke:buildtools/pywrap-header:rpkid/tests/testpoke.py" ;; - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "openssl/Makefile") CONFIG_FILES="$CONFIG_FILES openssl/Makefile" ;; - "rcynic/Makefile") CONFIG_FILES="$CONFIG_FILES rcynic/Makefile" ;; "rpkid/rpki/__doc__.py") CONFIG_FILES="$CONFIG_FILES rpkid/rpki/__doc__.py" ;; *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 diff --git a/configure.ac b/configure.ac index 54cc89a4..cfe4e7a0 100644 --- a/configure.ac +++ b/configure.ac @@ -38,31 +38,13 @@ AC_SUBST(LD_STATIC_FLAG) LDFLAGS="$old_LDFLAGS" unset old_LDFLAGS -# OpenSSL has its own build system that bears no relationship to -# anything but itself. On at least one platform, OpenSSL's opinion on -# the right thing to do is so completely at odds with everything else -# that the resulting libraries require special compilation options for -# any program that wants to use them. Feh. - -AC_MSG_CHECKING([what configuration target to use when building OpenSSL]) -OPENSSL_CONFIG_COMMAND='./config' -case $host in -i*86-apple-darwin*) - if test "$ac_cv_sizeof_long" = 8 - then - OPENSSL_CONFIG_COMMAND='./Configure darwin64-x86_64-cc' - fi - ;; -esac -AC_SUBST(OPENSSL_CONFIG_COMMAND) -AC_MSG_RESULT([$OPENSSL_CONFIG_COMMAND]) - AC_PATH_PROG([XSLTPROC], [xsltproc]) AC_PATH_PROG([AWK], [awk]) if test "x$XSLTPROC" != "x" && test "x$AWK" != "x" then - AC_CONFIG_FILES([rcynic/show.sh], [chmod +x rcynic/show.sh]) + AC_CONFIG_FILES([rcynic/show.sh], + [chmod +x rcynic/show.sh]) fi # Figure out whether we need to build our own OpenSSL library or can @@ -211,48 +193,52 @@ then AC_MSG_ERROR([Need Python sources to build extension module, either install sources or rerun with --disable-python]) fi -# Maze of Python-related tests is complicated. -# -# - If we don't have Python at all, we can't run any of the Python -# tools and probably should not even attempt to configure them. -# -# - If the system Python executable was linked against OpenSSL -and- -# we had to build our own copy of OpenSSL (because the system copy -# wasn't good enough), we need to build pywrap and configure scripts -# to use it. -# -# - Otherwise (we have python and it's not linked against the wrong -# version of OpenSSL), we can use the system Python executable and -# don't need pywrap. -# -# - Unless we're punting on Python entirely, we need to build POW, -# either against the system OpenSSL or against our own copy. -# -# - If we're building either POW or pywrap, we need Python.h. -# -# If any of this fails, we need to tell the user and give useful hint -# on what to do next (doc reference, whatever). +# Figure out which parts of this package we have to build. -TOP_LEVEL_SUBDIRS="" + TOP_LEVEL_SUBDIRS="" +test $build_openssl = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS openssl" + TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS rcynic utils" +test $build_pywrap = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS pywrap" +test $build_python = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS pow rpkid" -if test $build_openssl = yes -then - TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS openssl" -fi +AC_SUBST(TOP_LEVEL_SUBDIRS) -TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS rcynic utils" +AC_CONFIG_FILES([Makefile + rcynic/Makefile + utils/Makefile + utils/find_roa/Makefile + utils/hashdir/Makefile + utils/print_manifest/Makefile + utils/print_roa/Makefile + utils/uri/Makefile]) -if test $build_pywrap = yes -then - TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS pywrap" -fi +# OpenSSL has its own build system that bears no relationship to +# anything but itself. On at least one platform, OpenSSL's opinion on +# the right thing to do is so completely at odds with everything else +# that the resulting libraries require special compilation options for +# any program that wants to use them. Feh. +# +# Don't bother with this unless we're building our own OpenSSL. -if test $build_python = yes +if test $build_openssl = yes then - TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS pow rpkid" + AC_CONFIG_FILES([openssl/Makefile]) + + AC_MSG_CHECKING([what configuration target to use when building OpenSSL]) + OPENSSL_CONFIG_COMMAND='./config' + case $host in + i*86-apple-darwin*) + if test "$ac_cv_sizeof_long" = 8 + then + OPENSSL_CONFIG_COMMAND='./Configure darwin64-x86_64-cc' + fi + ;; + esac + AC_SUBST(OPENSSL_CONFIG_COMMAND) + AC_MSG_RESULT([$OPENSSL_CONFIG_COMMAND]) fi -AC_SUBST(TOP_LEVEL_SUBDIRS) +# Sort out which interpreter POW-using Python programs should use. if test $build_pywrap = yes then @@ -286,14 +272,7 @@ then AC_CONFIG_FILES([rpkid/tests/testpoke:buildtools/pywrap-header:rpkid/tests/testpoke.py], [chmod +x rpkid/tests/testpoke]) fi -# This isn't the complete list of Makefiles (let alone setup.py, etc -# files) in this tree, just the ones we're customizing today. At some -# point I should do a pass through the rest of the tree, making clever -# use of abs_top_builddir, etc. - -AC_CONFIG_FILES([Makefile - openssl/Makefile - rcynic/Makefile - rpkid/rpki/__doc__.py]) +# This should go away once its content has migrated from Doxygen into DocBook. +AC_CONFIG_FILES([rpkid/rpki/__doc__.py]) AC_OUTPUT diff --git a/utils/Makefile b/utils/Makefile deleted file mode 100644 index 07f45dff..00000000 --- a/utils/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $Id$ - -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 - -install: - @true diff --git a/utils/Makefile.in b/utils/Makefile.in new file mode 100644 index 00000000..07f45dff --- /dev/null +++ b/utils/Makefile.in @@ -0,0 +1,9 @@ +# $Id$ + +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 + +install: + @true diff --git a/utils/find_roa/Makefile b/utils/find_roa/Makefile deleted file mode 100644 index 7d22c936..00000000 --- a/utils/find_roa/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# $Id$ - -OPENSSL_DIR = ../../openssl/openssl - -CFLAGS = -g -I${OPENSSL_DIR}/include -Wall - -# -H -Wl,-t - -NAME = find_roa - -BIN = ${NAME} -OBJ = ${NAME}.o -LIB = ${OPENSSL_DIR}/libcrypto.a - -all: ${BIN} - -clean: - rm -rf ${BIN} ${OBJ} hashed-pem-dir - -${BIN}: ${OBJ} ${LIB} Makefile - ${CC} -g -o $@ ${OBJ} ${LIB} - -TEST_ARGS = ../../rcynic/rcynic-data/authenticated 10.3.0.44 10.2.0.6 10.0.0.0/24 - -test: ${BIN} -# ./${BIN} ${TEST_ARGS} - sh ./test_roa.sh ${TEST_ARGS} diff --git a/utils/find_roa/Makefile.in b/utils/find_roa/Makefile.in new file mode 100644 index 00000000..7d22c936 --- /dev/null +++ b/utils/find_roa/Makefile.in @@ -0,0 +1,27 @@ +# $Id$ + +OPENSSL_DIR = ../../openssl/openssl + +CFLAGS = -g -I${OPENSSL_DIR}/include -Wall + +# -H -Wl,-t + +NAME = find_roa + +BIN = ${NAME} +OBJ = ${NAME}.o +LIB = ${OPENSSL_DIR}/libcrypto.a + +all: ${BIN} + +clean: + rm -rf ${BIN} ${OBJ} hashed-pem-dir + +${BIN}: ${OBJ} ${LIB} Makefile + ${CC} -g -o $@ ${OBJ} ${LIB} + +TEST_ARGS = ../../rcynic/rcynic-data/authenticated 10.3.0.44 10.2.0.6 10.0.0.0/24 + +test: ${BIN} +# ./${BIN} ${TEST_ARGS} + sh ./test_roa.sh ${TEST_ARGS} diff --git a/utils/hashdir/Makefile b/utils/hashdir/Makefile deleted file mode 100644 index 7c779d7a..00000000 --- a/utils/hashdir/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# $Id$ - -OPENSSL_DIR = ../../openssl/openssl - -CFLAGS = -g -I${OPENSSL_DIR}/include - -# -H -Wl,-t - -BIN = hashdir -OBJ = hashdir.o -LIB = ${OPENSSL_DIR}/libcrypto.a - -all: ${BIN} - -clean:: - rm -f ${BIN} ${OBJ} - -${BIN}: ${OBJ} ${LIB} Makefile - ${CC} -g -o $@ ${OBJ} ${LIB} - -INPUT = ../../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} diff --git a/utils/hashdir/Makefile.in b/utils/hashdir/Makefile.in new file mode 100644 index 00000000..7c779d7a --- /dev/null +++ b/utils/hashdir/Makefile.in @@ -0,0 +1,28 @@ +# $Id$ + +OPENSSL_DIR = ../../openssl/openssl + +CFLAGS = -g -I${OPENSSL_DIR}/include + +# -H -Wl,-t + +BIN = hashdir +OBJ = hashdir.o +LIB = ${OPENSSL_DIR}/libcrypto.a + +all: ${BIN} + +clean:: + rm -f ${BIN} ${OBJ} + +${BIN}: ${OBJ} ${LIB} Makefile + ${CC} -g -o $@ ${OBJ} ${LIB} + +INPUT = ../../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} diff --git a/utils/print_manifest/Makefile b/utils/print_manifest/Makefile deleted file mode 100644 index 1e6cb878..00000000 --- a/utils/print_manifest/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# $Id$ - -OPENSSL_DIR = ../../openssl/openssl - -CFLAGS = -g -I${OPENSSL_DIR}/include -Wall - -# -H -Wl,-t - -NAME = print_manifest - -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} - -MANIFEST_DIR = ../../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 diff --git a/utils/print_manifest/Makefile.in b/utils/print_manifest/Makefile.in new file mode 100644 index 00000000..1e6cb878 --- /dev/null +++ b/utils/print_manifest/Makefile.in @@ -0,0 +1,27 @@ +# $Id$ + +OPENSSL_DIR = ../../openssl/openssl + +CFLAGS = -g -I${OPENSSL_DIR}/include -Wall + +# -H -Wl,-t + +NAME = print_manifest + +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} + +MANIFEST_DIR = ../../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 diff --git a/utils/print_roa/Makefile b/utils/print_roa/Makefile deleted file mode 100644 index 2d6dcddc..00000000 --- a/utils/print_roa/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# $Id$ - -OPENSSL_DIR = ../../openssl/openssl - -CFLAGS = -g -I${OPENSSL_DIR}/include -Wall - -# -H -Wl,-t - -NAME = print_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} - -ROA_DIR = ../../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 diff --git a/utils/print_roa/Makefile.in b/utils/print_roa/Makefile.in new file mode 100644 index 00000000..2d6dcddc --- /dev/null +++ b/utils/print_roa/Makefile.in @@ -0,0 +1,27 @@ +# $Id$ + +OPENSSL_DIR = ../../openssl/openssl + +CFLAGS = -g -I${OPENSSL_DIR}/include -Wall + +# -H -Wl,-t + +NAME = print_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} + +ROA_DIR = ../../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 diff --git a/utils/uri/Makefile b/utils/uri/Makefile deleted file mode 100644 index 229dc702..00000000 --- a/utils/uri/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# $Id$ - -OPENSSL_DIR = ../../openssl/openssl - -CFLAGS = -g -I${OPENSSL_DIR}/include - -# -H -Wl,-t - -BIN = uri -OBJ = uri.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/uri/Makefile.in b/utils/uri/Makefile.in new file mode 100644 index 00000000..229dc702 --- /dev/null +++ b/utils/uri/Makefile.in @@ -0,0 +1,22 @@ +# $Id$ + +OPENSSL_DIR = ../../openssl/openssl + +CFLAGS = -g -I${OPENSSL_DIR}/include + +# -H -Wl,-t + +BIN = uri +OBJ = uri.o +LIB = ${OPENSSL_DIR}/libcrypto.a + +all: ${BIN} + +clean: + rm -f ${BIN} ${OBJ} + +${BIN}: ${OBJ} ${LIB} Makefile + ${CC} -g -o $@ ${OBJ} ${LIB} + +test: + @true -- cgit v1.2.3