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

diff --git a/Makefile b/Makefile
index ba61ef7..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,62 +15,46 @@ 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)
 
-# common flags
-CPPFLAGS += -DOSL_VERSION='"$(VERSION)"'
-
-CFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
-CFLAGS += -Wredundant-decls
-CFLAGS += -Os
-CFLAGS += -Wall
-CFLAGS += -Wuninitialized
-CFLAGS += -Wchar-subscripts
-CFLAGS += -Wformat-security
-CFLAGS += -Werror-implicit-function-declaration
-CFLAGS += -Wmissing-format-attribute
-CFLAGS += -Wunused-macros
-CFLAGS += -Wbad-function-cast
-
-# cflags used only for building library objects
-LIBCFLAGS += -fPIC
-LIBCFLAGS += -fvisibility=hidden
-
-libname := osl
-
-ifeq ($(uname_s),Linux)
-	LDFLAGS += -Wl,-soname,$(soname)
-	# disallow undefined symbols
-	LDFLAGS += -Wl,-z,defs
-endif
-ifeq ($(uname_s),NetBSD)
-	LDFLAGS += -Wl,-soname,$(soname)
-endif
-
-ifeq ($(uname_s),FreeBSD)
-	LDFLAGS += -Wl,-soname,$(soname)
-endif
+OSL_CPPFLAGS += -DOSL_VERSION='"$(VERSION)"'
+
+OSL_CFLAGS += -g -Wunused -Wundef -W
+OSL_CFLAGS += -Wredundant-decls
+OSL_CFLAGS += -Os
+OSL_CFLAGS += -Wall
+OSL_CFLAGS += -Wuninitialized
+OSL_CFLAGS += -Wchar-subscripts
+OSL_CFLAGS += -Wformat-security
+OSL_CFLAGS += -Werror-implicit-function-declaration
+OSL_CFLAGS += -Wmissing-format-attribute
+OSL_CFLAGS += -Wunused-macros
+OSL_CFLAGS += -Wbad-function-cast
+OSL_CFLAGS += -fPIC
+OSL_CFLAGS += -fvisibility=hidden
+
+OSL_LDFLAGS += -Wl,-soname,$(soname)
+OSL_LDFLAGS += -Wl,-z,defs
+OSL_LDFLAGS += --shared
 
 # On ELf-based systems, the following conventions apply (see dhweeler's
 # Program Library HOWTO):
@@ -68,6 +62,7 @@ endif
 # The soname has the prefix ``lib'', the name of the library, the
 # phrase ``.so'', followed by a period and a version number that is
 # incremented whenever the interface changes.
+libname := osl
 soname := lib$(libname).so.$(x)
 
 # The real name adds to the soname a period, a minor number, another
@@ -78,21 +73,34 @@ realname := $(soname).$(y).$(z)
 # a library, (I'll call it the ``linker name''), which is simply the
 # soname without any version number.
 linkername := lib$(libname).so
-LDFLAGS += --shared
 
-all: $(realname) $(executables) $(man_pages)
+all: $(realname) $(executables) $(man_pages) $(headers)
 shared: $(realname)
 
 ifeq ($(findstring clean, $(MAKECMDGOALS)),)
 -include $(deps)
 endif
-%.o: %.c Makefile errtab.h
-	$(CC) $(CPPFLAGS) -c -MMD -MF $(*F).d -MT $@ $(CFLAGS) $(LIBCFLAGS) $<
+
+# 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 $(*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)
-	$(CC) -o $@ $(fsck_objects) -llopsub
+	$(CC) -o $@ $(fsck_objects) $(LDFLAGS) -llopsub
 
+.PRECIOUS: %.lsg.h %.lsg.c
 %.lsg.c: %.suite
 	lopsubgen --gen-c < $<
 
@@ -103,38 +111,27 @@ oslfsck: $(fsck_objects)
 	lopsubgen --gen-man=$@ < $<
 
 $(realname): $(objects)
-	$(CC) $(LDFLAGS) -o $@ $(objects)
-
-$(libname).sym: osl.h.in
-	sed -Ene '/^int|^const/{s/.*(osl_.*)\(.*/\1/; p;}' $< > $@
-$(libname).ga: $(objects)
-	$(LD) -r -o $@ $(objects)
-lib$(libname).a: $(libname).ga $(libname).sym
-	$(OBJCOPY) --keep-global-symbols $(libname).sym $(libname).ga $@
-
-osl_errors.h: errlist
-	echo '/** public error codes of the osl library. */' > $@
-	sed -e 's/\([A-Z_]*\)	.*/	E_OSL_\1/' \
-		-e '1s/^/enum osl_errors {/1' \
-		-e '1s/$$/=1/1' \
-		-e '$$!s/$$/,/g' \
-		-e '$$s/$$/};/1' $< >> $@
+	$(CC) $(OSL_LDFLAGS) $(LDFLAGS) -o $@ $(objects)
 
 errtab.h: errlist
 	sed -e 's/^\([A-Z_]*\)\s*\(.*\)/OSL_ERROR(E_OSL_\1, \2)/g' $< > $@
 
-osl.h: osl.h.in osl_errors.h Makefile
+osl.h: osl.h.m4 errlist Makefile
 	echo '#ifndef _OSL_H' > $@
 	echo '#define _OSL_H' >> $@
-	cat osl.h.in osl_errors.h >> $@
+	$(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' \
+		-e '1s/$$/=1/1' \
+		-e '$$!s/$$/,/g' \
+		-e '$$s/$$/};/1' errlist >> $@
 	echo '#endif /* _OSL_H */' >> $@
 clean:
-	rm -f *.o $(realname) osl.h osl_errors.h errtab.h \
-		oslfsck *.a *.ga *.sym *.lsg.* *.d
+	rm -f *.o $(realname) osl.h errtab.h oslfsck *.lsg.* *.d
 
 distclean: clean
 	rm -f web/index.html web/oslfsck.1.html web/osl.png
-	rm -rf web/doxygen
 
 install-bin: $(executables)
 	$(MKDIR) $(bindir)
@@ -152,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 >> $@