diff options
| author | Stef Walter <stefw@gnome.org> | 2014-03-04 08:20:53 +0100 |
|---|---|---|
| committer | Stef Walter <stefw@gnome.org> | 2014-03-04 12:57:19 +0100 |
| commit | b72048c920f50df85cb398f4309e68a575d8879e (patch) | |
| tree | 78e89081991e80e68a05d76583d8e5d96ddb53fd /tool | |
| parent | ec89646b1a1594193d56dc18ffd0da15b211ff82 (diff) | |
| download | libsecret-b72048c920f50df85cb398f4309e68a575d8879e.tar.gz | |
Makefile.am: Use a single Makefile.am and parallel tests
Allow parallel building and testing by using a single Makefile.am
Implement parallel testing using TAP, with various drivers and
compilers living in the build/ directory.
Fix all sorts of issues that this caused, including builddir != srcdir,
leaks in tests and so on.
It would have been nice to break out all the above into separate
commits ... blush.
Diffstat (limited to 'tool')
| -rw-r--r-- | tool/Makefile.am | 15 | ||||
| -rw-r--r-- | tool/secret-tool.c | 8 |
2 files changed, 7 insertions, 16 deletions
diff --git a/tool/Makefile.am b/tool/Makefile.am index 667c88c..422e0d3 100644 --- a/tool/Makefile.am +++ b/tool/Makefile.am @@ -1,16 +1,7 @@ -include $(top_srcdir)/Makefile.decl - -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/libsecret \ - -DSECRET_COMPILATION \ - -DLOCALEDIR=\""$(datadir)/locale"\" \ - $(NULL) - -bin_PROGRAMS = secret-tool +bin_PROGRAMS += secret-tool secret_tool_SOURCES = \ - secret-tool.c + tool/secret-tool.c secret_tool_LDADD = \ - $(top_builddir)/libsecret/libsecret-@SECRET_MAJOR@.la + libsecret-@SECRET_MAJOR@.la diff --git a/tool/secret-tool.c b/tool/secret-tool.c index 0a1350f..14ce14b 100644 --- a/tool/secret-tool.c +++ b/tool/secret-tool.c @@ -14,10 +14,10 @@ #include "config.h" -#include "secret-item.h" -#include "secret-password.h" -#include "secret-service.h" -#include "secret-value.h" +#include "libsecret/secret-item.h" +#include "libsecret/secret-password.h" +#include "libsecret/secret-service.h" +#include "libsecret/secret-value.h" #include <glib/gi18n.h> |