From f1d420baa9db24443b7ec6e002a05f5705442931 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Fri, 28 Oct 2016 23:37:17 +0200
Subject: libX11/Imakefile: add missing dependencies on ks_tables.h

---
 nx-X11/lib/X11/Imakefile | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'nx-X11/lib/X11/Imakefile')

diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile
index e9ee564cd..31008c8d2 100644
--- a/nx-X11/lib/X11/Imakefile
+++ b/nx-X11/lib/X11/Imakefile
@@ -1126,6 +1126,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))
 
-- 
cgit v1.2.3


From 5a90a638f89c87ddf153520e8f352ea38b3afe1e Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Fri, 28 Oct 2016 23:38:17 +0200
Subject: 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
---
 nx-X11/lib/X11/Imakefile | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'nx-X11/lib/X11/Imakefile')

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
-- 
cgit v1.2.3