summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorRan Benita <ran234@gmail.com>2012-04-11 02:02:45 +0300
committerDaniel Stone <daniel@fooishbar.org>2012-05-01 13:59:23 +0100
commit409ec8a12ef54f3eea704a8234e4cd26928bf87e (patch)
tree91df4073a0819adc62fb10896a85cceeddf55f2d /Makefile.am
parentaff531fb4db5bb5ae266b55e1f81abb939e4d059 (diff)
Merge src/alloc.c and src/malloc.c
The two files do exactly the same sort of things, without any discernible reason for splitting them. Signed-off-by: Ran Benita <ran234@gmail.com> [daniels: Updated for xkb_desc -> xkb_keymap changes.]
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am1
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 1d13e39..6e4d41f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,7 +65,6 @@ libxkbcommon_la_SOURCES = \
src/atom.c \
src/context.c \
src/keysym.c \
- src/malloc.c \
src/map.c \
src/maprules.c \
src/misc.c \