Move makekeys to separate subdir
The build is a little cleaner when makekeys has its own Makefile.master
parent
b2737e9bfb
commit
49cda1187f
|
@ -77,5 +77,6 @@ AC_OUTPUT([
|
|||
Makefile
|
||||
include/Makefile
|
||||
src/Makefile
|
||||
src/makekeys/Makefile
|
||||
test/Makefile
|
||||
])
|
||||
|
|
|
@ -1,3 +1,2 @@
|
|||
ks_tables.h
|
||||
libxkbcommon.la
|
||||
makekeys
|
||||
|
|
|
@ -1,13 +1,15 @@
|
|||
SUBDIRS = makekeys
|
||||
|
||||
INCLUDES = -I$(top_srcdir)/include
|
||||
|
||||
noinst_PROGRAMS = makekeys
|
||||
makekeys_CFLAGS = $(X11_CFLAGS)
|
||||
makekeys: CC = $(CC_FOR_BUILD)
|
||||
|
||||
BUILT_SOURCES = ks_tables.h
|
||||
ks_tables.h: makekeys
|
||||
ks_tables.h: $(builddir)/makekeys/makekeys$(EXEEXT)
|
||||
@rm -f $@
|
||||
cat $(KEYSYMDEF_H) $(XF86KEYSYM_H) | $(builddir)/makekeys$(EXEEXT) >$@
|
||||
cat $(KEYSYMDEF_H) $(XF86KEYSYM_H) | \
|
||||
$(builddir)/makekeys/makekeys$(EXEEXT) >$@
|
||||
|
||||
$(builddir)/makekeys/makekeys$(EXEEXT):
|
||||
@cd makekeys && $(MAKE) $(AM_MAKEFLAGS)
|
||||
|
||||
lib_LTLIBRARIES = libxkbcommon.la
|
||||
libxkbcommon_la_CFLAGS = $(X11_CFLAGS)
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
makekeys
|
|
@ -0,0 +1,6 @@
|
|||
INCLUDES = -I$(top_srcdir)/include
|
||||
|
||||
# need to use build-native compiler
|
||||
CC = $(CC_FOR_BUILD)
|
||||
noinst_PROGRAMS = makekeys
|
||||
makekeys_CFLAGS = $(X11_CFLAGS)
|
Loading…
Reference in New Issue