Use a common mk file for all bins, install bins stripped.

--HG--
extra : convert_revision : dd739bbc9c67b099ef690533e02bb3f40aa2dc8a

bin/xbps-bin/Makefile

@@ -1,25 +1,5 @@
+BIN	= xbps-bin
+OBJS	= main.o ../xbps-repo/util.o
+
 TOPDIR = ../..
-include $(TOPDIR)/vars.mk
+include $(TOPDIR)/prog.mk
-
-OBJS = main.o ../xbps-repo/util.o
-BIN = xbps-bin
-
-all: $(BIN)
-.PHONY: all
-
-$(BIN): $(OBJS)
-	$(CC) $(LDFLAGS) $^ -o $@
-
-.PHONY: clean
-clean: clean-bins clean-objs
-
-clean-bins:
-	-rm -f $(BIN)
-
-clean-objs:
-	-rm -f *.o
-	-rm -f ../xbps-repo/util.o
-
-install: $(BIN)
-	install -d $(SBINDIR)
-	install -m 755 $(BIN) $(SBINDIR)

bin/xbps-cmpver/Makefile

@@ -1,24 +1,4 @@
+BIN	= xbps-cmpver
+
 TOPDIR = ../..
-include $(TOPDIR)/vars.mk
+include $(TOPDIR)/prog.mk
-
-OBJS = main.o
-BIN = xbps-cmpver
-
-all: $(BIN)
-.PHONY: all
-
-$(BIN): $(OBJS)
-	$(CC) $(LDFLAGS) $^ -o $@
-
-.PHONY: clean
-clean: clean-bins clean-objs
-
-clean-bins:
-	-rm -f $(BIN)
-
-clean-objs:
-	-rm -f *.o
-
-install: $(BIN)
-	install -d $(SBINDIR)
-	install -m 755 $(BIN) $(SBINDIR)

bin/xbps-digest/Makefile

@@ -1,25 +1,4 @@
+BIN	= xbps-digest
+
 TOPDIR = ../..
-include $(TOPDIR)/vars.mk
+include $(TOPDIR)/prog.mk
-
-EXTRA_CFLAGS = -funroll-all-loops -ftree-loop-linear
-OBJS = main.o
-BIN = xbps-digest
-
-all: $(BIN)
-.PHONY: all
-
-$(BIN): $(OBJS)
-	$(CC) $(EXTRA_CFLAGS) $(LDFLAGS) $^ -o $@
-
-.PHONY: clean
-clean: clean-bins clean-objs
-
-clean-bins:
-	-rm -f $(BIN)
-
-clean-objs:
-	-rm -f *.o
-
-install: $(BIN)
-	install -d $(SBINDIR)
-	install -m 755 $(BIN) $(SBINDIR)

bin/xbps-pkgdb/Makefile

@@ -1,24 +1,4 @@
+BIN	= xbps-pkgdb
+
 TOPDIR = ../..
-include $(TOPDIR)/vars.mk
+include $(TOPDIR)/prog.mk
-
-OBJS = main.o
-BIN = xbps-pkgdb
-
-all: $(BIN)
-.PHONY: all
-
-$(BIN): $(OBJS)
-	$(CC) $(LDFLAGS) $^ -o $@
-
-.PHONY: clean
-clean: clean-bins clean-objs
-
-clean-bins:
-	-rm -f $(BIN)
-
-clean-objs:
-	-rm -f *.o
-
-install: $(BIN)
-	install -d $(SBINDIR)
-	install -m 755 $(BIN) $(SBINDIR)

bin/xbps-repo/Makefile

@@ -1,24 +1,5 @@
+BIN =	xbps-repo
+OBJS =	main.o util.o
+
 TOPDIR = ../..
-include $(TOPDIR)/vars.mk
+include $(TOPDIR)/prog.mk
-
-OBJS = util.o main.o
-BIN = xbps-repo
-
-all: $(BIN)
-.PHONY: all
-
-$(BIN): $(OBJS)
-	$(CC) $(LDFLAGS) $^ -o $@
-
-.PHONY: clean
-clean: clean-bins clean-objs
-
-clean-bins:
-	-rm -f $(BIN)
-
-clean-objs:
-	-rm -f *.o
-
-install: $(BIN)
-	install -d $(SBINDIR)
-	install -m 755 $(BIN) $(SBINDIR)

prog.mk

@@ -0,0 +1,22 @@
+include $(TOPDIR)/vars.mk
+
+OBJS ?=	main.o
+
+all: $(BIN)
+.PHONY: all
+
+$(BIN): $(OBJS)
+	$(CC) $(LDFLAGS) $^ -o $@
+
+.PHONY: clean
+clean: clean-bins clean-objs
+
+clean-bins:
+	-rm -f $(BIN)
+
+clean-objs:
+	-rm -f $(OBJS)
+
+install: $(BIN)
+	install -d $(SBINDIR)
+	install $(INSTALL_STRIPPED) -m 755 $(BIN) $(SBINDIR)

vars.mk

@@ -5,6 +5,7 @@ SBINDIR	?= $(PREFIX)/sbin
 LIBDIR	?= $(PREFIX)/lib
 ETCDIR	?= $(PREFIX)/etc
 TOPDIR	?= ..
+INSTALL_STRIPPED ?= -s
 
 LDFLAGS += -L$(TOPDIR)/lib -L$(PREFIX)/lib -lxbps
 CPPFLAGS += -I$(TOPDIR)/include