diff options
| author | Alan Conway <aconway@apache.org> | 2007-05-18 19:21:14 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-05-18 19:21:14 +0000 |
| commit | 2652dd5c8e56c8b686853231c8161a69f91c7b27 (patch) | |
| tree | 10dd5c7601aa98f9a662a11b55a7d4d4d9c5f771 /cpp | |
| parent | 8ee37ddc97165f275734cd8eba76059019345133 (diff) | |
| download | qpid-python-2652dd5c8e56c8b686853231c8161a69f91c7b27.tar.gz | |
* docs/api/Makefile.am: Adding html.timestamp to clean target.
* src/Makefile.am: Fixed -I for generated code.
* src/tests/Makefile.am: Fixed -I for generated code.
* src/qpidd.cpp: Typo in help message.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@539568 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/docs/api/Makefile.am | 2 | ||||
| -rw-r--r-- | cpp/src/Makefile.am | 2 | ||||
| -rw-r--r-- | cpp/src/qpidd.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/tests/Makefile.am | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/cpp/docs/api/Makefile.am b/cpp/docs/api/Makefile.am index 121c263a12..bde8b5fa3d 100644 --- a/cpp/docs/api/Makefile.am +++ b/cpp/docs/api/Makefile.am @@ -15,4 +15,4 @@ html.timestamp: touch $@ clean-local: - rm -rf html html-dev + rm -rf html html-dev html.timestamp diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am index ec11a051a0..87087ef369 100644 --- a/cpp/src/Makefile.am +++ b/cpp/src/Makefile.am @@ -21,7 +21,7 @@ EXTRA_DIST=generate.sh $(generated_cpp) $(generated_h) $(platform_dist) AM_CXXFLAGS = $(WARNING_CFLAGS) $(APR_CXXFLAGS) AM_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO_ARG) -INCLUDES = -Igen +INCLUDES = -I$(builddir)/gen -I$(srcdir)/gen qpidd_LDADD = \ libqpidbroker.la \ diff --git a/cpp/src/qpidd.cpp b/cpp/src/qpidd.cpp index 978f9afe4f..7b4c537d94 100644 --- a/cpp/src/qpidd.cpp +++ b/cpp/src/qpidd.cpp @@ -71,7 +71,7 @@ struct QpiddOptions : public Broker::Options po::options_description brokerOpts; Broker::Options::addTo(desc); desc.add_options() - ("config", optValue(config, "FILE"), "Configuation file") + ("config", optValue(config, "FILE"), "Configuration file") ("help,h", optValue(help), "Print help message") ("version,v", optValue(version), "Print version information"); } diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am index 77ed81df56..74e5863613 100644 --- a/cpp/src/tests/Makefile.am +++ b/cpp/src/tests/Makefile.am @@ -1,5 +1,5 @@ AM_CXXFLAGS = $(WARNING_CFLAGS) $(CPPUNIT_CXXFLAGS) $(APR_CXXFLAGS) -INCLUDES = -I$(srcdir)/.. -I$(builddir)/../gen +INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../gen -I$(builddir)/../gen # Unit tests broker_unit_tests = \ |