< Previous by Date Date Index Next by Date >
  Thread Index  

[reSIProcate] Some autotools makefile fixes


Hi,

I've attached a couple of svn diffs that I needed to fix the build and install 
of resiprocate when using the autotools build system on Linux.  Specifically 
I had problems getting the BasicCall.cxx test program in the dum tree to link 
because several objects weren't being built during "make".  Also during a 
"make install", a lot of headers weren't being installed which made it 
impossible for me to build test programs outside of the resiprocate source 
tree.  These patches add the needed sources and headers to the appropriate 
Makefile.am.

If this list doesn't allow attachments I can resend inline.
~Scott
Index: autotools/sip/resiprocate/Makefile.am
===================================================================
--- autotools/sip/resiprocate/Makefile.am	(revision 3425)
+++ autotools/sip/resiprocate/Makefile.am	(working copy)
@@ -142,7 +142,10 @@
 
 resiprocate_includedir=$(includedir)/resiprocate
 resiprocate_include_HEADERS = \
-    ApplicationSip.hxx \
+	ApiCheck.hxx \
+	ApiCheckList.hxx \
+	ApplicationMessage.hxx \
+	ApplicationSip.hxx \
 	Auth.hxx \
 	BranchParameter.hxx \
 	CSeqCategory.hxx \
@@ -222,6 +225,7 @@
 	TcpTransport.hxx \
 	TcpBaseTransport.hxx \
 	TcpConnection.hxx \
+	TimeAccumulate.hxx \
 	TimerMessage.hxx \
 	TimerQueue.hxx \
 	TlsConnection.hxx \
@@ -229,7 +233,6 @@
 	Token.hxx \
 	TransactionController.hxx \
 	TransactionMap.hxx \
-	TransportMessage.hxx \
 	TransactionMessage.hxx \
 	TransactionState.hxx \
 	TransactionTerminated.hxx \
@@ -250,6 +253,7 @@
 
 resiprocate_os_includedir=$(includedir)/resiprocate/os
 resiprocate_os_include_HEADERS = \
+	os/AbstractFifo.hxx \
 	os/BaseException.hxx \
 	os/CircularBuffer.hxx \
 	os/Coders.hxx \
@@ -259,9 +263,11 @@
 	os/DataStream.hxx \
 	os/DnsUtil.hxx \
 	os/Fifo.hxx \
+	os/FiniteFifo.hxx \
 	os/HashMap.hxx \
 	os/Id.hxx \
 	os/Inserter.hxx \
+	os/IntrusiveListElement.hxx \
 	os/Lock.hxx \
 	os/Lockable.hxx \
 	os/Log.hxx \
@@ -269,6 +275,7 @@
 	os/MD5Stream.hxx \
 	os/Mutex.hxx \
 	os/ParseBuffer.hxx \
+	os/Poll.hxx \
 	os/RWMutex.hxx \
 	os/Random.hxx \
 	os/RecursiveMutex.hxx \
@@ -277,6 +284,7 @@
 	os/SysLogBuf.hxx \
 	os/SysLogStream.hxx \
 	os/ThreadIf.hxx \
+	os/TimeLimitFifo.hxx \
 	os/Timer.hxx \
 	os/TransportType.hxx \
 	os/Tuple.hxx \
Index: autotools/sip/resiprocate/dum/Makefile.am
===================================================================
--- autotools/sip/resiprocate/dum/Makefile.am	(revision 3425)
+++ autotools/sip/resiprocate/dum/Makefile.am	(working copy)
@@ -8,18 +8,23 @@
 libresipdum_la_SOURCES = \
 	AppDialog.cxx \
 	AppDialogSet.cxx \
+	AppDialogSetFactory.cxx \
 	BaseCreator.cxx \
+	BaseSubscription.cxx \
 	BaseUsage.cxx \
 	ClientAuthManager.cxx \
 	ClientInviteSession.cxx \
 	ClientOutOfDialogReq.cxx \
+	ClientPagerMessage.cxx \
 	ClientPublication.cxx \
 	ClientRegistration.cxx \
 	ClientSubscription.cxx \
+	DefaultServerReferHandler.cxx \
 	Dialog.cxx \
 	DialogId.cxx \
 	DialogSet.cxx \
 	DialogSetId.cxx \
+	DialogUsage.cxx \
 	DialogUsageManager.cxx \
 	DumTimeout.cxx \
 	HandleException.cxx \
@@ -29,20 +34,89 @@
 	InviteSessionCreator.cxx \
 	InviteSessionHandler.cxx \
 	MergedRequestKey.cxx \
+	NonDialogUsage.cxx \
 	OutOfDialogReqCreator.cxx \
+	PagerMessageCreator.cxx \
 	Profile.cxx \
 	PublicationCreator.cxx \
+	RedirectManager.cxx \
 	RegistrationCreator.cxx \
 	ServerAuthManager.cxx \
 	ServerInviteSession.cxx \
 	ServerOutOfDialogReq.cxx \
+	ServerPagerMessage.cxx \
 	ServerPublication.cxx \
 	ServerRegistration.cxx \
 	ServerSubscription.cxx \
 	SubscriptionCreator.cxx \
+	SubscriptionHandler.cxx \
+	SubscriptionState.cxx \
 	UInt64Hash.cxx 
 
 
 libresipdum_la_LDFLAGS = -version-info $(LIBRESIP_SO_VERSION)
 
-resipdum_includedir=$(includedir)/resiprocate $(includedir)/resiprocate/dum
+resipdum_includedir=$(includedir)/resiprocate/dum
+resipdum_include_HEADERS = \
+	AppDialog.hxx \
+	AppDialogSet.hxx \
+	AppDialogSetFactory.hxx \
+	BaseCreator.hxx \
+	BaseSubscription.hxx \
+	BaseUsage.hxx \
+	ClientAuthManager.hxx \
+	ClientInviteSession.hxx \
+	ClientOutOfDialogReq.hxx \
+	ClientPagerMessage.hxx \
+	ClientPublication.hxx \
+	ClientRegistration.hxx \
+	ClientSubscription.hxx \
+	DefaultServerReferHandler.hxx \
+	Dialog.hxx \
+	DialogId.hxx \
+	DialogSet.hxx \
+	DialogSetHandler.hxx \
+	DialogSetId.hxx \
+	DialogUsage.hxx \
+	DialogUsageManager.hxx \
+	DumException.hxx \
+	DumProcessHandler.hxx \
+	DumShutdownHandler.hxx \
+	DumTimeout.hxx \
+	Handle.hxx \
+	HandleException.hxx \
+	HandleManager.hxx \
+	Handled.hxx \
+	Handles.hxx \
+	InviteSession.hxx \
+	InviteSessionCreator.hxx \
+	InviteSessionHandler.hxx \
+	MergedRequestKey.hxx \
+	NonDialogUsage.hxx \
+	OutOfDialogHandler.hxx \
+	OutOfDialogReqCreator.hxx \
+	PagerMessageCreator.hxx \
+	PagerMessageHandler.hxx \
+	Profile.hxx \
+	PublicationCreator.hxx \
+	PublicationHandler.hxx \
+	RedirectHandler.hxx \
+	RedirectManager.hxx \
+	RefCountedDestroyer.hxx \
+	RegistrationCreator.hxx \
+	RegistrationHandler.hxx \
+	RegistrationPersistenceManager.hxx \
+	ServerAuthManager.hxx \
+	ServerInviteSession.hxx \
+	ServerOutOfDialogReq.hxx \
+	ServerPagerMessage.hxx \
+	ServerPublication.hxx \
+	ServerRegistration.hxx \
+	ServerSubscription.hxx \
+	SubscriptionCreator.hxx \
+	SubscriptionHandler.hxx \
+	SubscriptionPersistenceManager.hxx \
+	SubscriptionState.hxx \
+	UInt64Hash.hxx \
+	UsageSet.hxx \
+	UsageUseException.hxx