aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2016-08-27 03:24:22 +0200
committerUlrich Sibiller <uli42@gmx.de>2016-10-10 22:52:32 +0200
commit0bcb4bba2a1c4bf0464f0ce0305648ee539ece98 (patch)
treed7eec42c372bed3fa872c9f326a2ebbc379c1198 /nx-X11
parentc98265ab4634db314eeaa54e55ee8edb3c803967 (diff)
downloadnx-libs-0bcb4bba2a1c4bf0464f0ce0305648ee539ece98.tar.gz
nx-libs-0bcb4bba2a1c4bf0464f0ce0305648ee539ece98.tar.bz2
nx-libs-0bcb4bba2a1c4bf0464f0ce0305648ee539ece98.zip
adapt Imakefile to call makekeys correctly after update
makekeys expects filenames as arguments instead of stdin
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/lib/X11/Imakefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile
index 76f26be5d..d4045b615 100644
--- a/nx-X11/lib/X11/Imakefile
+++ b/nx-X11/lib/X11/Imakefile
@@ -1108,6 +1108,7 @@ LOCAL_LDFLAGS=-F
#endif
MAKEKEYS = ./makekeys
+KEYSYMDEFS = $(XINCLUDESRC)/keysymdef.h $(XINCLUDESRC)/XF86keysym.h $(XINCLUDESRC)/Sunkeysym.h $(XINCLUDESRC)/DECkeysym.h $(XINCLUDESRC)/HPkeysym.h
#if CrossCompiling
HOST_LDLIBS=
@@ -1118,10 +1119,10 @@ HOST_LDLIBS=$(LDLIBS)
HOST_CFLAGS=$(CFLAGS)
#endif
-ks_tables.h: $(XINCLUDESRC)/keysymdef.h util/makekeys.c
+ks_tables.h: $(KEYSYMDEFS) util/makekeys.c
RemoveFiles($@ HostProgramTargetName(makekeys) makekeys.Osuf)
-HostLinkRule(HostProgramTargetName(makekeys),$(HOST_CFLAGS) $(LOCAL_LDFLAGS),util/makekeys.c,$(HOST_LDLIBS))
- RunProgram(MAKEKEYS,< $(XINCLUDESRC)/keysymdef.h > ks_tables_h)
+ RunProgram(MAKEKEYS, $(KEYSYMDEFS) > ks_tables_h)
$(MV) ks_tables_h $@
RemoveFiles(HostProgramTargetName(makekeys) makekeys.Osuf ks_tables_h)