From: Brian P. Hinz <bphinz@users.sf.net>
Date: Thu, 23 Oct 2014 02:36:25 +0000 (-0400)
Subject: Set -DBUILD_STATIC=off for package builds.
X-Git-Tag: v1.3.90~19^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5e3467b8cd7e6a17d9656ab5273e56f895a78d32;p=tigervnc.git

Set -DBUILD_STATIC=off for package builds.

Commit f95272d set the BUILD_STATIC flag on by default, which is unnecessary for package builds.
---

diff --git a/contrib/packages/deb/ubuntu-precise/debian/rules b/contrib/packages/deb/ubuntu-precise/debian/rules
index b338f725..29f5632f 100755
--- a/contrib/packages/deb/ubuntu-precise/debian/rules
+++ b/contrib/packages/deb/ubuntu-precise/debian/rules
@@ -51,6 +51,7 @@ config-stamp:
   	-DOPTION_BUILD_EXAMPLES=off \
   	-DOPTION_USE_SYSTEM_LIBPNG=on;make) 
 	cmake -G"Unix Makefiles" \
+    -DBUILD_STATIC=off \
   	-DCMAKE_INSTALL_PREFIX=/usr \
   	-DFLTK_LIBRARIES="$(CURDIR)/fltk-1.3.2/lib/libfltk.a;$(CURDIR)/fltk-1.3.2/lib/libfltk_images.a;-lpng" \
   	-DFLTK_INCLUDE_DIR=$(CURDIR)/fltk-1.3.2
diff --git a/contrib/packages/deb/ubuntu-trusty/debian/rules b/contrib/packages/deb/ubuntu-trusty/debian/rules
index f9f731b1..515cf2fa 100755
--- a/contrib/packages/deb/ubuntu-trusty/debian/rules
+++ b/contrib/packages/deb/ubuntu-trusty/debian/rules
@@ -58,6 +58,7 @@ config-stamp:
     ./configure --enable-shared=no --enable-cairo --enable-cp936 \
     --with-optim="$(CFLAGS) $(XCFLAGS)" --libdir=$(libdir);make)
 	cmake -G"Unix Makefiles" \
+    -DBUILD_STATIC=off \
   	-DCMAKE_INSTALL_PREFIX=/usr \
   	-DFLTK_LIBRARIES="$(CURDIR)/fltk-1.3.2/lib/libfltk.a;$(CURDIR)/fltk-1.3.2/lib/libfltk_images.a;-lpng" \
   	-DFLTK_INCLUDE_DIR=$(CURDIR)/fltk-1.3.2
diff --git a/contrib/packages/rpm/el6/SPECS/tigervnc.spec b/contrib/packages/rpm/el6/SPECS/tigervnc.spec
index 5df424de..11b39f62 100644
--- a/contrib/packages/rpm/el6/SPECS/tigervnc.spec
+++ b/contrib/packages/rpm/el6/SPECS/tigervnc.spec
@@ -181,6 +181,7 @@ make %{?_smp_mflags}
 popd
 
 %{cmake28} -G"Unix Makefiles" \
+  -DBUILD_STATIC=off \
   -DCMAKE_INSTALL_PREFIX=%{_prefix} \
   -DFLTK_LIBRARIES="%{tigervnc_src_dir}/fltk-1.3.2/lib/libfltk.a;%{tigervnc_src_dir}/fltk-1.3.2/lib/libfltk_images.a;-lpng" \
   -DFLTK_INCLUDE_DIR=%{tigervnc_src_dir}/fltk-1.3.2
diff --git a/contrib/packages/rpm/sle11/SPECS/tigervnc.spec b/contrib/packages/rpm/sle11/SPECS/tigervnc.spec
index 5258a9f7..ddf93101 100644
--- a/contrib/packages/rpm/sle11/SPECS/tigervnc.spec
+++ b/contrib/packages/rpm/sle11/SPECS/tigervnc.spec
@@ -275,6 +275,7 @@ popd
 
 # Build all tigervnc
 cmake -G"Unix Makefiles" \
+  -DBUILD_STATIC=off \
   -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
   -DCMAKE_BUILD_TYPE=RelWithDebInfo \
   -DJPEG_INCLUDE_DIR=%{static_lib_buildroot}%{_includedir} \