X-Git-Url: http://git.tuebingen.mpg.de/?p=osl.git;a=blobdiff_plain;f=Makefile;h=100a486b06bf6fb83ac8de3bf743268ea93c3dd8;hp=24fba19d3062e4c7dfd400c5b805688037dd9f2a;hb=ff1143ae3ce5886309483fae6ac5237ee2802fb0;hpb=e1afea4830d00c57e30d5b84b3b5ffcc8501af86

diff --git a/Makefile b/Makefile
index 24fba19..100a486 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 # where to install
-prefix := /usr/local
-libdir := $(prefix)/lib
-includedir := $(prefix)/include
-bindir := $(prefix)/bin
-mandir := $(prefix)/man/man1
+PREFIX ?= /usr/local
+libdir := $(PREFIX)/lib
+includedir := $(PREFIX)/include
+bindir := $(PREFIX)/bin
+mandir := $(PREFIX)/man/man1
 
 objects := osl.o util.o rbtree.o sha1.o
 fsck_objects := fsck.fsck.o osl.fsck.o util.fsck.o rbtree.fsck.o sha1.fsck.o fsck.cmdline.o
@@ -12,7 +12,9 @@ executables := oslfsck
 man_pages := oslfsck.1
 
 INSTALL := install
-CC := gcc
+ifeq "$(origin CC)" "default"
+        CC := gcc
+endif
 MKDIR := mkdir -p
 RM := rm -f
 LN := ln
@@ -21,7 +23,7 @@ LN := ln
 # The way x, y and z are interpreted depends on the OS.
 x := 0
 y := 1
-z := 0
+z := 1
 VERSION := $(x).$(y).$(z)
 
 # common flags
@@ -42,7 +44,6 @@ LIBCFLAGS += -fPIC
 LIBCFLAGS += -fvisibility=hidden
 
 uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
-uname_rs := $(shell uname -rs)
 
 libname := osl
 
@@ -56,7 +57,7 @@ ifeq ($(uname_s),Darwin)
 	# Darwin has its own idea on version numbers:
 	realname := lib$(libname).$(x).dylib
 	soname := $(realname)
-	linkername := lib$(libname).so
+	linkername := lib$(libname).dylib
 	# The minor version number is an incremental number using the format
 	# X[.Y[.Z]]. To set the minor version number of a dynamic library, use
 	# the gcc -current_version option.
@@ -107,7 +108,6 @@ ifeq ($(format),elf)
 	LDFLAGS += --shared
 endif
 
-
 all: $(realname) $(executables) $(man_pages)
 Makefile.deps: $(wildcard *.c *.h)
 	$(CC) -MM -MG *.c > $@
@@ -125,7 +125,7 @@ fsck.cmdline.o: fsck.cmdline.c fsck.cmdline.h
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(LIBCFLAGS) $<
 
 fsck.cmdline.h fsck.cmdline.c: fsck.ggo Makefile
-	gengetopt $$O \
+	gengetopt \
 		--conf-parser \
 		--unamed-opts=table \
 		--no-handle-version \
@@ -136,21 +136,21 @@ fsck.cmdline.h fsck.cmdline.c: fsck.ggo Makefile
 		< $<
 
 oslfsck: $(fsck_objects)
-	$(CC) -o $@ $(fsck_objects) -lcrypto
+	$(CC) -o $@ $(fsck_objects)
 
 oslfsck.1: oslfsck
 	help2man -h --detailed-help -N ./$< > $@
 
-
 $(realname): $(objects)
-	$(CC) $(LDFLAGS) -o $@ $(objects) -lcrypto
+	$(CC) $(LDFLAGS) -o $@ $(objects)
 
 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' $< > $@
+		-e '$$s/$$/};/1' $< >> $@
 
 errtab.h: errlist
 	sed -e 's/^\([A-Z_]*\)\s*\(.*\)/OSL_ERROR(E_OSL_\1, \2)/g' $< > $@
@@ -164,13 +164,40 @@ clean:
 	rm -f *.o $(realname) osl.h osl_errors.h errtab.h fsck.cmdline.h \
 		fsck.cmdline.c oslfsck
 
-install: all
+distclean: clean
+	rm -f web/index.html web/oslfsck.1.html web/osl.png
+	rm -rf web/doxygen
+
+install-bin: $(executables)
+	$(MKDIR) $(bindir)
+	$(INSTALL) -m 755 $(executables) $(bindir)
+
+install-man: $(man_pages)
+	$(MKDIR) $(mandir)
+	$(INSTALL) -m 644 $(man_pages) $(mandir)
+
+install-lib: $(realname) $(headers)
 	$(MKDIR) $(libdir) $(includedir)
 	$(RM) $(libdir)/$(linkername)
 	$(LN) -s $(libdir)/$(soname) $(libdir)/$(linkername)
-	$(INSTALL) -s -m 755 $(realname) $(libdir)
+	$(INSTALL) -m 755 $(realname) $(libdir)
 	$(INSTALL) -m 644 $(headers) $(includedir)
-	$(INSTALL) -m 644 $(executables) $(bindir)
-	$(INSTALL) -m 644 $(man_pages) $(mandir)
 
-.PHONY: all clean install
+install: all install-bin install-man install-lib
+
+.PHONY: all clean install install-bin install-man install-lib
+
+web/%.1.html: %.1
+	man2html $< > $@
+
+web/osl.png: web/osl.pdf Makefile
+	convert -scale 200x200 $< $@
+
+web/index.html: web/oslfsck.1.html web/index.html.in INSTALL README
+	sed -e '/@README@/,$$d' web/index.html.in > $@
+	grutatxt -nb < README >> $@
+	sed -e '1,/@README@/d' -e '/@INSTALL@/,$$d' web/index.html.in >> $@
+	grutatxt -nb < INSTALL >> $@
+	sed -e '1,/@INSTALL@/d' -e '/@MAN_PAGE@/,$$d' web/index.html.in >> $@
+	sed -e '1,/Return to Main Contents/d' -e '/Index/,$$d' web/oslfsck.1.html >> $@
+	sed -e '1,/@MAN_PAGE@/d' web/index.html.in >> $@