Skip to content

N
nx-libs
Commit 0bcb4bba authored by Ulrich Sibiller's avatar Ulrich Sibiller
Browse files
Options

adapt Imakefile to call makekeys correctly after update

makekeys expects filenames as arguments instead of stdin
parent c98265ab
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
nx-X11/lib/X11/Imakefile
View file @ 0bcb4bba
...@@ -1108,6 +1108,7 @@ LOCAL_LDFLAGS=-F ...@@ -1108,6 +1108,7 @@ LOCAL_LDFLAGS=-F
#endif #endif
MAKEKEYS = ./makekeys MAKEKEYS = ./makekeys
KEYSYMDEFS = $(XINCLUDESRC)/keysymdef.h $(XINCLUDESRC)/XF86keysym.h $(XINCLUDESRC)/Sunkeysym.h $(XINCLUDESRC)/DECkeysym.h $(XINCLUDESRC)/HPkeysym.h
#if CrossCompiling #if CrossCompiling
HOST_LDLIBS= HOST_LDLIBS=
...@@ -1118,10 +1119,10 @@ HOST_LDLIBS=$(LDLIBS) ...@@ -1118,10 +1119,10 @@ HOST_LDLIBS=$(LDLIBS)
HOST_CFLAGS=$(CFLAGS) HOST_CFLAGS=$(CFLAGS)
#endif #endif
ks_tables.h: $(XINCLUDESRC)/keysymdef.h util/makekeys.c ks_tables.h: $(KEYSYMDEFS) util/makekeys.c
RemoveFiles($@ HostProgramTargetName(makekeys) makekeys.Osuf) RemoveFiles($@ HostProgramTargetName(makekeys) makekeys.Osuf)
-HostLinkRule(HostProgramTargetName(makekeys),$(HOST_CFLAGS) $(LOCAL_LDFLAGS),util/makekeys.c,$(HOST_LDLIBS)) -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 $@ $(MV) ks_tables_h $@
RemoveFiles(HostProgramTargetName(makekeys) makekeys.Osuf ks_tables_h) RemoveFiles(HostProgramTargetName(makekeys) makekeys.Osuf ks_tables_h)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment