X-Git-Url: http://git.tuebingen.mpg.de/?p=osl.git;a=blobdiff_plain;f=Makefile;h=e37af6acee28852ebd53e9606cee5020a39b64fa;hp=7e3d81d92ae73d96b663b116b0b40f35198b7531;hb=abb6ef754912935a60705b6b1e9687bf79c509b7;hpb=208a425e16d71a18b244126c4c14b562836d326a

diff --git a/Makefile b/Makefile
index 7e3d81d..e37af6a 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,16 +12,20 @@ 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
+LD := ld
+OBJCOPY := objcopy
 
 # libosl's versioning consists of three numbers. Let's call them x, y and z.
 # The way x, y and z are interpreted depends on the OS.
 x := 0
 y := 1
-z := 0
+z := 2
 VERSION := $(x).$(y).$(z)
 
 # common flags
@@ -42,7 +46,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 +59,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,8 +110,9 @@ ifeq ($(format),elf)
 	LDFLAGS += --shared
 endif
 
-
 all: $(realname) $(executables) $(man_pages)
+shared: $(realname)
+
 Makefile.deps: $(wildcard *.c *.h)
 	$(CC) -MM -MG *.c > $@
 osl.c fsck.c:
@@ -125,7 +129,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,13 +140,20 @@ 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)
+
+$(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. */' > $@
@@ -162,34 +173,44 @@ osl.h: osl.h.in osl_errors.h Makefile
 	echo '#endif /* _OSL_H */' >> $@
 clean:
 	rm -f *.o $(realname) osl.h osl_errors.h errtab.h fsck.cmdline.h \
-		fsck.cmdline.c oslfsck
+		fsck.cmdline.c oslfsck *.a *.ga *.sym
 
 distclean: clean
 	rm -f web/index.html web/oslfsck.1.html web/osl.png
 	rm -rf web/doxygen
 
-install: all
+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)
+	$(LN) -s $(soname) $(libdir)/$(linkername)
+	$(INSTALL) -m 755 $(realname) $(libdir)
 	$(INSTALL) -m 644 $(headers) $(includedir)
-	$(INSTALL) -m 755 $(executables) $(bindir)
-	$(INSTALL) -m 644 $(man_pages) $(mandir)
 
-.PHONY: all clean install
+install: all install-bin install-man install-lib
+www: web/index.html web/osl.png web/doxygen/index.html
 
-web/%.1.html: %.1
-	man2html $< > $@
+.PHONY: all shared clean install install-bin install-man install-lib www
 
-web/osl.png: web/osl.pdf
-	convert $< $@
+web/osl.png: web/osl.pdf Makefile
+	convert -scale 200x200 $< $@
 
-web/index.html: web/oslfsck.1.html web/index.html.in INSTALL README
+web/index.html: oslfsck.1 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 >> $@
+	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