diff --git a/Makefile b/Makefile index 7b3a6e3..8a35823 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ PACKAGE = Keyboard VERSION = 0.2.1 SUBDIRS = data include po src tools -RM ?= rm -f -LN ?= ln -f -TAR ?= tar -czvf +RM = rm -f +LN = ln -f +TAR = tar -czvf all: subdirs diff --git a/data/Makefile b/data/Makefile index 0d4c9ad..0ddf7f9 100644 --- a/data/Makefile +++ b/data/Makefile @@ -1,8 +1,8 @@ PREFIX = /usr/local DESTDIR = -MKDIR ?= mkdir -p -INSTALL ?= install -RM ?= rm -f +MKDIR = mkdir -p +INSTALL = install +RM = rm -f all: diff --git a/include/Makefile b/include/Makefile index c507cbc..88a5223 100644 --- a/include/Makefile +++ b/include/Makefile @@ -1,9 +1,9 @@ PREFIX = /usr/local DESTDIR = -RM ?= rm -f -LN ?= ln -f -MKDIR ?= mkdir -p -INSTALL ?= install +RM = rm -f +LN = ln -f +MKDIR = mkdir -p +INSTALL = install INCLUDEDIR= $(PREFIX)/include diff --git a/po/Makefile b/po/Makefile index 72adfa3..590a186 100644 --- a/po/Makefile +++ b/po/Makefile @@ -1,10 +1,10 @@ TARGETS = Keyboard.pot fr.mo PREFIX = /usr/local DESTDIR = -RM ?= rm -f -LN ?= ln -f -MKDIR ?= mkdir -p -INSTALL ?= install +RM = rm -f +LN = ln -f +MKDIR = mkdir -p +INSTALL = install all: $(TARGETS) diff --git a/src/Makefile b/src/Makefile index 10dea77..a76a6ac 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2,16 +2,17 @@ TARGETS = keyboard keyboardctl PREFIX = /usr/local DESTDIR = BINDIR = $(PREFIX)/bin -CC ?= cc -CPPFLAGSF?= -CPPFLAGS?= +SBINDIR = $(PREFIX)/sbin +CC = cc +CPPFLAGSF= +CPPFLAGS= CFLAGSF = -W `pkg-config --cflags libDesktop` CFLAGS = -Wall -g -pedantic LDFLAGSF= `pkg-config --libs libDesktop` -RM ?= rm -f -LN ?= ln -f -MKDIR ?= mkdir -p -INSTALL ?= install +RM = rm -f +LN = ln -f +MKDIR = mkdir -p +INSTALL = install all: $(TARGETS) diff --git a/tools/Makefile b/tools/Makefile index fdcf548..7c32be7 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -2,16 +2,17 @@ TARGETS = plug snooper xkey PREFIX = /usr/local DESTDIR = BINDIR = $(PREFIX)/bin -CC ?= cc -CPPFLAGSF?= -CPPFLAGS?= +SBINDIR = $(PREFIX)/sbin +CC = cc +CPPFLAGSF= +CPPFLAGS= CFLAGSF = -W `pkg-config --cflags gtk+-2.0` CFLAGS = -Wall -g -O2 LDFLAGSF= `pkg-config --libs gtk+-2.0` -RM ?= rm -f -LN ?= ln -f -MKDIR ?= mkdir -p -INSTALL ?= install +RM = rm -f +LN = ln -f +MKDIR = mkdir -p +INSTALL = install all: $(TARGETS)