aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2021-09-16 18:19:28 +0200
committerMattias Andrée <maandree@kth.se>2021-09-16 18:19:28 +0200
commitb1eb5bc857540086baf2c8c8b0ed5131c3ca04dc (patch)
treea5b97cbc9520f69bc1ec75732d3d47dcf768b446
parentm (diff)
downloadlibsha1-b1eb5bc857540086baf2c8c8b0ed5131c3ca04dc.tar.gz
libsha1-b1eb5bc857540086baf2c8c8b0ed5131c3ca04dc.tar.bz2
libsha1-b1eb5bc857540086baf2c8c8b0ed5131c3ca04dc.tar.xz
Improve makefile1.0.1
Signed-off-by: Mattias Andrée <maandree@kth.se>
-rw-r--r--Makefile19
-rw-r--r--config.mk4
2 files changed, 12 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index 2f51528..40a5af6 100644
--- a/Makefile
+++ b/Makefile
@@ -58,22 +58,24 @@ MAN3 =\
libsha1_unmarshal.3\
libsha1_update.3
+LOBJ = $(OBJ:.o=.lo)
+
all: libsha1.a libsha1.$(LIBEXT) test
-$(OBJ): $(@:.o=.c) $(HDR)
-$(OBJ:.o=.lo): $(@:.lo=.c) $(HDR)
+$(OBJ): $(HDR)
+$(LOBJ): $(HDR)
.c.o:
- $(CC) -c -o $@ $< $(CFLAGS)
+ $(CC) -c -o $@ $< $(CFLAGS) $(CPPFLAGS)
.c.lo:
- $(CC) -fPIC -c -o $@ $< $(CFLAGS)
+ $(CC) -fPIC -c -o $@ $< $(CFLAGS) $(CPPFLAGS)
test: test.o libsha1.a
$(CC) -o $@ test.o libsha1.a $(LDFLAGS)
-libsha1.$(LIBEXT): $(OBJ:.o=.lo)
- $(CC) $(LIBFLAGS) -o $@ $(OBJ) $(LDFLAGS)
+libsha1.$(LIBEXT): $(LOBJ)
+ $(CC) $(LIBFLAGS) -o $@ $(LOBJ) $(LDFLAGS)
libsha1.a: $(OBJ)
-rm -f -- $@
@@ -83,10 +85,9 @@ libsha1.a: $(OBJ)
check: test
./test
-install:
+install: libsha1.a libsha1.$(LIBEXT)
mkdir -p -- "$(DESTDIR)$(PREFIX)/lib"
mkdir -p -- "$(DESTDIR)$(PREFIX)/include"
- mkdir -p -- "$(DESTDIR)$(PREFIX)/share/licenses/libsha1"
mkdir -p -- "$(DESTDIR)$(MANPREFIX)/man0"
mkdir -p -- "$(DESTDIR)$(MANPREFIX)/man3"
cp -- libsha1.a "$(DESTDIR)$(PREFIX)/lib"
@@ -96,7 +97,6 @@ install:
cp -- libsha1.h "$(DESTDIR)$(PREFIX)/include"
cp -- $(MAN0) "$(DESTDIR)$(MANPREFIX)/man0"
cp -- $(MAN3) "$(DESTDIR)$(MANPREFIX)/man3"
- cp -- LICENSE "$(DESTDIR)$(PREFIX)/share/licenses/libsha1"
uninstall:
-rm -f -- "$(DESTDIR)$(PREFIX)/lib/libsha1.a"
@@ -106,7 +106,6 @@ uninstall:
-rm -f -- "$(DESTDIR)$(PREFIX)/include/libsha1.h"
-cd -- "$(DESTDIR)$(MANPREFIX)/man0" && rm -f -- $(MAN0)
-cd -- "$(DESTDIR)$(MANPREFIX)/man3" && rm -f -- $(MAN3)
- -rm -rf -- "$(DESTDIR)$(PREFIX)/share/licenses/libsha1"
clean:
-rm -f -- *.o *.lo *.su *.a *.so test
diff --git a/config.mk b/config.mk
index cd79dd2..a2d88f2 100644
--- a/config.mk
+++ b/config.mk
@@ -1,6 +1,8 @@
PREFIX = /usr
MANPREFIX = $(PREFIX)/share/man
+CC = cc
+
CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700
-CFLAGS = -std=c99 -Wall -Wextra -O3 $(CPPFLAGS)
+CFLAGS = -std=c99 -Wall -O3
LDFLAGS = -s