From 0bcb4bba2a1c4bf0464f0ce0305648ee539ece98 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sat, 27 Aug 2016 03:24:22 +0200 Subject: adapt Imakefile to call makekeys correctly after update makekeys expects filenames as arguments instead of stdin --- nx-X11/lib/X11/Imakefile | 5 +++-- 1 file 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) -- cgit v1.2.3