From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 11 Oct 2012 07:10:01 +0000 (-0600)
Subject: Windows: build Windows specific libraries only on Windows.
X-Git-Tag: SQUID_3_4_0_1~578
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=60bb82101ceaa5a24c4e63977ecf7e7c38cda108;p=thirdparty%2Fsquid.git

Windows: build Windows specific libraries only on Windows.

Some libraries are only available on Windows and others are unable to be built.
---

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 9130138799..bf97ce697d 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -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 @@ if ENABLE_XPROF_STATS
 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 @@ libmiscutil_la_SOURCES = \
 	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