iptsec/Makefile.am: fixed HAVE_NTH case

darcs-hash:20070212131554-65a35-2eb1fa0137cdc72eb23afcf35cb3e6375f8f8c67.gz

libsofia-sip-ua/iptsec/Makefile.am

@@ -31,40 +31,22 @@ TESTS = 		test_auth_digest
 
 BUILT_SOURCES = 	auth_tag_ref.c
 
-HTTP_SRC =		auth_module_http.c
-if HAVE_NTH
-USE_HTTP_SRC = 		$(HTTP_SRC)
-OPT_LDDD =		../http/libhttp.la
-endif
-
 nobase_include_sofia_HEADERS = \
 			sofia-sip/auth_common.h \
 			sofia-sip/auth_client.h sofia-sip/auth_digest.h \
 			sofia-sip/auth_module.h sofia-sip/auth_plugin.h \
-			sofia-sip/auth_client_plugin.h \
-			$(NTLM_HEADER)
+			sofia-sip/auth_client_plugin.h
 
 libiptsec_la_SOURCES = 	iptsec_debug.h \
 			auth_client.c auth_common.c auth_digest.c \
 			auth_module.c auth_tag.c auth_tag_ref.c \
 			auth_plugin.c auth_plugin_delayed.c \
 			auth_module_sip.c \
-			$(NTLM_SOURCE) \
-			$(USE_HTTP_SOURCE) \
 			iptsec_debug.c
 
-NTLM_HEADER = 		sofia-sip/auth_ntlm.h
-if HAVE_NTLM
-NTLM_SOURCE = 		auth_ntlm.c auth_client_ntlm.c auth_plugin_ntlm.c
-endif
-
-EXTRA_libiptsec_la_SOURCES = \
-			auth_ntlm.c auth_client_ntlm.c auth_plugin_ntlm.c
-
 COVERAGE_INPUT = 	$(libiptsec_la_SOURCES) $(include_sofia_HEADERS)
 
 LDADD = 		libiptsec.la \
-			$(OPT_LDADD) \
 			../nta/libnta.la \
 			../sip/libsip.la \
 			../msg/libmsg.la \
@@ -75,11 +57,28 @@ LDADD = 		libiptsec.la \
 
 test_auth_digest_LDFLAGS = -static
 
+if HAVE_NTLM
+nobase_include_sofia_HEADERS += $(NTLM_HEADER)
+libiptsec_la_SOURCES += $(NTLM_SOURCE)
+endif
+
+if HAVE_NTH
+libiptsec_la_SOURCES += $(HTTP_SOURCE)
+LDADD +=		../http/libhttp.la
+endif
+
+HTTP_SOURCE =		auth_module_http.c
+
+NTLM_HEADER = 		sofia-sip/auth_ntlm.h
+NTLM_SOURCE = 		auth_ntlm.c auth_client_ntlm.c auth_plugin_ntlm.c
+
+EXTRA_libiptsec_la_SOURCES = \
+			$(NTLM_HEADER) $(NTLM_SOURCE) $(HTTP_SOURCE)
+
 # ----------------------------------------------------------------------
 # Install and distribution rules
 
-EXTRA_DIST = 		Doxyfile iptsec.docs testpasswd \
-			auth_module_sip.c $(HTTP_SRC) $(BUILT_SOURCES)
+EXTRA_DIST = 		Doxyfile iptsec.docs testpasswd $(BUILT_SOURCES)
 
 # ----------------------------------------------------------------------
 # Sofia specific rules