Merge 4d6a145ff3 into f69c5a3f2b

.gitignore

@@ -1 +1 @@
-xcape
+/build/

Makefile

@@ -1,26 +0,0 @@
-INSTALL=install
-PREFIX=/usr
-MANDIR?=/local/man/man1
-
-TARGET := xcape
-
-CFLAGS += -Wall
-CFLAGS += `pkg-config --cflags xtst x11`
-LDFLAGS += `pkg-config --libs xtst x11`
-LDFLAGS += -pthread
-
-all: $(TARGET)
-
-$(TARGET): xcape.c
-	$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
-
-install:
-	$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin
-	$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)$(MANDIR)
-	$(INSTALL) -m 0755 $(TARGET) $(DESTDIR)$(PREFIX)/bin/$(TARGET)
-	$(INSTALL) -m 0644 xcape.1 $(DESTDIR)$(PREFIX)$(MANDIR)/xcape.1
-
-clean:
-	rm $(TARGET)
-
-.PHONY: all clean install

README.md

@@ -12,11 +12,12 @@ editor ;)
 Minimal building instructions
 -----------------------------
 
-    $ sudo apt-get install git gcc make pkg-config libx11-dev libxtst-dev libxi-dev
-    $ mkdir xcape
-    $ cd xcape
-    $ git clone https://github.com/alols/xcape.git .
-    $ make
+    $ sudo apt-get install git gcc pkg-config libx11-dev libxtst-dev libxi-dev meson
+    $ git clone https://github.com/alols/xcape.git xcape
+    $ cd xcape/
+    $ mkdir build/
+    $ meson build/
+    $ ninja-build build/
 
 Usage
 -----

meson.build

@@ -0,0 +1,9 @@
+project('xcape', 'c')
+executable(
+  'xcape',
+  sources : 'xcape.c',
+  dependencies : [dependency('x11'), dependency('xtst')],
+  link_args : '-pthread',
+  install : true
+)
+install_man('xcape.1')