diff options
| author | Ran Benita <ran234@gmail.com> | 2012-07-23 00:41:27 +0300 |
|---|---|---|
| committer | Ran Benita <ran234@gmail.com> | 2012-07-23 00:45:34 +0300 |
| commit | 5e164ff1f9b3539ddf1d3adea8225c1549d343db (patch) | |
| tree | c65f91c1c5504ca6f07f033a471f862df792a401 | |
| parent | 2fc0ad5001bc378a2728f24bdbc84e8e0f30f675 (diff) | |
| download | xorg-lib-libxkbcommon-5e164ff1f9b3539ddf1d3adea8225c1549d343db.tar.gz | |
build: drop the include/ directory
The include/ dir is somewhat redundant and makes it just a bit harder to
handle the -I directives from out side of automake; without it the
default $(top_buildir) just works.
Here's also some further justifications I found:
http://smcv.pseudorandom.co.uk/2008/09/pc-uninstalled/
Signed-off-by: Ran Benita <ran234@gmail.com>
| -rw-r--r-- | Makefile.am | 11 | ||||
| -rw-r--r-- | makekeys/Makefile.am | 3 | ||||
| -rw-r--r-- | xkbcommon-uninstalled.pc.in | 2 | ||||
| -rw-r--r-- | xkbcommon/xkbcommon-keysyms.h (renamed from include/xkbcommon/xkbcommon-keysyms.h) | 0 | ||||
| -rw-r--r-- | xkbcommon/xkbcommon-names.h (renamed from include/xkbcommon/xkbcommon-names.h) | 0 | ||||
| -rw-r--r-- | xkbcommon/xkbcommon.h (renamed from include/xkbcommon/xkbcommon.h) | 0 |
6 files changed, 7 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index d5ead73..ca715fe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,6 @@ dist-hook: ChangeLog INSTALL AM_CPPFLAGS = \ -DDFLT_XKB_CONFIG_ROOT='"$(XKBCONFIGROOT)"' \ - -I$(top_srcdir)/include \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/xkbcomp \ -I$(top_builddir)/src/xkbcomp \ @@ -33,9 +32,9 @@ AM_YFLAGS = -d xkbcommonincludedir = $(includedir)/xkbcommon xkbcommoninclude_HEADERS = \ - include/xkbcommon/xkbcommon.h \ - include/xkbcommon/xkbcommon-names.h \ - include/xkbcommon/xkbcommon-keysyms.h + xkbcommon/xkbcommon.h \ + xkbcommon/xkbcommon-names.h \ + xkbcommon/xkbcommon-keysyms.h lib_LTLIBRARIES = libxkbcommon.la libxkbcommon_la_LDFLAGS = -no-undefined @@ -92,7 +91,7 @@ src/xkbcomp/parser.h: $(top_builddir)/src/$(am__dirstamp) $(top_builddir)/src/xk src/xkbcomp/scanner.c: $(top_builddir)/src/$(am__dirstamp) $(top_builddir)/src/xkbcomp/$(am__dirstamp) src/ks_tables.h: $(top_builddir)/makekeys/makekeys$(EXEEXT) - $(AM_V_GEN)$(top_builddir)/makekeys/makekeys $(top_srcdir)/include/xkbcommon/xkbcommon-keysyms.h > $@ + $(AM_V_GEN)$(top_builddir)/makekeys/makekeys $(top_srcdir)/xkbcommon/xkbcommon-keysyms.h > $@ $(top_builddir)/makekeys/makekeys$(EXEEXT): $(top_srcdir)/makekeys/makekeys.c $(MAKE) -C makekeys @@ -153,4 +152,4 @@ KEYSYMDEFS = \ $(X11_INCLUDEDIR)/DECkeysym.h \ $(X11_INCLUDEDIR)/HPkeysym.h update-keysyms: - sed -e '/XK_Ydiaeresis\s*0x100000ee/d; /#define _/d; s/#define\s*\(\w*\)XK_/#define XKB_KEY_\1/; /\(#ifdef\|#ifndef\|#endif\)/d' $(KEYSYMDEFS) > include/xkbcommon/xkbcommon-keysyms.h + sed -e '/XK_Ydiaeresis\s*0x100000ee/d; /#define _/d; s/#define\s*\(\w*\)XK_/#define XKB_KEY_\1/; /\(#ifdef\|#ifndef\|#endif\)/d' $(KEYSYMDEFS) > xkbcommon/xkbcommon-keysyms.h diff --git a/makekeys/Makefile.am b/makekeys/Makefile.am index bb93777..3c0aadb 100644 --- a/makekeys/Makefile.am +++ b/makekeys/Makefile.am @@ -1,5 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include -AM_CFLAGS = $(X11_CFLAGS) $(CWARNFLAGS) +AM_CFLAGS = $(BASE_CFLAGS) # need to use build-native compiler diff --git a/xkbcommon-uninstalled.pc.in b/xkbcommon-uninstalled.pc.in index ca116d2..d4d6a2b 100644 --- a/xkbcommon-uninstalled.pc.in +++ b/xkbcommon-uninstalled.pc.in @@ -1,5 +1,5 @@ libdir=@abs_top_builddir@/.libs -includedir=@abs_top_srcdir@/include +includedir=@abs_top_srcdir@ Name: xkbcommon Description: XKB API common to servers and clients (uninstalled) diff --git a/include/xkbcommon/xkbcommon-keysyms.h b/xkbcommon/xkbcommon-keysyms.h index 2c1ab95..2c1ab95 100644 --- a/include/xkbcommon/xkbcommon-keysyms.h +++ b/xkbcommon/xkbcommon-keysyms.h diff --git a/include/xkbcommon/xkbcommon-names.h b/xkbcommon/xkbcommon-names.h index c302a35..c302a35 100644 --- a/include/xkbcommon/xkbcommon-names.h +++ b/xkbcommon/xkbcommon-names.h diff --git a/include/xkbcommon/xkbcommon.h b/xkbcommon/xkbcommon.h index 42f70ad..42f70ad 100644 --- a/include/xkbcommon/xkbcommon.h +++ b/xkbcommon/xkbcommon.h |