From 444eceadde07fb02f61b276d9e35d11d40ccee6c 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 | 10 +++++----- data/16x16/Makefile | 2 +- data/24x24/Makefile | 2 +- data/Makefile | 12 ++++++------ doc/Makefile | 2 +- po/Makefile | 2 +- src/Makefile | 12 ++++++------ tools/Makefile | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Makefile b/Makefile index 8b88406..a27dca4 100644 --- a/Makefile +++ b/Makefile @@ -9,13 +9,13 @@ 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) @@ -77,9 +77,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/16x16/Makefile b/data/16x16/Makefile index 4e0f194..bc718a6 100644 --- a/data/16x16/Makefile +++ b/data/16x16/Makefile @@ -1,6 +1,6 @@ PREFIX = /usr/local DESTDIR = -MKDIR = mkdir -p +MKDIR = mkdir -m 0755 -p INSTALL = install RM = rm -f diff --git a/data/24x24/Makefile b/data/24x24/Makefile index 4f56dd0..0a3cec3 100644 --- a/data/24x24/Makefile +++ b/data/24x24/Makefile @@ -1,6 +1,6 @@ PREFIX = /usr/local DESTDIR = -MKDIR = mkdir -p +MKDIR = mkdir -m 0755 -p INSTALL = install RM = rm -f diff --git a/data/Makefile b/data/Makefile index 4d25695..e16bd9c 100644 --- a/data/Makefile +++ b/data/Makefile @@ -1,7 +1,7 @@ SUBDIRS = 16x16 24x24 PREFIX = /usr/local DESTDIR = -MKDIR = mkdir -p +MKDIR = mkdir -m 0755 -p INSTALL = install RM = rm -f @@ -9,23 +9,23 @@ RM = rm -f 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 install: - @for i in $(SUBDIRS); do (cd $$i && $(MAKE) install) || exit; done + @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) install) || exit; done $(MKDIR) $(DESTDIR)$(PREFIX)/share/applications $(INSTALL) -m 0644 -- helper.desktop $(DESTDIR)$(PREFIX)/share/applications/helper.desktop $(MKDIR) $(DESTDIR)$(PREFIX)/share/applications $(INSTALL) -m 0644 -- surfer.desktop $(DESTDIR)$(PREFIX)/share/applications/surfer.desktop uninstall: - @for i in $(SUBDIRS); do (cd $$i && $(MAKE) uninstall) || exit; done + @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) uninstall) || exit; done $(RM) -- $(DESTDIR)$(PREFIX)/share/applications/helper.desktop $(RM) -- $(DESTDIR)$(PREFIX)/share/applications/surfer.desktop diff --git a/doc/Makefile b/doc/Makefile index 30a0578..edd1430 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -3,7 +3,7 @@ PREFIX = /usr/local DESTDIR = RM = rm -f LN = ln -f -MKDIR = mkdir -p +MKDIR = mkdir -m 0755 -p INSTALL = install diff --git a/po/Makefile b/po/Makefile index ba6f7e5..b951c80 100644 --- a/po/Makefile +++ b/po/Makefile @@ -3,7 +3,7 @@ PREFIX = /usr/local DESTDIR = RM = rm -f LN = ln -f -MKDIR = mkdir -p +MKDIR = mkdir -m 0755 -p INSTALL = install diff --git a/src/Makefile b/src/Makefile index 34a648f..40feca6 100644 --- a/src/Makefile +++ b/src/Makefile @@ -12,14 +12,14 @@ CFLAGS = -Wall -g -O2 -pedantic LDFLAGS = RM = rm -f LN = ln -f -MKDIR = mkdir -p +MKDIR = mkdir -m 0755 -p INSTALL = install all: subdirs $(TARGETS) subdirs: - @for i in $(SUBDIRS); do (cd $$i && $(MAKE)) || exit; done + @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE)) || exit; done download_OBJS = download.o download_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) -D WITH_WEBKIT $(CFLAGSF) $(CFLAGS) `pkg-config --cflags libSystem gtk+-2.0 webkit-1.0` @@ -51,23 +51,23 @@ main.o: main.c surfer.h ../config.h $(CC) $(surfer_CFLAGS) -c main.c clean: - @for i in $(SUBDIRS); do (cd $$i && $(MAKE) clean) || exit; done + @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) clean) || exit; done $(RM) -- $(download_OBJS) $(surfer_OBJS) distclean: - @for i in $(SUBDIRS); do (cd $$i && $(MAKE) distclean) || exit; done + @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) distclean) || exit; done $(RM) -- $(download_OBJS) $(surfer_OBJS) $(RM) -- $(TARGETS) install: $(TARGETS) - @for i in $(SUBDIRS); do (cd $$i && $(MAKE) install) || exit; done + @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) install) || exit; done $(MKDIR) $(DESTDIR)$(BINDIR) $(INSTALL) -m 0755 -- download $(DESTDIR)$(BINDIR)/download $(MKDIR) $(DESTDIR)$(BINDIR) $(INSTALL) -m 0755 -- surfer $(DESTDIR)$(BINDIR)/surfer uninstall: - @for i in $(SUBDIRS); do (cd $$i && $(MAKE) uninstall) || exit; done + @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) uninstall) || exit; done $(RM) -- $(DESTDIR)$(BINDIR)/download $(RM) -- $(DESTDIR)$(BINDIR)/surfer diff --git a/tools/Makefile b/tools/Makefile index 301a9fc..fe289d3 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -11,7 +11,7 @@ CFLAGS = -Wall -g -O2 -pedantic LDFLAGS = RM = rm -f LN = ln -f -MKDIR = mkdir -p +MKDIR = mkdir -m 0755 -p INSTALL = install