From f85d0d05ec97778e6e9f083e4f61a2298d3130ac Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sun, 24 Mar 2013 17:14:01 +0100 Subject: [PATCH] Re-generated the Makefiles --- Makefile | 16 ++++++++-------- data/Makefile | 6 +++--- src/Makefile | 11 ++++++----- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 5641ac7..a85c587 100644 --- a/Makefile +++ b/Makefile @@ -1,21 +1,21 @@ PACKAGE = Splasher VERSION = 0.0.0 SUBDIRS = data src -RM ?= rm -f -LN ?= ln -f -TAR ?= tar -czvf +RM = rm -f +LN = ln -f +TAR = tar -czvf all: subdirs subdirs: - @for i in $(SUBDIRS); do (cd $$i && $(MAKE)) || exit; done + @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE)) || exit; done clean: - @for i in $(SUBDIRS); do (cd $$i && $(MAKE) clean) || exit; done + @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) clean) || exit; done distclean: - @for i in $(SUBDIRS); do (cd $$i && $(MAKE) distclean) || exit; done + @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) distclean) || exit; done dist: $(RM) -r -- $(PACKAGE)-$(VERSION) @@ -37,9 +37,9 @@ dist: $(RM) -- $(PACKAGE)-$(VERSION) install: - @for i in $(SUBDIRS); do (cd $$i && $(MAKE) install) || exit; done + @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) install) || exit; done uninstall: - @for i in $(SUBDIRS); do (cd $$i && $(MAKE) uninstall) || exit; done + @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) uninstall) || exit; done .PHONY: all subdirs clean distclean dist install uninstall diff --git a/data/Makefile b/data/Makefile index 837130f..cf04db5 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 -m 0755 -p +INSTALL = install +RM = rm -f all: diff --git a/src/Makefile b/src/Makefile index 394c332..7709a14 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2,17 +2,18 @@ TARGETS = ../data/Splasher.h Splasher PREFIX = /usr/local DESTDIR = BINDIR = $(PREFIX)/bin -CC ?= cc +SBINDIR = $(PREFIX)/sbin +CC = cc CPPFLAGSF= -I ../include CPPFLAGS= CFLAGSF = -W `pkg-config --cflags libApp` CFLAGS = -Wall -g -O2 -pedantic LDFLAGSF= `pkg-config --libs libApp` -Wl,--export-dynamic LDFLAGS = -RM ?= rm -f -LN ?= ln -f -MKDIR ?= mkdir -p -INSTALL ?= install +RM = rm -f +LN = ln -f +MKDIR = mkdir -m 0755 -p +INSTALL = install all: $(TARGETS)