Makefile: use NAME variable, suggested by Quentin

[stagit.git] / Makefile

diff --git a/Makefile b/Makefile
index eff0f5a3d0a702353168b6aa9110bf58b5d62ddd..1b4dffc134254f8d1860e962b7aab501e4a3082f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,12 @@
 include config.mk
 
 NAME = stagit
-VERSION = 0.2
+VERSION = 0.3.1
 SRC = \
        stagit.c\
        stagit-index.c
 COMPATSRC = \
+       reallocarray.c\
        strlcat.c\
        strlcpy.c
 BIN = \
@@ -20,25 +21,33 @@ DOC = \
        TODO
 HDR = compat.h
 
+COMPATOBJ = \
+       reallocarray.o\
+       strlcat.o\
+       strlcpy.o
+
 OBJ = ${SRC:.c=.o} ${COMPATOBJ}
 
 all: $(BIN)
 
+.o:
+       ${CC} ${LDFLAGS} -o $@ ${LIBS}
+
 .c.o:
-       ${CC} -c ${CFLAGS} $<
+       ${CC} -c ${CFLAGS} ${CPPFLAGS} -o $@ -c $<
 
-dist: $(BIN)
-       rm -rf release/${VERSION}
-       mkdir -p release/${VERSION}
+dist:
+       rm -rf ${NAME}-${VERSION}
+       mkdir -p ${NAME}-${VERSION}
        cp -f ${MAN1} ${HDR} ${SCRIPTS} ${SRC} ${COMPATSRC} ${DOC} \
                Makefile config.def.h config.mk \
                favicon.png logo.png style.css \
                example.sh \
-               release/${VERSION}/
+               ${NAME}-${VERSION}
        # make tarball
-       rm -f stagit-${VERSION}.tar.gz
-       (cd release/${VERSION}; \
-       tar -czf ../../stagit-${VERSION}.tar.gz .)
+       tar -cf - ${NAME}-${VERSION} | \
+               gzip -c > ${NAME}-${VERSION}.tar.gz
+       rm -rf ${NAME}-${VERSION}
 
 ${OBJ}: config.h config.mk ${HDR}