diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-11-02 17:53:15 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-11-02 17:53:15 +0100 |
| commit | 6eb8d3ec60549e54ea2b4df3e4a53a84045ea1cd (patch) | |
| tree | a7efa99327fc73c440c7373b61d6d7faa4b42f44 | |
| parent | 4c59a3c58b873440573cd29eee0ead6f7dd78fcf (diff) | |
| parent | 5a90a638f89c87ddf153520e8f352ea38b3afe1e (diff) | |
| download | nx-libs-6eb8d3ec60549e54ea2b4df3e4a53a84045ea1cd.tar.gz nx-libs-6eb8d3ec60549e54ea2b4df3e4a53a84045ea1cd.tar.bz2 nx-libs-6eb8d3ec60549e54ea2b4df3e4a53a84045ea1cd.zip | |
Merge branch 'uli42-pr/add_libX11_links' into 3.6.x
Attributes GH PR #248: https://github.com/ArcticaProject/nx-libs/pull/248
| -rw-r--r-- | nx-X11/lib/X11/Imakefile | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile index e9ee564cd..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 @@ -1126,6 +1135,9 @@ depend:: ks_tables.h clean:: RemoveFiles(ks_tables_h ks_tables.h HostProgramTargetName(makekeys)) +KeysymStr.o: ks_tables.h + +StrKeysym.o: ks_tables.h DependTarget3($(SRCS1),$(SRCS2),$(SRCS3) $(EXTRASRCS)) @@ -1161,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 |