From 20e900caaea50f70e664e80db59593f3d29894be Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sat, 12 Jan 2013 03:35:50 +0100 Subject: [PATCH] Re-generated the Makefiles --- Makefile | 6 +++--- data/Makefile | 6 +++--- src/Makefile | 15 ++++++++------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 988cb3b..2c20101 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ PACKAGE = Probe VERSION = 0.0.2 SUBDIRS = data 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 cb9d4e2..8cc1b8d 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/src/Makefile b/src/Makefile index f5c44ec..33b74c8 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2,17 +2,18 @@ TARGETS = ../data/Probe.h Probe DaMon PREFIX = /usr/local DESTDIR = BINDIR = $(PREFIX)/bin -CC ?= cc -CPPFLAGSF?= -CPPFLAGS?= +SBINDIR = $(PREFIX)/sbin +CC = cc +CPPFLAGSF= +CPPFLAGS= CFLAGSF = -W `pkg-config --cflags libApp` CFLAGS = -Wall -g -O2 -pedantic LDFLAGSF= `pkg-config --libs libApp` 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)