stagit | Arjun

Makefile: separate CPPFLAGS, compile optimized build by default

Hiltjo Posthuma contact@arjunchoudhary.com

2016-03-20 20:53:33 +0530 IST commit: 5ec87e5 parent: 79a2474

2 files changed, 11 insertions(+), 10 deletions(-)
M	Makefile	+5	-2
M	config.mk	+6	-8

M · Makefile +5, -2

 1@@ -1,7 +1,7 @@
 2 include config.mk
 3 
 4 NAME = stagit
 5-VERSION = 0.3
 6+VERSION = 0.3.1
 7 SRC = \
 8 	stagit.c\
 9 	stagit-index.c
10@@ -30,8 +30,11 @@ OBJ = ${SRC:.c=.o} ${COMPATOBJ}
11 
12 all: $(BIN)
13 
14+.o:
15+	${CC} ${LDFLAGS} -o $@ ${LIBS}
16+
17 .c.o:
18-	${CC} -c ${CFLAGS} $<
19+	${CC} -c ${CFLAGS} ${CPPFLAGS} -o $@ -c $<
20 
21 dist:
22 	rm -rf stagit-${VERSION}

M · config.mk +6, -8

 1@@ -12,19 +12,17 @@ INCS = -I${GITINC}
 2 LIBS = -L${GITLIB} -lgit2 -lc
 3 
 4 # debug
 5-CFLAGS = -fstack-protector-all -O0 -g -std=c99 -Wall -Wextra -pedantic \
 6-	-D_XOPEN_SOURCE=700 -D_DEFAULT_SOURCE -D_BSD_SOURCE ${INCS}
 7-LDFLAGS = ${LIBS}
 8+#CFLAGS = -fstack-protector-all -O0 -g -std=c99 -Wall -Wextra -pedantic ${INCS}
 9+#LDFLAGS = ${LIBS}
10 
11 # optimized
12-#CFLAGS = -O2 -std=c99 \
13-#	-D_XOPEN_SOURCE=700 -D_DEFAULT_SOURCE -D_BSD_SOURCE ${INCS}
14-#LDFLAGS = -s ${LIBS}
15+CFLAGS = -O2 -std=c99 ${INCS}
16+LDFLAGS = -s ${LIBS}
17 
18 # optimized static
19-#CFLAGS = -static -O2 -std=c99 \
20-#	-D_XOPEN_SOURCE=700 -D_DEFAULT_SOURCE -D_BSD_SOURCE ${INCS}
21+#CFLAGS = -static -O2 -std=c99 ${INCS}
22 #LDFLAGS = -static -s ${LIBS}
23 
24+CPPFLAGS= -D_XOPEN_SOURCE=700 -D_DEFAULT_SOURCE -D_BSD_SOURCE ${INCS}
25 # compiler and linker
26 #CC = cc