X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.real;h=8a3d7acc8c57141a0ae3b7a5a2e43947b1796ae4;hp=980192ecf5543bcde432575128ad0723e5ab82f8;hb=c3c958098baca5651e7bfd6b68ffda475ce671fa;hpb=a775408e5d2e3b21dff741b89ff5330b397b5138

diff --git a/Makefile.real b/Makefile.real
index 980192ec..8a3d7acc 100644
--- a/Makefile.real
+++ b/Makefile.real
@@ -9,7 +9,6 @@ endif
 
 vardir := /var/paraslash
 mandir := $(datarootdir)/man/man1
-STRIP := $(CROSS_COMPILE)strip
 MKDIR_P := mkdir -p
 prefixed_executables := $(addprefix para_, $(executables))
 
@@ -18,7 +17,7 @@ uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
 uname_rs := $(shell uname -rs)
 cc_version := $(shell $(CC) --version | head -n 1)
 GIT_VERSION := $(shell ./GIT-VERSION-GEN git-version.h)
-COPYRIGHT_YEAR := 2016
+COPYRIGHT_YEAR := 2017
 
 ifeq ("$(origin O)", "command line")
 	build_dir := $(O)
@@ -63,10 +62,11 @@ tarball_pfx := $(PACKAGE_TARNAME)-$(GIT_VERSION)
 tarball_delete := $(addprefix $(tarball_pfx)/, web .gitignore)
 tarball := $(tarball_pfx).tar.bz2
 
-.PHONY: all clean clean2 distclean maintainer-clean install man tarball
 all: $(prefixed_executables) $(man_pages)
+.PHONY: all mostlyclean clean distclean maintainer-clean install \
+	install-strip man dist tarball
+
 man: $(man_pages)
-tarball: $(tarball)
 
 include $(m4_ggo_dir)/makefile
 include $(test_dir)/makefile.test
@@ -125,6 +125,13 @@ ifeq ($(uname_s),Linux)
 	LDFLAGS += -Wl,--gc-sections
 endif
 
+cc-option = $(shell \
+	$(CC) $(1) -Werror -c -x c /dev/null -o /dev/null > /dev/null 2>&1 \
+	&& echo "$(1)" \
+)
+
+STRICT_CFLAGS += $(call cc-option, -Wformat-signedness)
+
 # To put more focus on warnings, be less verbose as default
 # Use 'make V=1' to see the full commands
 ifeq ("$(origin V)", "command line")
@@ -330,31 +337,36 @@ $(prefixed_executables):
 	@[ -z "$(Q)" ] || echo 'LD $@'
 	$(Q) $(CC) $^ -o $@ $(LDFLAGS)
 
-clean:
-	@[ -z "$(Q)" ] || echo 'CLEAN'
+mostlyclean:
+	@[ -z "$(Q)" ] || echo 'MOSTLYCLEAN'
 	$(Q) rm -f para_*
 	$(Q) rm -rf $(object_dir)
-
-clean2: clean
-	@[ -z "$(Q)" ] || echo 'CLEAN2'
+clean: mostlyclean
+	@[ -z "$(Q)" ] || echo 'CLEAN'
 	$(Q) rm -rf $(build_dir)
-distclean: clean2 test-clean
+distclean: clean
 	@[ -z "$(Q)" ] || echo 'DISTCLEAN'
 	$(Q) rm -f Makefile autoscan.log config.status config.log
-	$(Q) rm -f GPATH GRTAGS GSYMS GTAGS
-
+	$(Q) rm -f config.h configure config.h.in
 maintainer-clean: distclean
 	@[ -z "$(Q)" ] || echo 'MAINTAINER-CLEAN'
-	$(Q) rm -f *.tar.bz2 config.h configure config.h.in
+	$(Q) rm -f *.tar.bz2
+	$(Q) rm -f GPATH GRTAGS GSYMS GTAGS
+
+INSTALL ?= install
+INSTALL_PROGRAM ?= $(INSTALL)
+INSTALL_DATA ?= $(INSTALL) -m 644
+ifneq ($(findstring strip, $(MAKECMDGOALS)),)
+	strip_option := -s
+endif
 
-install: all man
-	$(MKDIR_P) $(bindir) $(mandir)
-	$(INSTALL) -s --strip-program $(STRIP) -m 755 \
-		$(prefixed_executables) $(bindir)
-	$(INSTALL) -m 644 $(man_pages) $(mandir)
-	$(MKDIR_P) $(vardir) >/dev/null 2>&1 || true # not fatal, so don't complain
+install install-strip: all man
+	$(MKDIR_P) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)
+	$(INSTALL) $(strip_option) $(prefixed_executables) $(DESTDIR)$(bindir)
+	$(INSTALL_DATA) $(man_pages) $(DESTDIR)$(mandir)
+	$(MKDIR_P) $(DESTDIR)$(vardir) >/dev/null 2>&1 || true # not fatal, so don't complain
 
-$(tarball):
+$(tarball) dist tarball:
 	$(Q) rm -rf $(tarball) $(tarball_pfx)
 	$(Q) git archive --format=tar --prefix=$(tarball_pfx)/ HEAD \
 		| tar --delete $(tarball_delete) > $(tarball_pfx).tar