X-Git-Url: http://git.tuebingen.mpg.de/?p=osl.git;a=blobdiff_plain;f=Makefile;h=ba10fd56fddffe2f3d23e87f7141a68335dd9176;hp=ef12cb86d577d7e98de1396dc01800c3e818f99b;hb=df4808ffc319ca2ca9c6bb3c713e4dd8e47410cd;hpb=f55deeb0da0fe02cc3ff713e0a02057764b860a0

diff --git a/Makefile b/Makefile
index ef12cb8..ba10fd5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,30 +1,36 @@
 # where to install
-PREFIX ?:= /usr/local
+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
+fsck_objects := fsck.o osl.o util.o rbtree.o sha1.o oslfsck.lsg.o
+deps := $(sort $(objects:.o=.d) $(fsck_objects:.o=.d))
 headers := osl.h
 executables := oslfsck
 man_pages := oslfsck.1
 
 INSTALL := install
-CC := gcc
+ifeq "$(origin CC)" "default"
+        CC := cc
+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 := 3
 VERSION := $(x).$(y).$(z)
 
 # common flags
+CPPFLAGS += -DOSL_VERSION='"$(VERSION)"'
+
 CFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
 CFLAGS += -Wredundant-decls
 CFLAGS += -Os
@@ -41,9 +47,6 @@ CFLAGS += -Wbad-function-cast
 LIBCFLAGS += -fPIC
 LIBCFLAGS += -fvisibility=hidden
 
-uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
-uname_rs := $(shell uname -rs)
-
 libname := osl
 
 ifeq ($(uname_s),Linux)
@@ -52,31 +55,6 @@ ifeq ($(uname_s),Linux)
 	# 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).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.
-	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)
-	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)
@@ -108,40 +86,36 @@ ifeq ($(format),elf)
 endif
 
 all: $(realname) $(executables) $(man_pages)
-Makefile.deps: $(wildcard *.c *.h)
-	$(CC) -MM -MG *.c > $@
-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.cmdline.c fsck.cmdline.h osl.h errtab.h
-	$(CC) -c -DVERSION='"$(VERSION)"' $(CPPFLAGS) $(CFLAGS) $< -o $@
+shared: $(realname)
 
+ifeq ($(findstring clean, $(MAKECMDGOALS)),)
+-include $(deps)
+endif
 %.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 \
-		< $<
+	$(CC) $(CPPFLAGS) -c -MMD -MF $(*F).d -MT $@ $(CFLAGS) $(LIBCFLAGS) $<
 
+fsck.o: oslfsck.lsg.h
 oslfsck: $(fsck_objects)
-	$(CC) -o $@ $(fsck_objects) -lcrypto
+	$(CC) -o $@ $(fsck_objects) -llopsub
+
+%.lsg.c: %.suite
+	lopsubgen --gen-c < $<
+
+%.lsg.h: %.suite
+	lopsubgen --gen-header < $<
 
-oslfsck.1: oslfsck
-	help2man -h --detailed-help -N ./$< > $@
+%.1: %.suite
+	lopsubgen --gen-man=$@ < $<
 
 $(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. */' > $@
@@ -160,35 +134,45 @@ osl.h: osl.h.in osl_errors.h Makefile
 	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 oslfsck
+	rm -f *.o $(realname) osl.h osl_errors.h errtab.h \
+		oslfsck *.a *.ga *.sym *.lsg.* *.d
 
 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
+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 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 >> $@
+	markdown < README >> $@
 	sed -e '1,/@README@/d' -e '/@INSTALL@/,$$d' web/index.html.in >> $@
-	grutatxt -nb < INSTALL >> $@
+	markdown < 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