summaryrefslogtreecommitdiff
path: root/cpp/lib/common/Makefile.am
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2006-12-12 12:57:08 +0000
committerGordon Sim <gsim@apache.org>2006-12-12 12:57:08 +0000
commit2970078e8a383be527c6a80c7fdd9b548e3895ca (patch)
tree01318fd575492c6010d9c120af02072fbf03bc14 /cpp/lib/common/Makefile.am
parent42da34c3320485e2e88f5d4169a4f92a48c1eb7a (diff)
downloadqpid-python-2970078e8a383be527c6a80c7fdd9b548e3895ca.tar.gz
Renamed Content.h (and Content.cpp for consistency) in framing to avoid clashing with existing Content.h file.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@486119 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/lib/common/Makefile.am')
-rw-r--r--cpp/lib/common/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/lib/common/Makefile.am b/cpp/lib/common/Makefile.am
index 21eaf12ff2..6f21a332d4 100644
--- a/cpp/lib/common/Makefile.am
+++ b/cpp/lib/common/Makefile.am
@@ -71,10 +71,10 @@ libcommon_la_SOURCES = \
$(framing)/BodyHandler.h \
$(framing)/Buffer.cpp \
$(framing)/Buffer.h \
- $(framing)/Content.cpp \
- $(framing)/Content.h \
$(framing)/FieldTable.cpp \
$(framing)/FieldTable.h \
+ $(framing)/FramingContent.cpp \
+ $(framing)/FramingContent.h \
$(framing)/HeaderProperties.h \
$(framing)/InitiationHandler.cpp \
$(framing)/InitiationHandler.h \