X-Git-Url: http://git.tuebingen.mpg.de/?p=osl.git;a=blobdiff_plain;f=Makefile;h=8e0f163b671aaba4554cfe76a00febaa99c24fa1;hp=3f12b09d2819e966e2d5d2793bad2aa7cc7f3b49;hb=aad03a8d23774d258ab90dadde119db15f26ec38;hpb=23dc00453efa7eb5a19036a4c90ca409225189cb

diff --git a/Makefile b/Makefile
index 3f12b09..8e0f163 100644
--- a/Makefile
+++ b/Makefile
@@ -6,14 +6,15 @@ 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
 ifeq "$(origin CC)" "default"
-        CC := gcc
+        CC := cc
 endif
 MKDIR := mkdir -p
 RM := rm -f
@@ -22,13 +23,14 @@ 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 := 2
+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
@@ -40,110 +42,52 @@ 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")
-
+CFLAGS += -fPIC
+CFLAGS += -fvisibility=hidden
+
+LDFLAGS += -Wl,-soname,$(soname)
+LDFLAGS += -Wl,-z,defs
+LDFLAGS += --shared
+
+# 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.
 libname := osl
+soname := lib$(libname).so.$(x)
 
-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).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
+# The real name adds to the soname a period, a minor number, another
+# period, and the release number.
+realname := $(soname).$(y).$(z)
 
-ifeq ($(uname_s),NetBSD)
-	format := elf
-	LDFLAGS += -Wl,-soname,$(soname)
-endif
-
-ifeq ($(uname_s),FreeBSD)
-	format := elf
-	LDFLAGS += -Wl,-soname,$(soname)
-endif
-
-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
+# 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
 
 all: $(realname) $(executables) $(man_pages)
 shared: $(realname)
 
-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 $@
-
+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) $<
 
+fsck.o: oslfsck.lsg.h
 oslfsck: $(fsck_objects)
-	$(CC) -o $@ $(fsck_objects)
+	$(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)
@@ -172,8 +116,8 @@ 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 *.a *.ga *.sym
+	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
@@ -190,25 +134,27 @@ install-man: $(man_pages)
 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: all install-bin install-man install-lib
+www: web/index.html web/osl.png web/doxygen/index.html
 
-.PHONY: all shared clean install install-bin install-man install-lib
-
-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