diff options
| author | Stef Walter <stefw@gnome.org> | 2013-01-08 12:27:48 +0100 |
|---|---|---|
| committer | Stef Walter <stefw@gnome.org> | 2013-01-09 13:49:44 +0100 |
| commit | 8fb222266c5bf9181cd934c27528507d45476dad (patch) | |
| tree | 23ac84c98f7c84e2a699eb5f09580b43a94f13d9 /common | |
| parent | 3d503948450d69293a3fdfec096e398fedf714f2 (diff) | |
Build common code into noinst libraries
* This is cleaner than building the same source files all over
the place over and over.
* Works better with code coverage.
Diffstat (limited to 'common')
| -rw-r--r-- | common/Makefile.am | 12 | ||||
| -rw-r--r-- | common/tests/Makefile.am | 14 |
2 files changed, 15 insertions, 11 deletions
diff --git a/common/Makefile.am b/common/Makefile.am index f37a501..754d7cd 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -2,9 +2,17 @@ NULL = SUBDIRS = . tests -EXTRA_DIST = \ - array.c array.h \ +noinst_LTLIBRARIES = \ + libp11-compat.la \ + libp11-library.la \ + $(NULL) + +libp11_compat_la_SOURCES = \ compat.c compat.h \ + $(NULL) + +libp11_library_la_SOURCES = \ + array.c array.h \ debug.c debug.h \ dict.c dict.h \ library.c library.h \ diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am index 11f2369..af61786 100644 --- a/common/tests/Makefile.am +++ b/common/tests/Makefile.am @@ -11,21 +11,17 @@ INCLUDES = \ -I$(COMMON) \ $(CUTEST_CFLAGS) -LDADD = $(CUTEST_LIBS) +LDADD = \ + $(top_builddir)/common/libp11-library.la \ + $(top_builddir)/common/libp11-compat.la \ + $(CUTEST_LIBS) \ + $(NULL) CHECK_PROGS = \ test-dict \ test-array \ $(NULL) -test_dict_SOURCES = \ - test-dict.c \ - $(COMMON)/dict.c - -test_array_SOURCES = \ - test-array.c \ - $(COMMON)/array.c - noinst_PROGRAMS = \ $(CHECK_PROGS) |