diff --git a/Makefile b/Makefile index 676e2f8..7cee902 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ PACKAGE = Todo VERSION = 0.1.2 SUBDIRS = data 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/16x16/Makefile b/data/16x16/Makefile index a5efe63..e09473e 100644 --- a/data/16x16/Makefile +++ b/data/16x16/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/data/24x24/Makefile b/data/24x24/Makefile index 60111df..240a362 100644 --- a/data/24x24/Makefile +++ b/data/24x24/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/data/48x48/Makefile b/data/48x48/Makefile index d1f9c57..bb3810a 100644 --- a/data/48x48/Makefile +++ b/data/48x48/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/data/Makefile b/data/Makefile index 6ebed83..7052bdd 100644 --- a/data/Makefile +++ b/data/Makefile @@ -1,9 +1,9 @@ SUBDIRS = 16x16 24x24 48x48 PREFIX = /usr/local DESTDIR = -MKDIR ?= mkdir -p -INSTALL ?= install -RM ?= rm -f +MKDIR = mkdir -p +INSTALL = install +RM = rm -f all: subdirs diff --git a/po/Makefile b/po/Makefile index 606be00..b966a6e 100644 --- a/po/Makefile +++ b/po/Makefile @@ -1,10 +1,10 @@ TARGETS = Todo.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 fafe8b8..c3abafa 100644 --- a/src/Makefile +++ b/src/Makefile @@ -3,17 +3,17 @@ PREFIX = /usr/local DESTDIR = BINDIR = $(PREFIX)/bin SBINDIR = $(PREFIX)/sbin -CC ?= cc -CPPFLAGSF?= -CPPFLAGS?= +CC = cc +CPPFLAGSF= +CPPFLAGS= CFLAGSF = -W `pkg-config --cflags libSystem libDesktop` CFLAGS = -Wall -g -O2 -pedantic LDFLAGSF= `pkg-config --libs libSystem libDesktop` LDFLAGS = -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 cff2cb1..687c01d 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -2,19 +2,19 @@ TARGETS = todo.so PREFIX = /usr/local DESTDIR = LIBDIR = $(PREFIX)/lib -CC ?= cc -CPPFLAGSF?= -CPPFLAGS?= +CC = cc +CPPFLAGSF= +CPPFLAGS= CFLAGSF = -W -fPIC `pkg-config --cflags libDesktop Mailer` CFLAGS = -Wall -g -O2 -pedantic LDFLAGSF= `pkg-config --libs libDesktop` -AR ?= ar -RANLIB ?= ranlib -CCSHARED?= $(CC) -shared -RM ?= rm -f -LN ?= ln -f -MKDIR ?= mkdir -p -INSTALL ?= install +AR = ar +RANLIB = ranlib +CCSHARED= $(CC) -shared +RM = rm -f +LN = ln -f +MKDIR = mkdir -p +INSTALL = install all: $(TARGETS)