From 56c5c387248fa89172b5ac26cc7d7e7f70bc3a20 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 20 Nov 2009 22:02:32 +0100 Subject: [PATCH] Fixed prog.mk rules that skipped the manpage. --HG-- extra : convert_revision : xtraeme%40gmail.com-20091120210232-3874556kn824cgrt --- prog.mk | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/prog.mk b/prog.mk index 243c1562..2380ef11 100644 --- a/prog.mk +++ b/prog.mk @@ -1,23 +1,6 @@ OBJS ?= main.o LDFLAGS += -lxbps -%.o: %.c - @echo " [CC] $@" - @$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(STATIC_LIBS) -c $< - -$(MAN): - @echo " [ASCIIDOC] $(MAN)" - @a2x -f manpage $(MAN).txt - -$(BIN).static: $(OBJS) - @echo " [CCLD] $@" - @$(CC) -static $^ $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \ - $(STATIC_LIBS) -o $@ >/dev/null 2>&1 - -$(BIN): $(OBJS) - @echo " [CCLD] $@" - @$(CC) $^ $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ - .PHONY: all all: $(BIN) $(BIN).static $(MAN) @@ -45,3 +28,21 @@ uninstall: ifdef MAN -rm -f $(MANDIR)/$(MAN) endif + +%.o: %.c + @echo " [CC] $@" + @$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(STATIC_LIBS) -c $< + +$(MAN): + @echo " [ASCIIDOC] $(MAN)" + @a2x -f manpage $(MAN).txt + +$(BIN).static: $(OBJS) + @echo " [CCLD] $@" + @$(CC) -static $^ $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \ + $(STATIC_LIBS) -o $@ >/dev/null 2>&1 + +$(BIN): $(OBJS) + @echo " [CCLD] $@" + @$(CC) $^ $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ +