author | Michael Krelin <hacker@klever.net> | 2008-03-14 23:41:38 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2008-03-14 23:41:38 (UTC) |
commit | a9bb96d74c1337771bb4a9c1a4e78e2f2a73bbff (patch) (unidiff) | |
tree | fbb773adcc48beb8c9ef9a6fddaf2bf4f46f6a01 | |
parent | e6928c1d6c368e999ec8d1b05fccec44c2bebdbc (diff) | |
download | libopkele-a9bb96d74c1337771bb4a9c1a4e78e2f2a73bbff.zip libopkele-a9bb96d74c1337771bb4a9c1a4e78e2f2a73bbff.tar.gz libopkele-a9bb96d74c1337771bb4a9c1a4e78e2f2a73bbff.tar.bz2 |
do not attempt to build programs dependent on absent libraries
Thanks, Joseph, for spotting it!
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | test/Makefile.am | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index f0c0ea8..7cfe3a4 100644 --- a/test/Makefile.am +++ b/test/Makefile.am | |||
@@ -1,39 +1,42 @@ | |||
1 | noinst_PROGRAMS = test idiscover RP.cgi OP.cgi test-oauth-consumer | 1 | noinst_PROGRAMS = test idiscover test-oauth-consumer \ |
2 | ${_dependent_programs_} | ||
2 | 3 | ||
3 | AM_CPPFLAGS=${CPPFLAGS_DEBUG} | 4 | AM_CPPFLAGS=${CPPFLAGS_DEBUG} |
4 | DEFAULT_INCLUDES = -I${top_builddir} | 5 | DEFAULT_INCLUDES = -I${top_builddir} |
5 | INCLUDES = -I${top_srcdir}/test/ -I${top_builddir}/include/ -I${top_srcdir}/include/ ${KONFORKA_CFLAGS} ${LIBCURL_CPPFLAGS} | 6 | INCLUDES = -I${top_srcdir}/test/ -I${top_builddir}/include/ -I${top_srcdir}/include/ ${KONFORKA_CFLAGS} ${LIBCURL_CPPFLAGS} |
6 | 7 | ||
7 | test_SOURCES = test.cc | 8 | test_SOURCES = test.cc |
8 | test_LDADD = ${top_builddir}/lib/libopkele.la | 9 | test_LDADD = ${top_builddir}/lib/libopkele.la |
9 | 10 | ||
10 | EXTRA_DIST= \ | 11 | EXTRA_DIST= \ |
11 | sqlite.h kingate_openid_message.h \ | 12 | sqlite.h kingate_openid_message.h \ |
12 | RP-db.sql OP-db.sql | 13 | RP-db.sql OP-db.sql |
13 | 14 | ||
14 | idiscover_SOURCES = idiscover.cc | 15 | idiscover_SOURCES = idiscover.cc |
15 | idiscover_LDADD = ${top_builddir}/lib/libopkele.la | 16 | idiscover_LDADD = ${top_builddir}/lib/libopkele.la |
16 | 17 | ||
17 | test_oauth_consumer_SOURCES = test-oauth-consumer.cc | 18 | test_oauth_consumer_SOURCES = test-oauth-consumer.cc |
18 | test_oauth_consumer_LDADD = ${top_builddir}/lib/libopkele.la | 19 | test_oauth_consumer_LDADD = ${top_builddir}/lib/libopkele.la |
19 | 20 | ||
20 | if HAVE_SQLITE3 | 21 | if HAVE_SQLITE3 |
21 | if HAVE_UUID | 22 | if HAVE_UUID |
22 | if HAVE_KINGATE | 23 | if HAVE_KINGATE |
23 | 24 | ||
25 | _dependent_programs_ = RP.cgi OP.cgi | ||
26 | |||
24 | RP_cgi_SOURCES = RP.cc | 27 | RP_cgi_SOURCES = RP.cc |
25 | nodist_RP_cgi_SOURCES = RP-db.cc | 28 | nodist_RP_cgi_SOURCES = RP-db.cc |
26 | RP_cgi_LDADD = ${top_builddir}/lib/libopkele.la \ | 29 | RP_cgi_LDADD = ${top_builddir}/lib/libopkele.la \ |
27 | ${SQLITE3_LIBS} ${KINGATE_LIBS} | 30 | ${SQLITE3_LIBS} ${KINGATE_LIBS} |
28 | RP_cgi_CFLAGS = ${SQLITE3_CFLAGS} ${KINGATE_CFLAGS} | 31 | RP_cgi_CFLAGS = ${SQLITE3_CFLAGS} ${KINGATE_CFLAGS} |
29 | 32 | ||
30 | RP-db.cc: RP-db.sql | 33 | RP-db.cc: RP-db.sql |
31 | ( \ | 34 | ( \ |
32 | echo 'const char * __RP_db_bootstrap = ' && \ | 35 | echo 'const char * __RP_db_bootstrap = ' && \ |
33 | sed -e 's/^/"/' -e 's/$$/"/' $< && \ | 36 | sed -e 's/^/"/' -e 's/$$/"/' $< && \ |
34 | echo ';' \ | 37 | echo ';' \ |
35 | ) >$@ | 38 | ) >$@ |
36 | 39 | ||
37 | OP_cgi_SOURCES = OP.cc | 40 | OP_cgi_SOURCES = OP.cc |
38 | nodist_OP_cgi_SOURCES = OP-db.cc | 41 | nodist_OP_cgi_SOURCES = OP-db.cc |
39 | OP_cgi_LDADD = ${RP_cgi_LDADD} | 42 | OP_cgi_LDADD = ${RP_cgi_LDADD} |