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 b338f72506f202410121999d4c5cfb3b246f80bf..29f5632f1175f04f6c3e83e58dc64d124cee175d 100755 (executable)
--- 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 f9f731b18ebb655e489bd6a9e2d827ce7294543e..515cf2fa916a1f849840338c68deb5bcda5554af 100755 (executable)
--- 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 5df424de51d9735f1531b3f85c0d20d864b89b04..11b39f625d5ce050866c6db09c31547ad0f8beb2 100644 (file)
--- 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 5258a9f7d5ba7fdabe2a6dad5db1cdb7fc2c5f25..ddf9310143fb1b24e215af463003e19a0ac55e31 100644 (file)
--- 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} \