From 76a355dd98b2bedffb64503ab1ac42f2105c8149 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Fri, 16 Sep 2011 11:36:26 +0000 Subject: [PATCH] Re-generated Makefiles --- Makefile | 6 +++--- data/16x16/Makefile | 6 +++--- data/24x24/Makefile | 6 +++--- data/48x48/Makefile | 6 +++--- data/Makefile | 6 +++--- po/Makefile | 8 ++++---- src/Makefile | 12 ++++++------ 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile index 56b0f3d..8b00953 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ PACKAGE = Todo VERSION = 0.1.2 SUBDIRS = data po src -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 e09473e..a5efe63 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 240a362..60111df 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 bb3810a..d1f9c57 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 7052bdd..6ebed83 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 b966a6e..606be00 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 8071653..dd3e23e 100644 --- a/src/Makefile +++ b/src/Makefile @@ -3,16 +3,16 @@ PREFIX = /usr/local DESTDIR = BINDIR = $(PREFIX)/bin CC = cc -CPPFLAGSF= -CPPFLAGS= +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)