diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2010-09-14 15:16:31 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2010-09-14 15:16:31 +0200 |
| commit | 0bafcbe779a9e0a3de17a13277e5170e3dc6cce5 (patch) | |
| tree | 4594e41efde5791536a841f87ea4238900444304 | |
| parent | 0c370d056fe0848c8a9cf11c48e423f3f2e97264 (diff) | |
Use global flags to get tidier object file names
| -rw-r--r-- | common/template/Makefile.am | 4 | ||||
| -rw-r--r-- | libcommon/common/Makefile.am | 4 | ||||
| -rw-r--r-- | mysql/template/Makefile.am | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/common/template/Makefile.am b/common/template/Makefile.am index ccfe5f0..7338a85 100644 --- a/common/template/Makefile.am +++ b/common/template/Makefile.am @@ -7,8 +7,8 @@ EXTRA_DIST = __file__(extra_dist) noinst_PROGRAMS = driver driver_SOURCES = driver.cxx __path__(extra_sources) __path__(extra_headers) -driver_LDADD = $(top_builddir)/libcommon/common/libcommon.la -driver_CPPFLAGS = -I'$(top_builddir)/libcommon' -I'$(top_srcdir)/libcommon' +LDADD = $(top_builddir)/libcommon/common/libcommon.la +AM_CPPFLAGS = -I'$(top_builddir)/libcommon' -I'$(top_srcdir)/libcommon' TESTS=$(top_builddir)/tester TESTS_ENVIRONMENT=top_builddir=$(top_builddir); export top_builddir; diff --git a/libcommon/common/Makefile.am b/libcommon/common/Makefile.am index 6712eaa..67ebcef 100644 --- a/libcommon/common/Makefile.am +++ b/libcommon/common/Makefile.am @@ -8,5 +8,5 @@ libcommon_la_SOURCES = __path__(sources) __path__(headers) EXTRA_DIST = __file__(extra_dist) -libcommon_la_CPPFLAGS= -I'$(top_builddir)/libcommon' -I'$(top_srcdir)/libcommon' -DLIBCOMMON_DYNAMIC_LIB -libcommon_la_LDFLAGS = -no-undefined -rpath '$(libdir)' +AM_CPPFLAGS= -I'$(top_builddir)/libcommon' -I'$(top_srcdir)/libcommon' -DLIBCOMMON_DYNAMIC_LIB +AM_LDFLAGS = -no-undefined -rpath '$(libdir)' diff --git a/mysql/template/Makefile.am b/mysql/template/Makefile.am index bfb3327..7f33a6c 100644 --- a/mysql/template/Makefile.am +++ b/mysql/template/Makefile.am @@ -7,8 +7,8 @@ EXTRA_DIST = __file__(extra_dist) noinst_PROGRAMS = driver driver_SOURCES = driver.cxx __path__(extra_sources) __path__(extra_headers) -driver_LDADD = $(top_builddir)/libcommon/common/libcommon.la -driver_CPPFLAGS = -I'$(top_builddir)/libcommon' -I'$(top_srcdir)/libcommon' +LDADD = $(top_builddir)/libcommon/common/libcommon.la +AM_CPPFLAGS = -I'$(top_builddir)/libcommon' -I'$(top_srcdir)/libcommon' TESTS=$(top_builddir)/tester TESTS_ENVIRONMENT=top_builddir=$(top_builddir); export top_builddir; |