X-Git-Url: http://git.tuebingen.mpg.de/?p=osl.git;a=blobdiff_plain;f=Makefile;h=6f5b391370e784330264a4a1febad3f77fa40dff;hp=a993946050cf437aba448c8ba4db646a543f0980;hb=HEAD;hpb=0e23fd87097dd74a6b9e1a365c79716ec623e881

diff --git a/Makefile b/Makefile
index a993946..6f5b391 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,13 @@
+# Implicit rules are implemented in make as suffix rules. The following rule
+# empties the suffix list to disable the predefined implicit rules. This
+# increases performance and avoids hard-to-debug behaviour.
+.SUFFIXES:
+MAKEFLAGS += -Rr
+CC := $(CC)
+ifeq ($(strip $(CC)),)
+	CC := cc
+endif
+
 # where to install
 PREFIX ?= /usr/local
 libdir := $(PREFIX)/lib
@@ -5,32 +15,30 @@ includedir := $(PREFIX)/include
 bindir := $(PREFIX)/bin
 mandir := $(PREFIX)/man/man1
 
-objects := osl.o util.o rbtree.o sha1.o
-fsck_objects := fsck.o osl.o util.o rbtree.o sha1.o oslfsck.lsg.o
+objects := osl.o util.o rbtree.o sha1.o sha3.o sha256.o
+fsck_objects := fsck.o osl.o util.o rbtree.o sha1.o sha3.o sha256.o oslfsck.lsg.o
 deps := $(sort $(objects:.o=.d) $(fsck_objects:.o=.d))
 headers := osl.h
 executables := oslfsck
 man_pages := oslfsck.1
 
 INSTALL := install
-ifeq "$(origin CC)" "default"
-        CC := cc
-endif
 MKDIR := mkdir -p
 RM := rm -f
 LN := ln
 LD := ld
+M4 := m4 -g
 OBJCOPY := objcopy
 
 # libosl's versioning consists of three numbers. Let's call them x, y and z.
 x := 0
-y := 1
-z := 3
+y := 2
+z := 0
 VERSION := $(x).$(y).$(z)
 
 OSL_CPPFLAGS += -DOSL_VERSION='"$(VERSION)"'
 
-OSL_CFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
+OSL_CFLAGS += -g -Wunused -Wundef -W
 OSL_CFLAGS += -Wredundant-decls
 OSL_CFLAGS += -Os
 OSL_CFLAGS += -Wall
@@ -73,12 +81,20 @@ ifeq ($(findstring clean, $(MAKECMDGOALS)),)
 -include $(deps)
 endif
 
-# List osl.h in the prerequisites to make sure we generate it before attempting
-# to run the compiler. This matters only when the .d file does not exist.
-%.o: %.c osl.h Makefile errtab.h
+# The files to generate before attempting to run the compiler. These
+# are the order-only prerequisites in the rule below.
+pre_deps := osl.h errtab.h oslfsck.lsg.h
+
+# The .d and .o files are both created from a single cc invocation.
+define CC_CMD
 	$(CC) $(OSL_CPPFLAGS) $(CPPFLAGS) \
-		-c -MMD -MF $(*F).d -MT $@ \
+		-c -MMD -MF $(*F).d -MT $(*F).o \
 		$(OSL_CFLAGS) $(CFLAGS) $<
+endef
+%.o: %.c Makefile | $(pre_deps)
+	$(CC_CMD)
+%.d: %.c Makefile | $(pre_deps)
+	$(CC_CMD)
 
 fsck.o: oslfsck.lsg.h
 oslfsck: $(fsck_objects)
@@ -100,10 +116,10 @@ $(realname): $(objects)
 errtab.h: errlist
 	sed -e 's/^\([A-Z_]*\)\s*\(.*\)/OSL_ERROR(E_OSL_\1, \2)/g' $< > $@
 
-osl.h: osl.h.in errlist Makefile
+osl.h: osl.h.m4 errlist Makefile
 	echo '#ifndef _OSL_H' > $@
 	echo '#define _OSL_H' >> $@
-	cat osl.h.in >> $@
+	$(M4) -DOUTPUT_MODE=C gendoc.m4 $< >> $@
 	echo '/** public error codes of the osl library. */' >> $@
 	sed -e 's/\([A-Z_]*\)	.*/	E_OSL_\1/' \
 		-e '1s/^/enum osl_errors {/1' \
@@ -116,7 +132,6 @@ clean:
 
 distclean: clean
 	rm -f web/index.html web/oslfsck.1.html web/osl.png
-	rm -rf web/doxygen
 
 install-bin: $(executables)
 	$(MKDIR) $(bindir)
@@ -134,22 +149,26 @@ install-lib: $(realname) $(headers)
 	$(INSTALL) -m 644 $(headers) $(includedir)
 
 install: all install-bin install-man install-lib
-www: web/index.html web/osl.png web/doxygen/index.html
+www: web/index.html web/osl.png web/api.html
 
 .PHONY: all shared clean install install-bin install-man install-lib www
 
 web/osl.png: web/osl.pdf Makefile
 	convert -scale 200x200 $< $@
 
-web/index.html: oslfsck.1 web/index.html.in INSTALL README
-	sed -e '/@README@/,$$d' web/index.html.in > $@
+web/index.html: oslfsck.1 web/header.html web/index.html.in INSTALL README QUICK_START
+	cat web/header.html > $@
+	sed -e '/@README@/,$$d' web/index.html.in >> $@
 	markdown < README >> $@
 	sed -e '1,/@README@/d' -e '/@INSTALL@/,$$d' web/index.html.in >> $@
 	markdown < INSTALL >> $@
-	sed -e '1,/@INSTALL@/d' -e '/@MAN_PAGE@/,$$d' web/index.html.in >> $@
+	sed -e '1,/@INSTALL@/d' -e '/@QUICK_START@/,$$d' web/index.html.in >> $@
+	markdown < QUICK_START >> $@
+	sed -e '1,/@QUICK_START@/d' -e '/@MAN_PAGE@/,$$d' web/index.html.in >> $@
 	groff -m man -Thtml -P -l oslfsck.1 | sed -e '1,/^<body>/d; /^<\/body>/,$$d' >> $@
 	sed -e '1,/@MAN_PAGE@/d' web/index.html.in >> $@
 
-web/doxygen/index.html: $(wildcard *.c *.h) web/Doxyfile web/header.html \
-		web/footer.html
-	doxygen web/Doxyfile
+web/api.html: osl.h.m4 web/header.html web/footer.html
+	cat web/header.html > $@
+	$(M4) -DOUTPUT_MODE=HTML gendoc.m4 $< >> $@
+	cat web/footer.html >> $@