X-Git-Url: http://git.tuebingen.mpg.de/?p=osl.git;a=blobdiff_plain;f=Makefile;h=3ce4567c36a98edb1ccdd20308d92f3605dffd63;hp=7204f88f535053b622048fbb1a0a2b0d80889674;hb=8709b1999511701c143d803a75c3d094b93a3071;hpb=491ba5fc4fcc9546ad0aec647b03e73e5542a949;ds=sidebyside

diff --git a/Makefile b/Makefile
index 7204f88..3ce4567 100644
--- a/Makefile
+++ b/Makefile
@@ -1,73 +1,194 @@
+# where to install
+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
+headers := osl.h
+executables := oslfsck
+man_pages := oslfsck.1
+
+INSTALL := install
+CC := gcc
+MKDIR := mkdir -p
+RM := rm -f
+LN := ln
+
+# 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
+VERSION := $(x).$(y).$(z)
+
+# common flags
+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
+
 uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
 uname_rs := $(shell uname -rs)
 
-objects := osl.o fd.o rbtree.o sha1.o
-major_version := 0
-minor_version := 1
-patchlevel_version := 0
 libname := osl
 
-
 ifeq ($(uname_s),Linux)
-	dso_opts := --shared -Wl,-soname,libosl.so.$(major_version)
-	dso_filename :=lib$(libname).so.$(major_version).$(minor_version).$(patchlevel_version)
+	format := elf
+	LDFLAGS += -Wl,-soname,$(soname)
+	# disallow undefined symbols
+	LDFLAGS += -Wl,-z,defs
 endif
 ifeq ($(uname_s),Darwin)
-	dso_opts := -dynamiclib -current_version $(major_version).$(minor_version) \
-		-compatibility_version $(major_version).$(minor_version) -fvisibility=hidden
-	dso_filename := lib$(libname).$(major_version)
+	# Darwin has its own idea on version numbers:
+	realname := lib$(libname).$(x).dylib
+	soname := $(realname)
+	linkername := lib$(libname).so
+	# 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.
+	LDFLAGS += -current_version $(y).$(z)
+	#
+	# The compatibility version number of a library release specifies the
+	# earliest minor version of the clients linked against that release can
+	# use.
+	LDFLAGS += -compatibility_version $(y).0
+	LDFLAGS += -dynamiclib
 endif
 ifeq ($(uname_s),SunOS)
-	dso_opts := --shared -z text -z defs
-	dso_filename :=lib$(libname).so.$(major_version).$(minor_version).$(patchlevel_version)
+	format := elf
+	# Solaris needs another set of flags
+	LDFLAGS += -z text
+	LDFLAGS += -z defs
 	CPPFLAGS += -I/opt/csw/include
+	LDFLAGS += -lc
 endif
+
+ifeq ($(uname_s),NetBSD)
+	format := elf
+	LDFLAGS += -Wl,-soname,$(soname)
+endif
+
 ifeq ($(uname_s),FreeBSD)
-	dso_opts := --shared -Wl,-soname,libosl.so.$(major_version)
-	dso_filename :=lib$(libname).so.$(major_version).$(minor_version).$(patchlevel_version)
+	format := elf
+	LDFLAGS += -Wl,-soname,$(soname)
 endif
-ifeq ($(uname_s),NetBSD)
-	dso_opts := --shared -Wl,-soname,libosl.so.$(major_version)
-	dso_filename :=lib$(libname).so.$(major_version).$(minor_version).$(patchlevel_version)
+
+ifeq ($(format),elf)
+	# On ELf-based systems, the following conventions apply (see dhweeler's
+	# Program Library HOWTO):
+	#
+	# 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.
+	soname := lib$(libname).so.$(x)
+
+	# The real name adds to the soname a period, a minor number, another
+	# period, and the release number.
+	realname := $(soname).$(y).$(z)
+
+	# In addition, there's the name that the compiler uses when requesting
+	# a library, (I'll call it the ``linker name''), which is simply the
+	# soname without any version number.
+	linkername := lib$(libname).so
+	LDFLAGS += --shared
 endif
-all: $(dso_filename)
-
-# disallow undefined symbols
-LDFLAGS += -Wl,-z,defs
-
-DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
-DEBUG_CPPFLAGS += -Wredundant-decls
-CPPFLAGS += -Os
-CPPFLAGS += -Wall
-CPPFLAGS += -Wuninitialized
-CPPFLAGS += -Wchar-subscripts
-CPPFLAGS += -Wformat-security
-CPPFLAGS += -Werror-implicit-function-declaration
-CPPFLAGS += -Wmissing-format-attribute
-CPPFLAGS += -Wunused-macros
-CPPFLAGS += -Wbad-function-cast
-CPPFLAGS += -fPIC
-CPPFLAGS += -fvisibility=hidden
 
+all: $(realname) $(executables) $(man_pages)
 Makefile.deps: $(wildcard *.c *.h)
-	gcc -MM -MG *.c > $@
+	$(CC) -MM -MG *.c > $@
+osl.c fsck.c:
 
 -include Makefile.deps
 
-%.o: %.c Makefile
-	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) $<
-$(dso_filename): $(objects)
-	$(CC) $(dso_opts) -o $@ $(objects) $(LDFLAGS) -lcrypto
+fsck.cmdline.o: fsck.cmdline.c fsck.cmdline.h
+	$(CC) -c -DVERSION='"$(VERSION)"' $<
+
+%.fsck.o: %.c Makefile fsck.cmdline.c fsck.cmdline.h osl.h errtab.h
+	$(CC) -c -DVERSION='"$(VERSION)"' $(CPPFLAGS) $(CFLAGS) $< -o $@
+
+%.o: %.c Makefile errtab.h
+	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(LIBCFLAGS) $<
+
+fsck.cmdline.h fsck.cmdline.c: fsck.ggo Makefile
+	gengetopt \
+		--conf-parser \
+		--unamed-opts=table \
+		--no-handle-version \
+		--file-name=fsck.cmdline \
+		--func-name=fsck_cmdline_parser \
+		--set-package="oslfsck" \
+		--arg-struct-name=fsck_args_info \
+		< $<
+
+oslfsck: $(fsck_objects)
+	$(CC) -o $@ $(fsck_objects) -lcrypto
+
+oslfsck.1: oslfsck
+	help2man -h --detailed-help -N ./$< > $@
+
+$(realname): $(objects)
+	$(CC) $(LDFLAGS) -o $@ $(objects) -lcrypto
 
 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 {\n/1' \
+		-e '1s/^/enum osl_errors {/1' \
+		-e '1s/$$/=1/1' \
 		-e '$$!s/$$/,/g' \
-		-e '$$s/$$/\n};/1' $< > $@
+		-e '$$s/$$/};/1' $< >> $@
 
 errtab.h: errlist
-	sed -e 's/^\([A-Z_]*\)\s*\(.*\)/_S(E_OSL_\1, \2)/g' $< > $@
-osl.h: osl.h.in osl_errors.h
-	cat $^ > $@
+	sed -e 's/^\([A-Z_]*\)\s*\(.*\)/OSL_ERROR(E_OSL_\1, \2)/g' $< > $@
+
+osl.h: osl.h.in osl_errors.h Makefile
+	echo '#ifndef _OSL_H' > $@
+	echo '#define _OSL_H' >> $@
+	cat osl.h.in osl_errors.h >> $@
+	echo '#endif /* _OSL_H */' >> $@
 clean:
-	rm -f *.o $(dso_filename) osl.h osl_errors.h errtab.h
+	rm -f *.o $(realname) osl.h osl_errors.h errtab.h fsck.cmdline.h \
+		fsck.cmdline.c oslfsck
+
+distclean: clean
+	rm -f web/index.html web/oslfsck.1.html web/osl.png
+	rm -rf web/doxygen
+
+install: all
+	$(MKDIR) $(libdir) $(includedir)
+	$(RM) $(libdir)/$(linkername)
+	$(LN) -s $(libdir)/$(soname) $(libdir)/$(linkername)
+	$(INSTALL) -s -m 755 $(realname) $(libdir)
+	$(INSTALL) -m 644 $(headers) $(includedir)
+	$(INSTALL) -m 755 $(executables) $(bindir)
+	$(INSTALL) -m 644 $(man_pages) $(mandir)
+
+.PHONY: all clean install
+
+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 >> $@