Commit 12c6764f authored by dscho's avatar dscho

build x11vnc with static libraries (at least for now)

Maybe at a later stage, we want x11vnc to pick up on existing
libvncserver.so and libvncclient.so, but right now, x11vnc and the
libraries progress together (and thus it is better to build static,
necessarily up-to-date libraries for x11vnc).
parent ca805667
...@@ -12,6 +12,7 @@ sed -e "s/LibVNCServer, [^,)]*\([(,]\)*/x11vnc, $VERSION\1/g" \ ...@@ -12,6 +12,7 @@ sed -e "s/LibVNCServer, [^,)]*\([(,]\)*/x11vnc, $VERSION\1/g" \
-e "s/\(contrib\|examples\|vncterm\|test\|client_examples\)\/Makefile//g" \ -e "s/\(contrib\|examples\|vncterm\|test\|client_examples\)\/Makefile//g" \
-e "s/LibVNCServer.spec/x11vnc.spec/g" \ -e "s/LibVNCServer.spec/x11vnc.spec/g" \
-e "s/^.*libvncserver-config//g" \ -e "s/^.*libvncserver-config//g" \
-e "s/AC_PROG_LIBTOOL/AC_PROG_RANLIB/" \
> configure.ac > configure.ac
mv Makefile.am Makefile.am.LibVNCServer mv Makefile.am Makefile.am.LibVNCServer
...@@ -74,14 +75,29 @@ mv libvncserver/Makefile.am libvncserver/Makefile.am.LibVNCServer ...@@ -74,14 +75,29 @@ mv libvncserver/Makefile.am libvncserver/Makefile.am.LibVNCServer
cat libvncserver/Makefile.am.LibVNCServer | \ cat libvncserver/Makefile.am.LibVNCServer | \
sed -e "s/\(include\|LIB\|lib\)_/noinst_/g" \ sed -e "s/\(include\|LIB\|lib\)_/noinst_/g" \
-e "s/_la_/_a_/" \
-e "s/\.la/.a/" \
-e "s/_LTLIBRARIES/_LIBRARIES/" \
> libvncserver/Makefile.am > libvncserver/Makefile.am
mv libvncclient/Makefile.am libvncclient/Makefile.am.LibVNCServer mv libvncclient/Makefile.am libvncclient/Makefile.am.LibVNCServer
cat libvncclient/Makefile.am.LibVNCServer | \ cat libvncclient/Makefile.am.LibVNCServer | \
sed -e "s/\(include\|LIB\|lib\)_/noinst_/g" \ sed -e "s/\(include\|LIB\|lib\)_/noinst_/g" \
-e "s/_la_/_a_/" \
-e "s/\.la/.a/" \
-e "s/_LTLIBRARIES/_LIBRARIES/" \
> libvncclient/Makefile.am > libvncclient/Makefile.am
mv x11vnc/Makefile.am x11vnc/Makefile.am.LibVNCServer
cat x11vnc/Makefile.am.LibVNCServer | \
sed -e "s/_la_/_a_/" \
-e "s/\.la/.a/g" \
-e "s/_LTLIBRARIES/_LIBRARIES/" \
> x11vnc/Makefile.am
cp classes/Makefile.am classes/Makefile.am.LibVNCServer cp classes/Makefile.am classes/Makefile.am.LibVNCServer
echo 'pkgdatadir = $(datadir)/@PACKAGE@/classes' >> classes/Makefile.am echo 'pkgdatadir = $(datadir)/@PACKAGE@/classes' >> classes/Makefile.am
echo 'pkgdata_DATA=VncViewer.jar index.vnc' >> classes/Makefile.am echo 'pkgdata_DATA=VncViewer.jar index.vnc' >> classes/Makefile.am
...@@ -102,7 +118,7 @@ sed -e "s/^\(_PKG.*\)\$PACKAGE\(.*\)$/\1LibVNCServer\2/" \ ...@@ -102,7 +118,7 @@ sed -e "s/^\(_PKG.*\)\$PACKAGE\(.*\)$/\1LibVNCServer\2/" \
> acinclude.m4 > acinclude.m4
make x11vnc-${VERSION}.tar.gz make x11vnc-${VERSION}.tar.gz
for f in configure.ac Makefile.am libvncserver/Makefile.am libvncclient/Makefile.am classes/Makefile.am classes/ssl/Makefile.am acinclude.m4 README; do for f in configure.ac Makefile.am x11vnc/Makefile.am libvncserver/Makefile.am libvncclient/Makefile.am classes/Makefile.am classes/ssl/Makefile.am acinclude.m4 README; do
mv -f $f.LibVNCServer $f mv -f $f.LibVNCServer $f
done done
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment