diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/query/makefile | 2 | ||||
| -rw-r--r-- | common/template/Makefile.am | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/common/query/makefile b/common/query/makefile index 5e98970..c41b1d5 100644 --- a/common/query/makefile +++ b/common/query/makefile @@ -53,7 +53,7 @@ name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base))) $(dist): db_id := @database@ $(dist): sources := $(cxx_tun) $(dist): headers := $(odb_hdr) -$(dist): export extra_headers := traits.hxx +$(dist): export extra_headers := traits.hxx $(databases:%=traits-%.hxx) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ diff --git a/common/template/Makefile.am b/common/template/Makefile.am index 758d015..eb1ae97 100644 --- a/common/template/Makefile.am +++ b/common/template/Makefile.am @@ -9,6 +9,7 @@ noinst_PROGRAMS = driver driver_SOURCES = driver.cxx __path__(extra_sources) __path__(extra_headers) LDADD = $(top_builddir)/libcommon/common/libcommon.la AM_CPPFLAGS = -I'$(top_builddir)/libcommon' -I'$(top_srcdir)/libcommon' +AM_CPPFLAGS += -I'$(builddir)' -I'$(srcdir)' TESTS=$(top_builddir)/tester TESTS_ENVIRONMENT=top_builddir=$(top_builddir); export top_builddir; |