r3049 - in trunk/libmcrypto: include/libmcrypto source

[erik at minisip.org]

Author: erik
Date: 2006-12-21 19:03:14 +0100 (Thu, 21 Dec 2006)
New Revision: 3049

Modified:
   trunk/libmcrypto/include/libmcrypto/Makefile.am
   trunk/libmcrypto/source/Makefile.am
Log:

 * Comile fix when scsim is disabled: SipSim.{h,cxx} and SipSimSoft.{h,cxx}
   should always be included.



Modified: trunk/libmcrypto/include/libmcrypto/Makefile.am
===================================================================
--- trunk/libmcrypto/include/libmcrypto/Makefile.am	2006-12-21 17:34:27 UTC (rev 3048)
+++ trunk/libmcrypto/include/libmcrypto/Makefile.am	2006-12-21 18:03:14 UTC (rev 3049)
@@ -11,9 +11,7 @@
 
 scsim_src =
 if ENABLE_SCSIM
-scsim_src += SipSim.h \
-	     SipSimPk.h \
-	     SipSimSoft.h \
+scsim_src += SipSimPk.h \
 	     SipSimDh.h \
 	     SmartCard.h \
 	     SipSimSmartCardGD.h \
@@ -23,6 +21,8 @@
 
 pkginclude_HEADERS = \
 		aes.h \
+		SipSim.h \
+		SipSimSoft.h \
 		cert.h \
 		init.h \
 		$(scsim_src) \

Modified: trunk/libmcrypto/source/Makefile.am
===================================================================
--- trunk/libmcrypto/source/Makefile.am	2006-12-21 17:34:27 UTC (rev 3048)
+++ trunk/libmcrypto/source/Makefile.am	2006-12-21 18:03:14 UTC (rev 3049)
@@ -20,9 +20,7 @@
 
 scsim_src =
 if ENABLE_SCSIM
-scsim_src += SipSim.cxx \
-	     SipSimPk.cxx \
-	     SipSimSoft.cxx \
+scsim_src += SipSimPk.cxx \
 	     SipSimDh.cxx \
 	     SmartCard.cxx \
 	     SipSimSmartCardGD.cxx \
@@ -32,6 +30,8 @@
 
 libmcrypto_core_la_SOURCES = \
 		aes.cxx \
+		SipSim.cxx \
+	  	SipSimSoft.cxx \
 		cert.cxx \
 		init.cxx \
 		$(scsim_src) \