diff options
| author | Stephen D. Huston <shuston@apache.org> | 2009-04-23 22:59:12 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2009-04-23 22:59:12 +0000 |
| commit | 3c95f9a289fee6a3b43608ec2ac95f841c43e3ff (patch) | |
| tree | 5860c778c3e2b2c6c23b49887ae870cb5d4558ff /cpp/src/Makefile.am | |
| parent | 7db52d95099fb7ae237277f12e4e368cf643f174 (diff) | |
| download | qpid-python-3c95f9a289fee6a3b43608ec2ac95f841c43e3ff.tar.gz | |
Merge in initial changes to allow building with CMake; rubygen and managementgen can now generate either .mk files or .cmake files as needed; CONF_FILE and MODULE_DIR macros now have broker/client counterparts QPIDD_CONF_FILE, QPIDD_MODULE_DIR, QPIDC_CONF_FILE, QPIDC_MODULE_DIR configurable by cmake
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@768085 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/Makefile.am')
| -rw-r--r-- | cpp/src/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am index ce6debd4d2..457463e72d 100644 --- a/cpp/src/Makefile.am +++ b/cpp/src/Makefile.am @@ -106,8 +106,8 @@ AM_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO_ARG) INCLUDES = -Igen -I$(srcdir)/gen ## Automake macros to build libraries and executables. -qpidd_CXXFLAGS = $(AM_CXXFLAGS) -DMODULE_DIR=\"$(dmoduledir)\" -DCONF_FILE=\"$(sysconfdir)/qpidd.conf\" -libqpidclient_la_CXXFLAGS = $(AM_CXXFLAGS) -DMODULE_DIR=\"$(cmoduledir)\" -DCONF_FILE=\"$(confdir)/qpidc.conf\" +qpidd_CXXFLAGS = $(AM_CXXFLAGS) -DQPIDD_MODULE_DIR=\"$(dmoduledir)\" -DQPIDD_CONF_FILE=\"$(sysconfdir)/qpidd.conf\" +libqpidclient_la_CXXFLAGS = $(AM_CXXFLAGS) -DQPIDC_MODULE_DIR=\"$(cmoduledir)\" -DQPIDC_CONF_FILE=\"$(confdir)/qpidc.conf\" qpidd_LDADD = \ libqpidbroker.la \ |