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

diff --git a/Makefile b/Makefile
index f9e5055..24fba19 100644
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,14 @@
 prefix := /usr/local
 libdir := $(prefix)/lib
 includedir := $(prefix)/include
+bindir := $(prefix)/bin
+mandir := $(prefix)/man/man1
 
-objects := osl.o fd.o rbtree.o sha1.o
-fsck_objects := fsck.fsck.o osl.fsck.o fd.fsck.o rbtree.fsck.o sha1.fsck.o fsck.cmdline.o
+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
@@ -41,32 +45,15 @@ uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
 uname_rs := $(shell uname -rs)
 
 libname := osl
-ifeq ($(uname_s),Linux)
-	# On Linux, 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
+ifeq ($(uname_s),Linux)
+	format := elf
 	LDFLAGS += -Wl,-soname,$(soname)
 	# disallow undefined symbols
 	LDFLAGS += -Wl,-z,defs
 endif
 ifeq ($(uname_s),Darwin)
 	# Darwin has its own idea on version numbers:
-	#
 	realname := lib$(libname).$(x).dylib
 	soname := $(realname)
 	linkername := lib$(libname).so
@@ -82,35 +69,66 @@ ifeq ($(uname_s),Darwin)
 	LDFLAGS += -dynamiclib
 endif
 ifeq ($(uname_s),SunOS)
+	format := elf
 	# Solaris needs another set of flags
-	LDFLAGS += --shared
 	LDFLAGS += -z text
 	LDFLAGS += -z defs
-	realname := lib$(libname).so.$(major_version).$(minor_version).$(patchlevel_version)
 	CPPFLAGS += -I/opt/csw/include
+	LDFLAGS += -lc
+endif
+
+ifeq ($(uname_s),NetBSD)
+	format := elf
+	LDFLAGS += -Wl,-soname,$(soname)
+endif
+
+ifeq ($(uname_s),FreeBSD)
+	format := elf
+	LDFLAGS += -Wl,-soname,$(soname)
 endif
 
-all: $(realname) oslfsck
+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: $(realname) $(executables) $(man_pages)
 Makefile.deps: $(wildcard *.c *.h)
 	$(CC) -MM -MG *.c > $@
-osl.c: errtab.h
-
+osl.c fsck.c:
 
 -include Makefile.deps
 
 fsck.cmdline.o: fsck.cmdline.c fsck.cmdline.h
 	$(CC) -c -DVERSION='"$(VERSION)"' $<
 
-%.fsck.o: %.c Makefile
+%.fsck.o: %.c Makefile fsck.cmdline.c fsck.cmdline.h osl.h errtab.h
 	$(CC) -c -DVERSION='"$(VERSION)"' $(CPPFLAGS) $(CFLAGS) $< -o $@
 
-%.o: %.c Makefile
+%.o: %.c Makefile errtab.h
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(LIBCFLAGS) $<
 
-fsck.cmdline.h fsck.cmdline.c: fsck.ggo
+fsck.cmdline.h fsck.cmdline.c: fsck.ggo Makefile
 	gengetopt $$O \
 		--conf-parser \
 		--unamed-opts=table \
+		--no-handle-version \
 		--file-name=fsck.cmdline \
 		--func-name=fsck_cmdline_parser \
 		--set-package="oslfsck" \
@@ -120,22 +138,31 @@ fsck.cmdline.h fsck.cmdline.c: fsck.ggo
 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
 	sed -e 's/\([A-Z_]*\)	.*/	E_OSL_\1/' \
 		-e '1s/^/enum osl_errors {/1' \
+		-e '1s/$$/=1/1' \
 		-e '$$!s/$$/,/g' \
 		-e '$$s/$$/};/1' $< > $@
 
 errtab.h: errlist
-	sed -e 's/^\([A-Z_]*\)\s*\(.*\)/_S(E_OSL_\1, \2)/g' $< > $@
+	sed -e 's/^\([A-Z_]*\)\s*\(.*\)/OSL_ERROR(E_OSL_\1, \2)/g' $< > $@
 
-osl.h: osl.h.in osl_errors.h
-	cat $^ > $@
+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 $(realname) osl.h osl_errors.h errtab.h fsck.cmdline.h fsck.cmdline.c
+	rm -f *.o $(realname) osl.h osl_errors.h errtab.h fsck.cmdline.h \
+		fsck.cmdline.c oslfsck
 
 install: all
 	$(MKDIR) $(libdir) $(includedir)
@@ -143,5 +170,7 @@ install: all
 	$(LN) -s $(libdir)/$(soname) $(libdir)/$(linkername)
 	$(INSTALL) -s -m 755 $(realname) $(libdir)
 	$(INSTALL) -m 644 $(headers) $(includedir)
+	$(INSTALL) -m 644 $(executables) $(bindir)
+	$(INSTALL) -m 644 $(man_pages) $(mandir)
 
 .PHONY: all clean install