Improve make output similar to what recent GNU configure scripts do.
Also always build the static bins so that it's done in one pass, that means that objects are PIC and built with SSP. --HG-- extra : convert_revision : xtraeme%40gmail.com-20091119050337-hkdksjqxy9n7vy7m
This commit is contained in:
19
bin/Makefile
19
bin/Makefile
@ -1,33 +1,32 @@
|
||||
include ../vars.mk
|
||||
|
||||
SUBDIRS = xbps-bin
|
||||
SUBDIRS += xbps-cmpver
|
||||
SUBDIRS = xbps-cmpver
|
||||
SUBDIRS += xbps-digest
|
||||
SUBDIRS += xbps-fetch
|
||||
SUBDIRS += xbps-pkgdb
|
||||
SUBDIRS += xbps-repo
|
||||
SUBDIRS += xbps-fetch
|
||||
SUBDIRS += xbps-bin
|
||||
|
||||
.PHONY: all
|
||||
all:
|
||||
for dir in $(SUBDIRS); do \
|
||||
$(MAKE) -C $$dir; \
|
||||
@for dir in $(SUBDIRS); do \
|
||||
$(MAKE) -C $$dir || exit 1; \
|
||||
done
|
||||
|
||||
.PHONY: install
|
||||
install:
|
||||
for dir in $(SUBDIRS); do \
|
||||
$(MAKE) -C $$dir install; \
|
||||
@for dir in $(SUBDIRS); do \
|
||||
$(MAKE) -C $$dir install || exit 1; \
|
||||
done
|
||||
|
||||
.PHONY: uninstall
|
||||
uninstall:
|
||||
for bin in $(SUBDIRS); do \
|
||||
@for bin in $(SUBDIRS); do \
|
||||
-rm -f $(SBINDIR)/$$bin; \
|
||||
done
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
for dir in $(SUBDIRS); do \
|
||||
$(MAKE) -C $$dir clean; \
|
||||
@for dir in $(SUBDIRS); do \
|
||||
$(MAKE) -C $$dir clean || exit 1; \
|
||||
done
|
||||
|
@ -3,6 +3,7 @@ include $(TOPDIR)/vars.mk
|
||||
|
||||
BIN = xbps-bin
|
||||
OBJS = check.o install.o main.o remove.o show-deps.o ../xbps-repo/util.o
|
||||
MAN = $(BIN).8
|
||||
|
||||
include $(TOPDIR)/prog.mk
|
||||
|
||||
|
@ -2,6 +2,5 @@ TOPDIR = ../..
|
||||
include $(TOPDIR)/vars.mk
|
||||
|
||||
BIN = xbps-cmpver
|
||||
MAN = # empty
|
||||
|
||||
include $(TOPDIR)/prog.mk
|
||||
|
@ -2,6 +2,5 @@ TOPDIR = ../..
|
||||
include $(TOPDIR)/vars.mk
|
||||
|
||||
BIN = xbps-digest
|
||||
MAN = # empty
|
||||
|
||||
include $(TOPDIR)/prog.mk
|
||||
|
@ -2,6 +2,5 @@ TOPDIR = ../..
|
||||
include $(TOPDIR)/vars.mk
|
||||
|
||||
BIN = xbps-fetch
|
||||
MAN = # empty
|
||||
|
||||
include $(TOPDIR)/prog.mk
|
||||
|
@ -2,6 +2,5 @@ TOPDIR = ../..
|
||||
include $(TOPDIR)/vars.mk
|
||||
|
||||
BIN = xbps-pkgdb
|
||||
MAN = # empty
|
||||
|
||||
include $(TOPDIR)/prog.mk
|
||||
|
@ -3,5 +3,6 @@ include $(TOPDIR)/vars.mk
|
||||
|
||||
BIN = xbps-repo
|
||||
OBJS = main.o util.o index.o
|
||||
MAN = $(BIN).8
|
||||
|
||||
include $(TOPDIR)/prog.mk
|
||||
|
Reference in New Issue
Block a user