author | Michael Krelin <hacker@klever.net> | 2008-06-25 20:42:33 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2008-06-25 20:42:33 (UTC) |
commit | 7934873589e47f0207916c668ec4a272071e66a0 (patch) (unidiff) | |
tree | 85595d46e3e604b6686f5fde6e074e2a443f330c /test/Makefile.am | |
parent | aa3a6821f6aaaf4ae63bafbbc76da5f414a75fd4 (diff) | |
download | libopkele-7934873589e47f0207916c668ec4a272071e66a0.zip libopkele-7934873589e47f0207916c668ec4a272071e66a0.tar.gz libopkele-7934873589e47f0207916c668ec4a272071e66a0.tar.bz2 |
do not attempt to build programs dependent on absent libraries
Thanks, Joseph, for spotting it!
In addition, thanks for spotting it again in openid20 branch to Brian of
Butterfat ;-)
Conflicts:
test/Makefile.am
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 8fedf48..666cd66 100644 --- a/test/Makefile.am +++ b/test/Makefile.am | |||
@@ -1,51 +1,54 @@ | |||
1 | noinst_PROGRAMS = test idiscover RP.cgi OP.cgi | 1 | noinst_PROGRAMS = test idiscover \ |
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 | if HAVE_SQLITE3 | 18 | if HAVE_SQLITE3 |
18 | if HAVE_KINGATE | 19 | if HAVE_KINGATE |
19 | if HAVE_UUID | 20 | if HAVE_UUID |
20 | 21 | ||
22 | _dependent_programs_ = RP.cgi OP.cgi | ||
23 | |||
21 | RP_cgi_SOURCES = RP.cc | 24 | RP_cgi_SOURCES = RP.cc |
22 | nodist_RP_cgi_SOURCES = RP-db.cc | 25 | nodist_RP_cgi_SOURCES = RP-db.cc |
23 | RP_cgi_LDADD = ${top_builddir}/lib/libopkele.la \ | 26 | RP_cgi_LDADD = ${top_builddir}/lib/libopkele.la \ |
24 | ${SQLITE3_LIBS} ${KINGATE_LIBS} ${UUID_LIBS} | 27 | ${SQLITE3_LIBS} ${KINGATE_LIBS} ${UUID_LIBS} |
25 | RP_cgi_CFLAGS = ${SQLITE3_CFLAGS} ${KINGATE_CFLAGS} ${UUID_CFLAGS} | 28 | RP_cgi_CFLAGS = ${SQLITE3_CFLAGS} ${KINGATE_CFLAGS} ${UUID_CFLAGS} |
26 | 29 | ||
27 | RP-db.cc: RP-db.sql | 30 | RP-db.cc: RP-db.sql |
28 | ( \ | 31 | ( \ |
29 | echo 'const char * __RP_db_bootstrap = ' && \ | 32 | echo 'const char * __RP_db_bootstrap = ' && \ |
30 | sed -e 's/^/"/' -e 's/$$/"/' $< && \ | 33 | sed -e 's/^/"/' -e 's/$$/"/' $< && \ |
31 | echo ';' \ | 34 | echo ';' \ |
32 | ) >$@ | 35 | ) >$@ |
33 | 36 | ||
34 | OP_cgi_SOURCES = OP.cc | 37 | OP_cgi_SOURCES = OP.cc |
35 | nodist_OP_cgi_SOURCES = OP-db.cc | 38 | nodist_OP_cgi_SOURCES = OP-db.cc |
36 | OP_cgi_LDADD = ${RP_cgi_LDADD} | 39 | OP_cgi_LDADD = ${RP_cgi_LDADD} |
37 | OP_cgi_CFLAGS = ${RP_cgi_CFLAGS} | 40 | OP_cgi_CFLAGS = ${RP_cgi_CFLAGS} |
38 | 41 | ||
39 | OP-db.cc: OP-db.sql | 42 | OP-db.cc: OP-db.sql |
40 | ( \ | 43 | ( \ |
41 | echo 'const char * __OP_db_bootstrap = ' && \ | 44 | echo 'const char * __OP_db_bootstrap = ' && \ |
42 | sed -e 's/^/"/' -e 's/$$/"/' $< && \ | 45 | sed -e 's/^/"/' -e 's/$$/"/' $< && \ |
43 | echo ';' \ | 46 | echo ';' \ |
44 | ) >$@ | 47 | ) >$@ |
45 | 48 | ||
46 | clean-local: | 49 | clean-local: |
47 | rm -f RP-db.cc OP-db.cc | 50 | rm -f RP-db.cc OP-db.cc |
48 | 51 | ||
49 | endif #HAVE_UUID | 52 | endif #HAVE_UUID |
50 | endif #HAVE_KINGATE | 53 | endif #HAVE_KINGATE |
51 | endif #HAVE_SQLITE3 | 54 | endif #HAVE_SQLITE3 |