aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.in9
-rw-r--r--openssl/Makefile.in21
-rw-r--r--openssl/tests/Makefile2
-rw-r--r--pow/Makefile.in4
-rw-r--r--rcynic/Makefile.in4
-rw-r--r--rpkid/Makefile.in4
-rw-r--r--rpkid/tests/Makefile.in32
-rw-r--r--utils/Makefile.in6
-rw-r--r--utils/find_roa/Makefile.in6
-rw-r--r--utils/hashdir/Makefile.in6
-rw-r--r--utils/print_manifest/Makefile.in6
-rw-r--r--utils/print_roa/Makefile.in6
-rw-r--r--utils/uri/Makefile.in6
13 files changed, 83 insertions, 29 deletions
diff --git a/Makefile.in b/Makefile.in
index 96571de3..6d9c8add 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,10 +2,15 @@
SUBDIRS = @TOP_LEVEL_SUBDIRS@
-all install clean test:
+default: all
+
+test:: all
+
+all install clean test distclean::
@for i in ${SUBDIRS}; do echo "Making $@ in $$i"; (cd $$i && ${MAKE} $@); done
-test: all
+distclean::
+ rm -f Makefile config.log config.status
export:
svn export http://subvert-rpki.hactrn.net/
diff --git a/openssl/Makefile.in b/openssl/Makefile.in
index 6c2d7ad5..4ba1f8e3 100644
--- a/openssl/Makefile.in
+++ b/openssl/Makefile.in
@@ -1,5 +1,12 @@
# $Id$
+VERSION = 1.0.0b
+
+OPENSSL_CONFIG_COMMAND = @OPENSSL_CONFIG_COMMAND@
+OPENSSL_BUILD_DIRECTORY = @abs_builddir@/openssl
+OPENSSL_SHARED_LIBRARIES = @OPENSSL_SHARED_LIBRARIES@
+
+
# Kludge alert:
#
# The --prefix= and LIBRPATH= settings below are to force OpenSSL's
@@ -15,13 +22,7 @@
# "You are lost in a maze of twisty programs, all broken in different
# ways"
-VERSION = 1.0.0b
-
-OPENSSL_CONFIG_COMMAND = @OPENSSL_CONFIG_COMMAND@
-
-OPENSSL_BUILD_DIRECTORY = @abs_builddir@/openssl
-
-OPTIONS = enable-rfc3779 enable-cms no-dso @OPENSSL_SHARED_LIBRARIES@ --prefix=${OPENSSL_BUILD_DIRECTORY}
+OPTIONS = enable-rfc3779 enable-cms no-dso ${OPENSSL_SHARED_LIBRARIES} --prefix=${OPENSSL_BUILD_DIRECTORY}
all: openssl-${VERSION}/Makefile
cd openssl-${VERSION}; ${MAKE} $@ LIBRPATH=${OPENSSL_BUILD_DIRECTORY}
@@ -31,9 +32,9 @@ clean:
rm -rf openssl-${VERSION} openssl
cd tests; ${MAKE} $@
-# Ordinarily we let ./config guess the platform target. When
-# debugging, we usually need to specify an explicit target, in which
-# case it's probably easier to use ./Configure.
+distclean: clean
+ cd tests; ${MAKE} $@
+ rm -f Makefile
openssl-${VERSION}/Makefile: openssl-${VERSION}/config
cd openssl-${VERSION}; ${OPENSSL_CONFIG_COMMAND} ${OPTIONS}
diff --git a/openssl/tests/Makefile b/openssl/tests/Makefile
index 8e0c14e5..4e38c699 100644
--- a/openssl/tests/Makefile
+++ b/openssl/tests/Makefile
@@ -26,5 +26,5 @@ test: ${BIN} test.cer
test.cer: test.conf
${OPENSSL_DIR}/apps/openssl req -new -x509 -config test.conf -keyout test.key -out test.cer -outform DER
-immaculate: clean
+distclean: clean
rm -f test.key test.cer
diff --git a/pow/Makefile.in b/pow/Makefile.in
index cab078bf..a42d5269 100644
--- a/pow/Makefile.in
+++ b/pow/Makefile.in
@@ -32,3 +32,7 @@ install:
test:
@true
+
+distclean: clean
+ rm -f POW-${VERSION}/*.pyc
+ rm -f Makefile
diff --git a/rcynic/Makefile.in b/rcynic/Makefile.in
index b003437e..0f0ad3d0 100644
--- a/rcynic/Makefile.in
+++ b/rcynic/Makefile.in
@@ -29,3 +29,7 @@ doc::
doc::
cd doc/latex && make pdf && ln -f refman.pdf ..
+
+distclean: clean
+ cd static-rsync; ${MAKE} clean
+ rm -f show.sh Makefile
diff --git a/rpkid/Makefile.in b/rpkid/Makefile.in
index 54423217..f2f4b43a 100644
--- a/rpkid/Makefile.in
+++ b/rpkid/Makefile.in
@@ -107,3 +107,7 @@ pdf: html
cd doc/latex && TZ='' ${MAKE} && ln -f refman.pdf ../manual.pdf
docs: dot eps png html text tgz pdf
+
+distclean: clean docclean
+ cd tests; ${MAKE} $@
+ rm -f TAGS rpki/__doc__.py rootd rpkid backup-sql irbe_cli irdbd myrpki pubd sql-setup start-servers Makefile
diff --git a/rpkid/tests/Makefile.in b/rpkid/tests/Makefile.in
index 01d16f84..c97d5955 100644
--- a/rpkid/tests/Makefile.in
+++ b/rpkid/tests/Makefile.in
@@ -1,5 +1,8 @@
# $Id$
+PYTHON = @PYTHON@
+PYWRAP = @PYWRAP@
+
all: protocol-samples
clean:
@@ -20,35 +23,35 @@ publication-protocol-samples/.stamp: publication-protocol-samples.xml split-prot
touch $@
parse-test: protocol-samples
- @PYTHON@ xml-parse-test.py
+ ${PYTHON} xml-parse-test.py
all-tests:: parse-test
all-tests::
- @PYWRAP@ smoketest.py -y smoketest.1.yaml
+ ${PYWRAP} smoketest.py -y smoketest.1.yaml
all-tests::
- @PYWRAP@ smoketest.py -y smoketest.2.yaml
+ ${PYWRAP} smoketest.py -y smoketest.2.yaml
test all-tests::
- @PYWRAP@ smoketest.py -y smoketest.3.yaml
+ ${PYWRAP} smoketest.py -y smoketest.3.yaml
all-tests::
- @PYWRAP@ smoketest.py -y smoketest.4.yaml
+ ${PYWRAP} smoketest.py -y smoketest.4.yaml
all-tests::
- @PYWRAP@ smoketest.py -y smoketest.5.yaml
+ ${PYWRAP} smoketest.py -y smoketest.5.yaml
test all-tests::
- @PYWRAP@ smoketest.py -y smoketest.6.yaml
+ ${PYWRAP} smoketest.py -y smoketest.6.yaml
all-tests::
- @PYWRAP@ smoketest.py -y smoketest.7.yaml
+ ${PYWRAP} smoketest.py -y smoketest.7.yaml
profile: all
find smoketest.dir -name '*.prof' -delete
- @PYWRAP@ smoketest.py -y smoketest.2.yaml -p
- for i in smoketest.dir/*.prof; do @PYTHON@ -c "import pstats;pstats.Stats('$$i').sort_stats('time').print_stats()"; done
+ ${PYWRAP} smoketest.py -y smoketest.2.yaml -p
+ for i in smoketest.dir/*.prof; do ${PYTHON} -c "import pstats;pstats.Stats('$$i').sort_stats('time').print_stats()"; done
# This isn't a full exercise of the yamltest framework, but is
# probably as good as we can do under make.
@@ -57,10 +60,13 @@ YAMLTEST_CONFIG = smoketest.1.yaml
yamltest:
rm -rf yamltest.dir rcynic-data
- @PYTHON@ sql-cleaner.py
- @PYWRAP@ yamltest.py ${YAMLTEST_CONFIG}
+ ${PYTHON} sql-cleaner.py
+ ${PYWRAP} yamltest.py ${YAMLTEST_CONFIG}
backup:
- @PYTHON@ sql-dumper.py
+ ${PYTHON} sql-dumper.py
tar cvvzf yamltest.backup.$$(TZ='' date +%Y.%m.%d.%H.%M.%S).tgz screenlog.* yamltest.dir backup.*.sql
rm backup.*.sql
+
+distclean: clean
+ rm -f rcynic.xml Makefile
diff --git a/utils/Makefile.in b/utils/Makefile.in
index 07f45dff..cd00afd9 100644
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -2,8 +2,8 @@
SUBDIRS = uri print_manifest print_roa hashdir find_roa
-all clean test:
+all clean test distclean install::
@for i in ${SUBDIRS}; do echo "Making $@ in $$i"; (cd $$i && ${MAKE} $@); done
-install:
- @true
+distclean::
+ rm -f Makefile
diff --git a/utils/find_roa/Makefile.in b/utils/find_roa/Makefile.in
index 559d1370..4e796feb 100644
--- a/utils/find_roa/Makefile.in
+++ b/utils/find_roa/Makefile.in
@@ -24,3 +24,9 @@ TEST_ARGS = @top_srcdir@/rcynic/rcynic-data/authenticated 10.3.0.44 10.2.0.6 10.
test: ${BIN}
# ./${BIN} ${TEST_ARGS}
sh ./test_roa.sh ${TEST_ARGS}
+
+install:
+ @true
+
+distclean: clean
+ rm -f Makefile
diff --git a/utils/hashdir/Makefile.in b/utils/hashdir/Makefile.in
index 29004c6f..e6e00fa5 100644
--- a/utils/hashdir/Makefile.in
+++ b/utils/hashdir/Makefile.in
@@ -26,3 +26,9 @@ test: ${BIN}
clean::
rm -rf ${OUTPUT}
+
+install:
+ @true
+
+distclean: clean
+ rm -f Makefile
diff --git a/utils/print_manifest/Makefile.in b/utils/print_manifest/Makefile.in
index c1d8ca40..2815f439 100644
--- a/utils/print_manifest/Makefile.in
+++ b/utils/print_manifest/Makefile.in
@@ -24,3 +24,9 @@ MANIFEST_DIR = @top_srcdir@/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:
+ @true
+
+distclean: clean
+ rm -f Makefile
diff --git a/utils/print_roa/Makefile.in b/utils/print_roa/Makefile.in
index c4da5730..cf96dac0 100644
--- a/utils/print_roa/Makefile.in
+++ b/utils/print_roa/Makefile.in
@@ -23,3 +23,9 @@ ROA_DIR = @top_srcdir@/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:
+ @true
+
+distclean: clean
+ rm -f Makefile
diff --git a/utils/uri/Makefile.in b/utils/uri/Makefile.in
index 88f12de7..56cae7c0 100644
--- a/utils/uri/Makefile.in
+++ b/utils/uri/Makefile.in
@@ -20,3 +20,9 @@ ${BIN}: ${SRC}
test:
@true
+
+install:
+ @true
+
+distclean: clean
+ rm -f Makefile
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-10 08:16:26 +0000