Commit Kyua/ATF test suite for libxbps.

bin/Makefile

@@ -5,26 +5,4 @@ SUBDIRS +=	xbps-repo
 SUBDIRS +=	xbps-dgraph
 SUBDIRS +=	xbps-uhelper
 
-.PHONY: all
-all:
-	@for dir in $(SUBDIRS); do		\
-		$(MAKE) -C $$dir || exit 1;	\
-	done
-
-.PHONY: install
-install:
-	@for dir in $(SUBDIRS); do			\
-		$(MAKE) -C $$dir install || exit 1;	\
-	done
-
-.PHONY: uninstall
-uninstall:
-	@for dir in $(SUBDIRS); do			\
-		$(MAKE) -C $$dir uninstall || exit1;	\
-	done
-
-.PHONY: clean
-clean:
-	@for dir in $(SUBDIRS); do			\
-		$(MAKE) -C $$dir clean || exit 1;	\
-	done
+include ../mk/subdir.mk

bin/prog.mk

@@ -1,44 +0,0 @@
--include $(TOPDIR)/config.mk
-
-OBJS	?= main.o
-
-.PHONY: all
-all: $(BIN) $(BIN).static
-
-.PHONY: clean
-clean:
-	-rm -f $(BIN) $(BIN).static
-	-rm -f $(OBJS)
-
-.PHONY: install
-install: all
-	install -d $(DESTDIR)$(SBINDIR)
-	install $(INSTALL_STRIPPED) -m 755 $(BIN) $(DESTDIR)$(SBINDIR)
-	install $(INSTALL_STRIPPED) -m 755 $(BIN).static $(DESTDIR)$(SBINDIR)
-ifdef MAN
-	install -d $(DESTDIR)$(MANDIR)/man8
-	install -m 644 $(MAN) $(DESTDIR)$(MANDIR)/man8
-endif
-
-.PHONY: uninstall
-uninstall:
-	-rm -f $(DESTDIR)$(SBINDIR)/$(BIN)
-	-rm -f $(DESTDIR)$(SBINDIR)/$(BIN).static
-ifdef MAN
-	-rm -f $(DESTDIR)$(MANDIR)/man8/$(MAN)
-endif
-
-%.o: %.c
-	@printf " [CC]\t\t$@\n"
-	${SILENT}$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
-
-$(BIN).static: $(OBJS)
-	@printf " [CCLD]\t\t$@\n"
-	${SILENT}$(CC) -static $^ $(CPPFLAGS) -L$(TOPDIR)/lib \
-		$(CFLAGS) $(LDFLAGS) $(STATIC_LIBS) -o $@
-
-$(BIN): $(OBJS)
-	@printf " [CCLD]\t\t$@\n"
-	${SILENT}$(CC) $^ $(CPPFLAGS) -L$(TOPDIR)/lib $(CFLAGS) \
-		$(PROG_CFLAGS) $(LDFLAGS) $(PROG_LDFLAGS) -o $@
-

bin/xbps-bin/Makefile

@@ -11,4 +11,4 @@ OBJS += check_pkg_requiredby.o
 OBJS += show-orphans.o unpack_cb.o list.o
 MAN = $(BIN).8
 
-include $(TOPDIR)/bin/prog.mk
+include $(TOPDIR)/mk/prog.mk

bin/xbps-dgraph/Makefile

@@ -3,4 +3,4 @@ TOPDIR = ../..
 
 BIN = xbps-dgraph
 
-include $(TOPDIR)/bin/prog.mk
+include $(TOPDIR)/mk/prog.mk

bin/xbps-repo/Makefile

@@ -8,4 +8,4 @@ OBJS += ../xbps-bin/fetch_cb.o ../xbps-bin/util.o
 OBJS += ../xbps-bin/state_cb.o ../xbps-bin/list.o
 MAN = $(BIN).8
 
-include $(TOPDIR)/bin/prog.mk
+include $(TOPDIR)/mk/prog.mk

bin/xbps-uhelper/Makefile

@@ -4,4 +4,4 @@ TOPDIR = ../..
 BIN = xbps-uhelper
 OBJS = main.o ../xbps-bin/fetch_cb.o
 
-include $(TOPDIR)/bin/prog.mk
+include $(TOPDIR)/mk/prog.mk