diff options
Diffstat (limited to 'qt/mysql/template')
| -rw-r--r-- | qt/mysql/template/Makefile.am | 1 | ||||
| -rw-r--r-- | qt/mysql/template/makefile | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/qt/mysql/template/Makefile.am b/qt/mysql/template/Makefile.am index 1948cb1..1239fa7 100644 --- a/qt/mysql/template/Makefile.am +++ b/qt/mysql/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; diff --git a/qt/mysql/template/makefile b/qt/mysql/template/makefile index fbe0460..a76f0cc 100644 --- a/qt/mysql/template/makefile +++ b/qt/mysql/template/makefile @@ -31,7 +31,7 @@ $(call import,\ #Build. # $(driver): $(cxx_obj) $(odb_qt.l) $(common.l) -$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) +$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base) $(cxx_obj) $(cxx_od): $(common.l.cpp-options) $(odb_qt.l.cpp-options) genf := $(addprefix $(odb_hdr:.hxx=-odb),.hxx .ixx .cxx) $(odb_hdr:.hxx=.sql) @@ -41,7 +41,7 @@ $(gen): $(odb) $(gen): odb := $(odb) $(gen) $(dist): export odb_options += --database mysql --profile qt \ --generate-schema -$(gen): cpp_options := -I$(out_base) +$(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) $(odb_qt.l.cpp-options) $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) @@ -67,7 +67,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(call message,sql $$1,$(dcf_root)/db-driver $$1, $(src_base)/test.sql) + $(call schema) $(call message,test $<,$< --options-file $(dcf_root)/db.options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) |