From 5c61b8deee9aee832fbb7a8ab5be08c3e57e7308 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Mon, 7 Jan 2013 02:21:29 +0100 Subject: [PATCH] Re-generated Makefiles --- Makefile | 6 +++--- data/Makefile | 6 +++--- po/Makefile | 8 ++++---- src/Makefile | 15 ++++++++------- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 2a1eeaf..36eb6a0 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ PACKAGE = XMLEditor VERSION = 0.0.0 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/Makefile b/data/Makefile index e58218f..06c38b2 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/po/Makefile b/po/Makefile index fa57a01..a127f32 100644 --- a/po/Makefile +++ b/po/Makefile @@ -1,10 +1,10 @@ TARGETS = XMLEditor.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 0195084..26e6ed1 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2,17 +2,18 @@ TARGETS = xmleditor PREFIX = /usr/local DESTDIR = BINDIR = $(PREFIX)/bin -CC ?= cc -CPPFLAGSF?= -CPPFLAGS?= +SBINDIR = $(PREFIX)/sbin +CC = cc +CPPFLAGSF= +CPPFLAGS= CFLAGSF = -W `pkg-config --cflags libParser libDesktop` CFLAGS = -Wall -g -O2 -pedantic LDFLAGSF= `pkg-config --libs libParser 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)