X-Git-Url: http://git.tuebingen.mpg.de/?p=osl.git;a=blobdiff_plain;f=Makefile;h=09ad34b3edcde8ab57ef140ed1ee35e32c61179f;hp=76925a61c96b011da382e53b72ab3f8ac39f3b1b;hb=1a703d0b9abe4b4e425d4b10e5cf928d636e3f51;hpb=bc025530248c52e31a629b2a8943b2f68e919caa

diff --git a/Makefile b/Makefile
index 76925a6..09ad34b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # where to install
-PREFIX ?:= /usr/local
+PREFIX ?= /usr/local
 libdir := $(PREFIX)/lib
 includedir := $(PREFIX)/include
 bindir := $(PREFIX)/bin
@@ -18,12 +18,14 @@ 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
@@ -44,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
 
@@ -110,6 +111,8 @@ ifeq ($(format),elf)
 endif
 
 all: $(realname) $(executables) $(man_pages)
+shared: $(realname)
+
 Makefile.deps: $(wildcard *.c *.h)
 	$(CC) -MM -MG *.c > $@
 osl.c fsck.c:
@@ -137,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. */' > $@
@@ -163,22 +173,30 @@ 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
-	$(MKDIR) $(libdir) $(includedir) $(mandir) $(bindir)
+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)
+	$(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
+
+.PHONY: all shared clean install install-bin install-man install-lib
 
 web/%.1.html: %.1
 	man2html $< > $@