diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2016-10-28 23:38:17 +0200 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2016-11-02 17:06:47 +0100 |
| commit | 5a90a638f89c87ddf153520e8f352ea38b3afe1e (patch) | |
| tree | a7efa99327fc73c440c7373b61d6d7faa4b42f44 | |
| parent | f1d420baa9db24443b7ec6e002a05f5705442931 (diff) | |
| download | nx-libs-5a90a638f89c87ddf153520e8f352ea38b3afe1e.tar.gz nx-libs-5a90a638f89c87ddf153520e8f352ea38b3afe1e.tar.bz2 nx-libs-5a90a638f89c87ddf153520e8f352ea38b3afe1e.zip | |
libX11/Imakefile: handle libX11 links
Create libX11* link in exports/lib. This simplifies running nxagent
from the build directory.
This also adds a clean rule to remove the libX11 links as well as the
libNX_X11 links which was not done before.
Fixes ArcticaProject/nx-libs#234
| -rw-r--r-- | nx-X11/lib/X11/Imakefile | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile index 31008c8d2..e52e429c4 100644 --- a/nx-X11/lib/X11/Imakefile +++ b/nx-X11/lib/X11/Imakefile @@ -50,6 +50,15 @@ NX_DEFINES = -DNX_TRANS_SOCKET \ # -DNX_TRANS_TEST \ # -DNX_TRANS_DEBUG \ +/* + This is used to create libX11* links in exports/lib. + It is a dependency of the part that links the libNX_X11.so + to exports/lib and is therefore called _before_ any libNX* + links exist. + The make target libX11-links is at the end of the file. +*/ +EXTRALIBRARYDEPS = libX11-links + #ifdef cygwinArchitecture NX_XCOMPLIBNAME = cygXcomp.dll NX_XCOMPEXTLIBNAME = cygXcompext.dll @@ -1164,3 +1173,21 @@ XlibConf.h: echo '/* Defines needed to use Xlib from non-imake projects */' > $@ XThreadsDefine MTSafeAPIDefine + +/* create libX11 links in exports/lib */ +libX11-links: + MakeDir($(BUILDLIBDIR)) + @MAJREV=`echo $(SOXLIBREV) | cut -d. -f1`;\ + (for i in "" .$$MAJREV .$(SOXLIBREV); do\ + t="lib$(LIBNAME).so$$i";\ + l="libX11.so$$i";\ + $(RM) "$(BUILDLIBDIR)/$$l";\ + (set -x; $(LN) "$$t" "$(BUILDLIBDIR)/$$l");\ + done) + +/* remove libX11 _and_ libNX_X11 links in epxorts/lib */ +clean:: + @MAJREV=`echo $(SOXLIBREV) | cut -d. -f1`;\ + set -x; for i in "" .$$MAJREV .$(SOXLIBREV); do\ + $(RM) "$(BUILDLIBDIR)/lib$(LIBNAME).so$$i" "$(BUILDLIBDIR)/libX11.so$$i";\ + done |