diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-12-09 16:22:17 -0500 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-12-18 11:19:56 -0500 |
| commit | 69e52ad901d6bb323c11b01ac1745233a9521b68 (patch) | |
| tree | d3a2d332ef7e92c05285b9b3d8556ce40fde5c9c | |
| parent | 89377d5cd1ea1dc0d5ce925cddf3260e08ba3b6a (diff) | |
config: makekeys prog should stand alone in the makekeys directory
This program is a utility to generated a header file.
The header file it generates should not be located in the
directory where this utility program is compiled.
Move the /makekeys dir as a sibling of /src.
This reduces the number of bi-directional relationships
between directories.
Make corresponding makefiles simplifications.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | makekeys/.gitignore | 1 | ||||
| -rw-r--r-- | makekeys/Makefile.am | 5 | ||||
| -rw-r--r-- | makekeys/makekeys.c (renamed from src/makekeys/makekeys.c) | 0 | ||||
| -rw-r--r-- | src/.gitignore (renamed from src/makekeys/.gitignore) | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 10 | ||||
| -rw-r--r-- | src/makekeys/Makefile.am | 13 |
8 files changed, 17 insertions, 18 deletions
diff --git a/Makefile.am b/Makefile.am index 4ad18e7..2a4d448 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,5 @@ -SUBDIRS = include src test +# Order: makekeys before src +SUBDIRS = include makekeys src test pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xkbcommon.pc diff --git a/configure.ac b/configure.ac index 7f8f9fa..f8175ba 100644 --- a/configure.ac +++ b/configure.ac @@ -99,8 +99,8 @@ AC_CONFIG_FILES([ Makefile xkbcommon.pc include/Makefile + makekeys/Makefile src/Makefile - src/makekeys/Makefile src/xkbcomp/Makefile test/Makefile]) AC_OUTPUT diff --git a/makekeys/.gitignore b/makekeys/.gitignore new file mode 100644 index 0000000..2bdb5e0 --- /dev/null +++ b/makekeys/.gitignore @@ -0,0 +1 @@ +makekeys diff --git a/makekeys/Makefile.am b/makekeys/Makefile.am new file mode 100644 index 0000000..75ed164 --- /dev/null +++ b/makekeys/Makefile.am @@ -0,0 +1,5 @@ +AM_CFLAGS = $(X11_CFLAGS) $(CWARNFLAGS) + +# need to use build-native compiler +CC = $(CC_FOR_BUILD) +noinst_PROGRAMS = makekeys diff --git a/src/makekeys/makekeys.c b/makekeys/makekeys.c index c4142ec..c4142ec 100644 --- a/src/makekeys/makekeys.c +++ b/makekeys/makekeys.c diff --git a/src/makekeys/.gitignore b/src/.gitignore index 6251fb4..fe11434 100644 --- a/src/makekeys/.gitignore +++ b/src/.gitignore @@ -1,2 +1 @@ ks_tables.h -makekeys diff --git a/src/Makefile.am b/src/Makefile.am index 7ae10de..9a77ece 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ -SUBDIRS = makekeys xkbcomp +SUBDIRS = xkbcomp -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(builddir)/makekeys +AM_CPPFLAGS = -I$(top_srcdir)/include AM_CFLAGS = $(X11_CFLAGS) $(CWARNFLAGS) $(XMALLOC_ZERO_CFLAGS) lib_LTLIBRARIES = libxkbcommon.la @@ -22,3 +22,9 @@ libxkbcommon_la_SOURCES = \ xkbgeom.h \ xkbmisc.h \ xkbrules.h + +BUILT_SOURCES = ks_tables.h +CLEANFILES = $(BUILT_SOURCES) + +ks_tables.h: $(top_builddir)/makekeys/makekeys$(EXEEXT) + $(AM_V_GEN)cat $(KEYSYMDEF_H) $(XF86KEYSYM_H) | $(top_builddir)/makekeys/makekeys$(EXEEXT) > $@ diff --git a/src/makekeys/Makefile.am b/src/makekeys/Makefile.am deleted file mode 100644 index 1847034..0000000 --- a/src/makekeys/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include -AM_CFLAGS = $(X11_CFLAGS) $(CWARNFLAGS) - -# need to use build-native compiler -CC = $(CC_FOR_BUILD) -noinst_PROGRAMS = makekeys - -nodist_noinst_HEADERS = ks_tables.h -CLEANFILES = ks_tables.h - -ks_tables.h: makekeys$(EXEEXT) - @rm -f $@ - cat $(KEYSYMDEF_H) $(XF86KEYSYM_H) | $(builddir)/makekeys$(EXEEXT) > $@ |