------------------------------------------------------------
revno: 12606
revision-id: squid3@treenet.co.nz-20130909063054-7b1gdi9tojhyrv6a
parent: squid3@treenet.co.nz-20130909060927-kxpnvbut97idh1pu
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.3
timestamp: Mon 2013-09-09 00:30:54 -0600
message:
  Windows: build Windows specific libraries only on Windows.
  
  Some libraries are only available on Windows and others are unable to be
  built.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20130909063054-7b1gdi9tojhyrv6a
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# testament_sha1: 1fb0fa2019bd04a7c393d280ec62361180caa123
# timestamp: 2013-09-09 06:31:26 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# base_revision_id: squid3@treenet.co.nz-20130909060927-\
#   kxpnvbut97idh1pu
# 
# Begin patch
=== modified file 'lib/Makefile.am'
--- lib/Makefile.am	2012-10-05 13:10:15 +0000
+++ lib/Makefile.am	2013-09-09 06:30:54 +0000
@@ -1,12 +1,9 @@
 include $(top_srcdir)/src/Common.am
 
 DIST_SUBDIRS = ntlmauth profiler rfcnb smblib libTrie
+SUBDIRS=
 EXTRA_DIST=
 
-SUBDIRS = rfcnb smblib
-if ENABLE_AUTH_NTLM
-SUBDIRS += ntlmauth
-endif
 if USE_ESI
 SUBDIRS += libTrie
 endif
@@ -14,23 +11,28 @@
 SUBDIRS += profiler
 endif
 
-
 install: all
 install-strip: all
 
-if ENABLE_WIN32SPECIFIC
-LIBSSPWIN32=libsspwin32.la
-else
-LIBSSPWIN32=
-EXTRA_LTLIBRARIES = \
-	libsspwin32.la
-endif
-
 noinst_LTLIBRARIES = \
 	libmiscencoding.la \
 	libmisccontainers.la \
-	libmiscutil.la \
-	$(LIBSSPWIN32)
+	libmiscutil.la
+
+#
+# Some libraries are only available on Windows
+# and others are unable to be built.
+#
+if ENABLE_WIN32SPECIFIC
+noinst_LTLIBRARIES += libsspwin32.la
+libsspwin32_la_SOURCES = sspwin32.c
+else
+SUBDIRS += rfcnb smblib
+EXTRA_DIST += sspwin32.c
+endif
+if ENABLE_AUTH_NTLM
+SUBDIRS += ntlmauth
+endif
 
 #
 # dirent.c, encrypt.c and getopt.c are needed for native Windows support.
@@ -71,10 +73,6 @@
 	util.c \
 	xusleep.c
 
-# $(top_srcdir)/include/version.h should be a dependency
-libsspwin32_la_SOURCES = \
-	sspwin32.c
-
 TESTS += tests/testAll
 
 check_PROGRAMS += tests/testAll