Makefile: separate CPPFLAGS, compile optimized build by default

diff --git a/Makefile b/Makefile
index 23308fe27d67471f919683d4fdb4a2a81204d042..d6d4c5db652573bf4b959bad5c6f37b87c086bdc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 include config.mk
 
 NAME = stagit
-VERSION = 0.3
+VERSION = 0.3.1
 SRC = \
        stagit.c\
        stagit-index.c
@@ -30,8 +30,11 @@ OBJ = ${SRC:.c=.o} ${COMPATOBJ}
 
 all: $(BIN)
 
+.o:
+       ${CC} ${LDFLAGS} -o $@ ${LIBS}
+
 .c.o:
-       ${CC} -c ${CFLAGS} $<
+       ${CC} -c ${CFLAGS} ${CPPFLAGS} -o $@ -c $<
 
 dist:
        rm -rf stagit-${VERSION}

diff --git a/config.mk b/config.mk
index 2c04b35f347957eff789b6b95ad9b90d06f63bb9..3c1e5d2c44552a84b1aa02e237471d561d096c25 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -12,19 +12,17 @@ INCS = -I${GITINC}
 LIBS = -L${GITLIB} -lgit2 -lc
 
 # debug
-CFLAGS = -fstack-protector-all -O0 -g -std=c99 -Wall -Wextra -pedantic \
-       -D_XOPEN_SOURCE=700 -D_DEFAULT_SOURCE -D_BSD_SOURCE ${INCS}
-LDFLAGS = ${LIBS}
+#CFLAGS = -fstack-protector-all -O0 -g -std=c99 -Wall -Wextra -pedantic ${INCS}
+#LDFLAGS = ${LIBS}
 
 # optimized
-#CFLAGS = -O2 -std=c99 \
-#      -D_XOPEN_SOURCE=700 -D_DEFAULT_SOURCE -D_BSD_SOURCE ${INCS}
-#LDFLAGS = -s ${LIBS}
+CFLAGS = -O2 -std=c99 ${INCS}
+LDFLAGS = -s ${LIBS}
 
 # optimized static
-#CFLAGS = -static -O2 -std=c99 \
-#      -D_XOPEN_SOURCE=700 -D_DEFAULT_SOURCE -D_BSD_SOURCE ${INCS}
+#CFLAGS = -static -O2 -std=c99 ${INCS}
 #LDFLAGS = -static -s ${LIBS}
 
+CPPFLAGS= -D_XOPEN_SOURCE=700 -D_DEFAULT_SOURCE -D_BSD_SOURCE ${INCS}
 # compiler and linker
 #CC = cc