ChangeLogTag: Thu Nov 4 14:00:50 2004 J.T. Conklin <jtc@acorntoolworks.com>

5 files changed, 81 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 2f1a686a220..993966a5e15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Thu Nov  4 14:00:50 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+
+	* ace/QoS/Makefile.am:
+
+	  Added includedir definition so that headers are installed
+	  in $prefix/include/ace/QoS.
+
+	* configure.ac:
+	* ace/Makefile.am:
+
+	  Changed to configure/build HTBP protocol library.
+
+	* ace/HTBP/Makefile.am:
+
+	  Added new file, automake support for HTBP protocol.
+
 Thu Nov  4 06:28:34 2004  Chad Elliott  <elliott_c@ociweb.com>
 
         * examples/IPC_SAP/SSL_SAP/SSL-client.cpp:
diff --git a/ace/HTBP/Makefile.am b/ace/HTBP/Makefile.am
new file mode 100644
index 00000000000..0fb6995d9d5
--- /dev/null
+++ b/ace/HTBP/Makefile.am
@@ -0,0 +1,60 @@
+##  Process this file with automake to create Makefile.in
+
+includedir = @includedir@/ace/HTBP
+
+ACE_BUILDDIR = $(top_builddir)
+ACE_ROOT = $(top_srcdir)
+
+## Makefile.HTBP.am 
+lib_LTLIBRARIES = libACE_HTBP.la
+
+libACE_HTBP_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -DHTBP_BUILD_DLL
+
+libACE_HTBP_la_SOURCES = \
+  HTBP_Addr.cpp \
+  HTBP_Channel.cpp \
+  HTBP_Environment.cpp \
+  HTBP_Filter.cpp \
+  HTBP_Filter_Factory.cpp \
+  HTBP_ID_Requestor.cpp \
+  HTBP_Inside_Squid_Filter.cpp \
+  HTBP_Notifier.cpp \
+  HTBP_Outside_Squid_Filter.cpp \
+  HTBP_Session.cpp \
+  HTBP_Stream.cpp
+
+libACE_HTBP_la_LIBADD = \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+nobase_include_HEADERS = \
+  HTBP_Addr.h \
+  HTBP_Channel.h \
+  HTBP_Environment.h \
+  HTBP_Export.h \
+  HTBP_Filter.h \
+  HTBP_Filter_Factory.h \
+  HTBP_ID_Requestor.h \
+  HTBP_Inside_Squid_Filter.h \
+  HTBP_Macros.h \
+  HTBP_Notifier.h \
+  HTBP_Outside_Squid_Filter.h \
+  HTBP_Session.h \
+  HTBP_Stream.h \
+  HTBP_Channel.inl \
+  HTBP_Filter.inl \
+  HTBP_Inside_Squid_Filter.inl \
+  HTBP_Notifier.inl \
+  HTBP_Outside_Squid_Filter.inl \
+  HTBP_Session.inl \
+  HTBP_Stream.inl
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/ace/Makefile.am b/ace/Makefile.am
index 0fb01af0677..1e760095ffe 100644
--- a/ace/Makefile.am
+++ b/ace/Makefile.am
@@ -15,6 +15,7 @@ ACE_ROOT = $(top_srcdir)
 
 SUBDIRS = \
         . \
+	HTBP \
 	QoS \
         RMCast \
         SSL \
diff --git a/ace/QoS/Makefile.am b/ace/QoS/Makefile.am
index c8876771976..44f253cb5cd 100644
--- a/ace/QoS/Makefile.am
+++ b/ace/QoS/Makefile.am
@@ -1,12 +1,6 @@
 ##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu
+
+includedir = @includedir@/ace/QoS
 
 nobase_include_HEADERS =
 lib_LTLIBRARIES =
diff --git a/configure.ac b/configure.ac
index 05cd688daa8..dad96e6743f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7290,8 +7290,9 @@ AC_CONFIG_FILES([
   ace-config.1
   Makefile
   ace/Makefile
-  ace/RMCast/Makefile
+  ace/HTBP/Makefile
   ace/QoS/Makefile
+  ace/RMCast/Makefile
   ace/SSL/Makefile
   ace/TMCast/Makefile
   apps/Makefile